Merge pull request #1 from jbcm627/master

Some page styling tweaks: links inside li tags, improve pre behavior …

Author: ShadenSmith

_includes/navbar.html

@@ -2,9 +2,13 @@
   <ul>
     {% for p in site.navbar_pages %}
       {% if page.url == p.last %}
-        <a href="{{p.last}}"> <li class="active_page">{{p.first}}</li> </a>
+        <li class="active_page">
+          <a href="{{p.last}}">{{p.first}}</a>
+        </li>
       {% else %}
-        <a href="{{p.last}}"> <li>{{p.first}}</li> </a>
+        <li>
+          <a href="{{p.last}}">{{p.first}}</a>
+        </li>
       {% endif %}
     {% endfor %}
   </ul>

_layouts/default.html

@@ -17,9 +17,11 @@
     <!-- HEADER -->
     <div id="header_wrap" class="outer">
       <header class="inner">
+        <div id="title">
+          <h1 id="project_title">{{ site.title | default: site.github.repository_name }} </h1>
+          <h2 id="project_tagline">{{ site.description | default: site.github.project_tagline }}</h2>
+        </div>
         {% include navbar.html %}
-        <h1 id="project_title">{{ site.title | default: site.github.repository_name }} </h1>
-        <h2 id="project_tagline">{{ site.description | default: site.github.project_tagline }}</h2>
       </header>
 
 			{% if site.google_analytics and jekyll.environment == 'production' %}

assets/css/style.scss

@@ -7,6 +7,14 @@
   max-width: 1024px;
 }
 
+#header_wrap {
+  overflow: hidden;
+}
+
+#title {
+  float: left;
+}
+
 nav {
   float: right;
 
@@ -17,27 +25,32 @@ nav {
 	}
 
 	li {
-    display: inline;
+    display: inline-block;
     padding: 8px;
-    margin: 2px;
+    margin: 0 2px 2px;
     background: #fff;
 
+    height: 24px;
+    line-height: 24px;
+
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     -khtml-border-radius: 4px;
     border-radius: 4px;
+
+    a {
+      font-size: 22px;
+      line-height: 24px;
+      color: black;
+    }
+    a:hover {
+      text-decoration: none;
+    }
+
   }
   li:hover {
     background-color: grey;
   }
-
-  a {
-    font-size: 22px;
-    color: black;
-  }
-  a:hover {
-    text-decoration: none;
-  }
 }
 
 
@@ -57,9 +70,22 @@ nav {
   }
 
   nav {
-    a {
-      font-size: 14px;
-      color: black;
+    li {
+      height: 16px;
+      line-height: 16px;
+
+      a {
+        font-size: 14px;
+        line-height: 16px;
+        color: black;
+      }
     }
   }
 }
+
+/* adjust pre's so page doesn't pick up a horizontal scroll */
+#main_content pre {
+  width: 98%;
+  padding-right: 1%;
+  padding-left: 1%;
+}