Fix site header (#84)

TextureGroup · Apr 28, 2017 · 4745089 · 4745089
1 parent 120b60c
commit 4745089
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 12 deletions.
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
@@ -46,7 +46,11 @@
 </div>
 <header>
 	<div class="container">
-		<h1 id="logo"><a href="/"><img src="../static/images/Texturelogo.png" alt="Texture" width="186" height="40"></a></h1>
+		<h1 id="logo">
+            <a href="/">
+                <img src="{{ "/static/images/logo.svg" | relative_url }}" alt="Texture">
+            </a>
+        </h1>
 		<nav>
 			<ul>
 				<li><a href="/docs/getting-started.html" {% if (page.layout == 'docs') %} class="active" {% endif %}>docs</a></li>
@@ -56,6 +60,5 @@ <h1 id="logo"><a href="/"><img src="../static/images/Texturelogo.png" alt="Textu
 				<li><a href="http://github.com/texturegroup/texture">github</a></li>
 	    	</ul>
 		</nav>
-		<div style="clear: both;"></div>
 	</div>
 </header>
diff --git a/docs/static/images/logo.svg b/docs/static/images/logo.svg
diff --git a/docs/stylesheets/main.scss b/docs/stylesheets/main.scss
@@ -84,10 +84,12 @@ a {
     width: 90%;
     margin: 0 auto;
     clear: both;
+
+    &:after { content: ""; display: table; clear: both; }
 }
 
 header {
-    padding: 30px 0 10px 0;
+    padding: 30px 0 0 0;
     background: #f8f8f8;
 
     h1 {
@@ -96,7 +98,6 @@ header {
     }
 
     nav {
-        margin-top: 10px;
         font-size: 18px;
 
         ul {
@@ -115,6 +116,10 @@ header {
     }
 }
 
+#logo {
+    margin: 0;
+}
+
 .hero {
     background: #0f70dd;
     margin-bottom: 30px;

diff --git a/docs/stylesheets/media.css b/docs/stylesheets/media.css
@@ -4,6 +4,10 @@
 		display: block;
 	}
 
+	header nav {
+	    line-height: 55px;
+	}
+
 	header ul {
 	}
 
@@ -44,11 +48,3 @@
 		float: right;
 	}
 }
-
-@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
-  #logo {
-    content: url(/static/images/[email protected]);
-    width: 186px;
-    height: 40px;
-  }
-}