Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix header and nav styling and general layout fixes. #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix header and nav styling and general layout fixes. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
787050d
Fix header and nav styling and general layout fixes.
Nov 16, 2014
e1b330a
fix title link
BertHartm Nov 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,29 @@
</head>
<body>
<div id="header">
<nav>
<li>MakerBar</li>
<li class="downloads"><a href="https://groups.google.com/forum/#!forum/makerbar">Mailing List</a></li>
<li class="downloads"><a href="http://community.makerbar.com">Forum</a></li>
<li class="downloads"><a href="http://meetup.com/makerbar">Meetup</a></li>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top" style="float:right;">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="B94AKJR3T4CDJ">
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
</nav>
<div id="branding" class="clearfix">
<div id="logo-img" class="logo-img" style="float: left; width: 80px;display: inline;float: left;height: 80px;margin: 20px 0px 20px 30px;">
<img class="blog-logo" src="/images/makerbar_small.png">
</div>
<div id="logo" class="logo" style="float: left; display: inline;margin-top: 20;">
<h1 class="blog-name"><a class="blog-title" href="/">Hoboken MakerBar</a></h1>
<h2 class="blog-description">Hoboken's Hackerspace – The Place for Incredible Projects</h2>
</div>
</div>
</div><!-- end header -->

<div class="nav">
<nav>
<li class="downloads"><a href="https://groups.google.com/forum/#!forum/makerbar">Mailing List</a></li>
<li class="downloads"><a href="http://community.makerbar.com">Forum</a></li>
<li class="downloads"><a href="http://meetup.com/makerbar">Meetup</a></li>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top" style="float:right;">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="B94AKJR3T4CDJ">
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
</nav>
</div>
<div class="wrapper">

<section>
Expand Down
Binary file added images/makerbar_small.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
---
layout: default
---
<div id="title">
<h1>MakerBar</h1>
<p>The Hoboken Hackerspace</p>
<hr>
</div>

<p>Thanks for visiting the MakerBar blog. Please bear with us as we rebuild it.</p>
<p>In the meantime, check us out on <a href="http://meetup.com/makerbar">Meetup</a> or on our <a href="https://groups.google.com/forum/#!forum/makerbar">Google Group / Mailing List</a>.</p>
<p>We're located at <a href="https://www.google.com/maps/place/38+Jackson+St,+Hoboken,+NJ+07030">38 Jackson St.</a> in Hoboken, NJ.</p>
Expand Down
73 changes: 49 additions & 24 deletions stylesheets/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
Expand All @@ -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));
Expand All @@ -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);
Expand All @@ -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;
Expand Down