From 787050d806a34e7eeea1d509a7bbc1ca00635ba5 Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Sun, 16 Nov 2014 17:22:16 -0500 Subject: [PATCH 1/2] Fix header and nav styling and general layout fixes. --- _layouts/default.html | 35 +++++++++++------- images/makerbar_small.png | Bin 0 -> 3043 bytes index.html | 6 ---- stylesheets/styles.css | 73 +++++++++++++++++++++++++------------- 4 files changed, 71 insertions(+), 43 deletions(-) create mode 100644 images/makerbar_small.png diff --git a/_layouts/default.html b/_layouts/default.html index 3967018..e5861f7 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -18,20 +18,29 @@ - +
+ +
diff --git a/images/makerbar_small.png b/images/makerbar_small.png new file mode 100644 index 0000000000000000000000000000000000000000..78af95d3a3e0ed90dd3642215d1c77003bf630e2 GIT binary patch literal 3043 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 literal 0 HcmV?d00001 diff --git a/index.html b/index.html index 506e246..dd87c68 100644 --- a/index.html +++ b/index.html @@ -1,12 +1,6 @@ --- layout: default --- -

-

MakerBar

-

The Hoboken Hackerspace

-
-
-

Thanks for visiting the MakerBar blog. Please bear with us as we rebuild it.

In the meantime, check us out on Meetup or on our Google Group / Mailing List.

We're located at 38 Jackson St. in Hoboken, NJ.

diff --git a/stylesheets/styles.css b/stylesheets/styles.css index aa7e9a8..177373b 100644 --- a/stylesheets/styles.css +++ b/stylesheets/styles.css @@ -541,15 +541,11 @@ body { padding: 0px 0 20px 0px; margin: 0px; font: 14px/1.5 "OpenSansRegular", "Helvetica Neue", Helvetica, Arial, sans-serif; - color: #f0e7d5; + color: #000; font-weight: normal; background: #252525; background-attachment: fixed !important; - background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2a2a29), color-stop(100%, #1c1c1c)); - background: -webkit-linear-gradient(#2a2a29, #1c1c1c); - background: -moz-linear-gradient(#2a2a29, #1c1c1c); - background: -o-linear-gradient(#2a2a29, #1c1c1c); - background: linear-gradient(#2a2a29, #1c1c1c); + background: #F0F0F0; } h1, h2, h3, h4, h5, h6 { @@ -588,9 +584,9 @@ h3 { } a { - color: #ffcc00; - font-weight: 400; - text-decoration: none; + color: #fff; + font-weight: 400; + text-decoration: none; } a:hover { color: #ffeb9b; @@ -613,10 +609,12 @@ strong { } .wrapper { - max-width: 650px; + max-width: 960px; margin: 0 auto; + margin-top:20px; position: relative; padding: 0 20px; + border: 1px solid #d3d1c7; } section img { @@ -698,27 +696,54 @@ dt { font-family: 'OpenSansSemibold', "Helvetica Neue", Helvetica, Arial, sans-serif !important; font-weight: normal; } +#branding{ + margin:0 auto; + max-width:960px; +} +#branding .logo{ + padding-top:20px; +} +#branding h1 a { + color:#FFF; + font-size:22px; + letter-spacing:1px; + line-height: 1em; + font-family: 'Segoe UI',Arial,Helvetica,sans-serif; + text-transform: uppercase; +} +#branding h2{ + color:#7d716d; + font-size:11px; + letter-spacing:1px; + line-height: 1em; + font-family: 'Segoe UI',Arial,Helvetica,sans-serif; + text-transform: uppercase; +} #header { z-index: 100; left: 0; top: 0px; - height: 65px; + height: 125px; width: 100%; - position: fixed; - background: url(../images/nav-bg.gif) #353535; - border-bottom: 4px solid #434343; + background: #1e1b1a; + border-bottom: 5px solid #383332; -webkit-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.25); -moz-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.25); box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.25); } -#header nav { - max-width: 650px; - margin: 0 auto; +.nav { + display:block; + height:35px; + background-color:#322C2C; +} +.nav nav { + display:block; + height:35px; + max-width: 960px; padding: 0 10px; - margin: 6px auto; } -#header nav li { +.nav nav li { font-family: 'OpenSansLight', "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: normal; list-style: none; @@ -728,7 +753,7 @@ dt { text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.2); font-size: 14px; } -#header nav li a { +.nav nav li a { color: white; border: 1px solid #5d910b; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #93bd20), color-stop(100%, #659e10)); @@ -752,7 +777,7 @@ dt { display: inline-block; text-align: center; } -#header nav li a:hover { +.nav nav li a:hover { background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #749619), color-stop(100%, #527f0e)); background: -webkit-linear-gradient(#749619, #527f0e); background: -moz-linear-gradient(#749619, #527f0e); @@ -764,15 +789,15 @@ dt { -moz-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 1px 0px rgba(0, 0, 0, 0); box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 1px 0px rgba(0, 0, 0, 0); } -#header nav li.fork { +.nav nav li.fork { float: left; margin-left: 0px; } -#header nav li.downloads { +.nav nav li.downloads { float: right; margin-left: 6px; } -#header nav li.title { +.nav nav li.title { float: right; margin-right: 10px; font-size: 11px; From e1b330a3f2b6077b8bf4571414e869d0556accc4 Mon Sep 17 00:00:00 2001 From: Bert Hartmann Date: Sun, 16 Nov 2014 18:32:43 -0500 Subject: [PATCH 2/2] fix title link --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index e5861f7..6460455 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -23,7 +23,7 @@