Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io

John Mulhausen · John Mulhausen · commit 39c06bfa6961 · 2016-03-07T17:23:53.000Z
diff --git a/_sass/_base.sass b/_sass/_base.sass
@@ -117,6 +117,13 @@ header
 .nav-buttons
 	float: right
 
+#viewDocs, #tryKubernetes
+	display: none
+
+#home
+	#viewDocs, #tryKubernetes
+		display: inline-block
+
 #viewDocs
 	border: 1px solid white
 	background-color: transparent
@@ -255,7 +262,7 @@ header
 	text-align: center
 	padding-left: 0
 	padding-right: 0
-	margin-bottom: 30px
+	margin-bottom: 0
 
 // VENDOR STRIP
 #vendorStrip
@@ -832,6 +839,7 @@ section
 		max-width: 100%
 
 .fixed footer
+	position: fixed
 	bottom: 0
 
 
diff --git a/_sass/_tablet.sass b/_sass/_tablet.sass
@@ -73,11 +73,13 @@ $feature-box-div-width: 45%
 		h1, h5
 			text-align: left
 
-	#viewDocs, #tryKubernetes
-		display: inline-block
+	#home
+		#viewDocs, #tryKubernetes
+			display: inline-block
 
 	#vendorStrip
 		display: block
+		text-align: center
 
 
 	#oceanNodes
diff --git a/index.html b/index.html
@@ -17,7 +17,7 @@ <h5>Manage an infrastructure cluster as a single system to simplify container op
 		<a href="/docs/hellonode/" id="quickstartButton" class="button">Try Our Hello World</a>
 	</main>
 	<div id="vendorStrip" class="light-text">
-		<div>Join the growing community already using Kubernetes</div>
+		<!--<div>Join the growing community already using Kubernetes</div>-->
 		<div>
 			<img src="images/logos/viacom_logo.png">
 			<img src="images/logos/soundcloud_logo.png">
diff --git a/js/script.js b/js/script.js
