Merge pull request rust-lang#7 from huonw/logo-etc

alexcrichton · alexcrichton · commit 9770d7b81662 · 2014-10-31T18:15:13.000-05:00
Add the logo to the site title
diff --git a/_config.yml b/_config.yml
@@ -4,6 +4,7 @@ description: >
   Words from the Rust team
 baseurl: ""
 url: "http://blog.rust-lang.org"
+logo: "http://www.rust-lang.org/logos/rust-logo-64x64-blk.png"
 twitter_username: rustlang
 github_username:  rust-lang
 
diff --git a/_includes/header.html b/_includes/header.html
@@ -2,9 +2,9 @@
 
   <div class="wrapper">
 
-    <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
+    <a class="site-title" href="{{ site.baseurl }}/"><img id="site-logo" src="{{ site.logo }}"/> {{ site.title }}</a>
 
-    <nav class="site-nav">
+    <!--<nav class="site-nav">
       <a href="#" class="menu-icon">
         <svg viewBox="0 0 18 15">
           <path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
@@ -20,7 +20,7 @@
           {% endif %}
         {% endfor %}
       </div>
-    </nav>
+    </nav>-->
 
   </div>
 
diff --git a/_sass/_layout.scss b/_sass/_layout.scss
@@ -10,6 +10,12 @@
     position: relative;
 }
 
+#site-logo {
+  width: 48px;
+  height: 48px;
+  padding: 2px;
+}
+
 .site-title {
     font-size: 26px;
     line-height: 56px;
