Merge branch 'v1-dev' of github.com:Dogfalo/materialize into v1-dev

Dogfalo · Sep 9, 2018 · 18ab01a · 18ab01a
2 parents 80c6881 + 03ec731
commit 18ab01a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/jade/index/index_content.html b/jade/index/index_content.html
@@ -10,6 +10,7 @@ <h4 class="light">A modern responsive front-end framework based on Material Desi
           </div>
           <div class="row center">
             <a href="http://materializecss.com/getting-started.html" id="download-button" class="btn-large waves-effect waves-light">Get Started</a>
+            <a href="https://github.com/Dogfalo/materialize/blob/v1-dev/v1-upgrade-guide.md" id="upgrade-button" class="btn-large waves-effect waves-light">Upgrade from 0.100.2</a>
           </div>
           <div class="row center"><a class="current-version-number" href="https://github.com/Dogfalo/materialize">Release: 1.0.0-rc.2</a></div>
           <div class="row center">

diff --git a/sass/_style.scss b/sass/_style.scss
@@ -220,41 +220,36 @@ ul.sidenav.sidenav-fixed {
 }
 
 nav.top-nav {
-  height: 122px;
+  height: 110px;
   box-shadow: none;
   border-bottom: 1px solid $border-color;
   background-color: transparent;
 
   h1.header {
     margin: 0;
-    padding-top: 26px;
+    padding-top: 22px;
   }
 }
 a.sidenav-trigger.top-nav {
   position: absolute;
   text-align: center;
   height: 48px;
   width: 48px;
-  left: 7.5%;
-  top: 0;
+  top: 28px;
   float: none;
   margin-left: 1.5rem;
   color: color("materialize-red", "lighten-3");
   font-size: 36px;
   z-index: 2;
 
-  &.full {
-    line-height: 122px;
-  }
-
   i {
     font-size: 32px;
   }
 }
 
 @media #{$small-and-down} {
   a.sidenav-trigger.top-nav {
-    left: 5%;
+    left: 0;
   }
 
   ul.sidenav.sidenav-fixed {
@@ -366,17 +361,19 @@ a.sidenav-trigger.top-nav {
   }
 }
 
-#download-button {
+#download-button,
+#upgrade-button {
+  &:hover {
+    background-color: lighten(color("materialize-red", "base"), 30%);
+  }
   background-color: color("materialize-red", "lighten-2");
   width: 260px;
   height: 70px;
+  margin: 4px;
+  padding: 0;
   line-height: 70px;
   font-size: 18px;
   font-weight: 400;
-
-  &:hover {
-    background-color: lighten(color("materialize-red", "base"), 30%);
-  }
 }
 
 .promo{