Merge pull request swanson#12 from coyotebush/sidebar

Sidebar markup tweaks
rajanand · Sep 7, 2014 · 2071f3a · 2071f3a
2 parents c222c67 + ee4de94
commit 2071f3a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/_includes/css/layout.css b/_includes/css/layout.css
@@ -24,7 +24,7 @@
 		font-size: 18px;
 	}
 
-	.sidebar ul {
+	#bio {
 		font-size: 14px;
 	}
 }

diff --git a/_includes/css/screen.css b/_includes/css/screen.css
@@ -107,11 +107,12 @@ nav h1, nav h2 {
   text-align: center;
 }
 
-nav hr {
+#bio {
   margin-top: 10px;
   margin-bottom: 15px;
   border: dotted #ddd;
-  border-width: 1px 0 0;
+  border-width: 1px 0;
+  padding-top: 15px;
 }
 
 #social {

diff --git a/_includes/sidebar.html b/_includes/sidebar.html
@@ -4,17 +4,13 @@ <h1>Hi.</h1>
     <img src="/logo.png" id="logo" alt="Blog logo"/>
   </a>
   <h2>I'm <a href="/">{{ site.data.theme.name }}</a>.</h2>
-  <hr/>
-  <ul>
-  <p>A brief bio or something witty.</p>
-  <p>
-    Edit me in <code>_includes/sidebar.html</code>
-  </p>
-  <hr/>
-  <div>
-    <div id="social">
-      {% include social.html %}
-    </div>
+  <div id="bio">
+    <p>A brief bio or something witty.</p>
+    <p>
+      Edit me in <code>_includes/sidebar.html</code>
+    </p>
   </div>
-  </ul>
-</nav>
+  <div id="social">
+    {% include social.html %}
+  </div>
+</nav>
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ @@
     		font-size: 18px;
     	}
-    	.sidebar ul {
+    	#bio {
     		font-size: 14px;
     	}
     }
@@ Expand Down @@