Re-generate CSS and fix merge conflicts

kubernetes · k8s-ci-robot · Feb 28, 2019 · Oct 19, 2018 · Nov 6, 2018 · Nov 6, 2018
commit d9d722479bae02c375f3a70583e74614c12f5f2a
diff --git a/sass/_base.sass b/sass/_base.sass
@@ -1848,20 +1848,20 @@ $feature-box-div-margin-bottom: 40px
 
 // This Sass ensures a sticky footer at the bottom
 .page
-	display: flex
-	flex-direction: column
-	min-height: 100vh
+  display: flex
+  flex-direction: column
+  min-height: 100vh
 
-	.page-content
-		flex: 1
+  .page-content
+    flex: 1
 
 // 404 page
 .container-404
-	text-align: center
-	margin: 3.5rem 0
+  text-align: center
+  margin: 3.5rem 0
 
-	ul li a
-		font-size: 1.5rem
+  ul li a
+    font-size: 1.5rem
 
 // GitHub info/edit buttons
 #pre-footer

diff --git a/static/css/case-study-styles.css b/static/css/case-study-styles.css
diff --git a/static/css/case-study-styles.css.map b/static/css/case-study-styles.css.map
diff --git a/static/css/styles.css b/static/css/styles.css
diff --git a/static/css/styles.css.map b/static/css/styles.css.map