From dc25b68ec42dc99d34cdb149235993fb281a39c0 Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Sat, 10 Dec 2022 17:18:19 -0500 Subject: [PATCH] Added some styles and a navbar --- .gitignore | 3 +++ assets/sass/darkmeyer.sass | 21 +++++++++++++++++++++ public/styles/darkmeyer.css | 2 +- public/styles/darkmeyer.css.map | 2 +- views/layout.erb | 2 ++ views/partials/navbar.erb | 15 +++++++++++++++ 6 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 views/partials/navbar.erb diff --git a/.gitignore b/.gitignore index df9ac84..e7965b8 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,6 @@ node_modules/ # Ignore compiled CSS and JS public/css/ public/js/ + +# SASS compilation cache +.sass-cache/ diff --git a/assets/sass/darkmeyer.sass b/assets/sass/darkmeyer.sass index 5de8e78..048a8fc 100644 --- a/assets/sass/darkmeyer.sass +++ b/assets/sass/darkmeyer.sass @@ -1,2 +1,23 @@ body background: lightgrey + +#main-nav + position: fixed + top: 0 + left: 0 + width: 100% + height: 60px + background: #212121 + clear: float + + .nav-left + float: left + .nav-right + float: right + + .nav-menu + ul + list-style: none + + li + display: inline-block diff --git a/public/styles/darkmeyer.css b/public/styles/darkmeyer.css index ff8b589..102df10 100644 --- a/public/styles/darkmeyer.css +++ b/public/styles/darkmeyer.css @@ -1,2 +1,2 @@ -body{background:#d3d3d3} +body{background:#d3d3d3}#main-nav{position:fixed;top:0;left:0;width:100%;height:60px;background:#212121;clear:float}#main-nav .nav-left{float:left}#main-nav .nav-right{float:right}#main-nav .nav-menu ul{list-style:none}#main-nav .nav-menu li{display:inline-block} /*# sourceMappingURL=darkmeyer.css.map */ diff --git a/public/styles/darkmeyer.css.map b/public/styles/darkmeyer.css.map index 46505be..038c480 100644 --- a/public/styles/darkmeyer.css.map +++ b/public/styles/darkmeyer.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA,IAAI,CACF,UAAU,CAAE,OAAS", +"mappings": "AAAA,IAAI,CACF,UAAU,CAAE,OAAS,CAEvB,SAAS,CACP,QAAQ,CAAE,KAAK,CACf,GAAG,CAAE,CAAC,CACN,IAAI,CAAE,CAAC,CACP,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,OAAO,CACnB,KAAK,CAAE,KAAK,CAEZ,mBAAS,CACP,KAAK,CAAE,IAAI,CACb,oBAAU,CACR,KAAK,CAAE,KAAK,CAGZ,sBAAE,CACA,UAAU,CAAE,IAAI,CAElB,sBAAE,CACA,OAAO,CAAE,YAAY", "sources": ["../../assets/sass/darkmeyer.sass"], "names": [], "file": "darkmeyer.css" diff --git a/views/layout.erb b/views/layout.erb index 1b86d47..c13ebcf 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -11,6 +11,8 @@ + <%= erb :'partials/navbar' %> +
<%= yield %>
diff --git a/views/partials/navbar.erb b/views/partials/navbar.erb new file mode 100644 index 0000000..91ac52b --- /dev/null +++ b/views/partials/navbar.erb @@ -0,0 +1,15 @@ +