Merge branch 'master' of https://github.com/Dogfalo/materialize

madist · Oct 14, 2014 · 908f8f4 · 908f8f4
2 parents 4b0e728 + 1777196
commit 908f8f4
Show file tree

Hide file tree

Showing 19 changed files with 3,578 additions and 135 deletions.
diff --git a/css/materialize.css → bin/materialize.css b/css/materialize.css → bin/materialize.css
@@ -1933,8 +1933,11 @@ nav {
     float: left;
     display: inline-block;
     font-size: 23px; }
+    nav .brand-logo.right {
+      float: right; }
   nav ul {
-    margin: 0; }
+    margin: 0;
+    float: right; }
     nav ul li {
       float: left;
       padding: 0 10px;
@@ -1951,8 +1954,6 @@ nav {
       display: block; }
     nav ul.left {
       float: left; }
-    nav ul.right {
-      float: right; }
 
 @media only screen and (min-width: 0) {
   nav {
@@ -1978,26 +1979,24 @@ a {
   text-decoration: none; }
 
 html {
+  line-height: 1.5;
   font-family: "Roboto", "Open Sans", serif;
   font-weight: 400;
   color: #212121; }
   @media only screen and (min-width: 0) {
     html {
-      font-size: 12px;
-      line-height: 1.5rem; } }
+      font-size: 14px; } }
   @media only screen and (min-width: 768px) {
     html {
-      font-size: 13px;
-      line-height: 1.4rem; } }
+      font-size: 14.5px; } }
   @media only screen and (min-width: 992px) {
     html {
-      font-size: 14px;
-      line-height: 1.3rem; } }
+      font-size: 15px; } }
 
 h1, h2, h3, h4, h5, h6 {
   color: #212121;
   font-family: "Roboto", "Open Sans", serif;
-  font-weight: 500; }
+  font-weight: 400; }
 
 h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
   font-weight: inherit; }
@@ -2011,17 +2010,17 @@ h1 {
 h2 {
   font-size: 3.21rem;
   line-height: 3.531rem;
-  margin-bottom: 10px; }
+  margin-bottom: 12px; }
 
 h3 {
   font-size: 2.42rem;
   line-height: 2.662rem;
-  margin-bottom: 8px; }
+  margin-bottom: 10px; }
 
 h4 {
   font-size: 1.71rem;
   line-height: 1.881rem;
-  margin-bottom: 4px;
+  margin-bottom: 8px;
   letter-spacing: .05rem; }
 
 h5 {
@@ -2047,66 +2046,129 @@ small {
 @media only screen and (min-width: 480px) {
   .flow-text {
     font-size: 1rem; } }
+@media only screen and (min-width: 0px) {
+  .flow-text {
+    line-height: 1.4rem; } }
 @media only screen and (min-width: 505.6px) {
   .flow-text {
     font-size: 1.05rem; } }
+@media only screen and (min-width: 25.6px) {
+  .flow-text {
+    line-height: 1.47rem; } }
 @media only screen and (min-width: 531.2px) {
   .flow-text {
     font-size: 1.1rem; } }
+@media only screen and (min-width: 51.2px) {
+  .flow-text {
+    line-height: 1.54rem; } }
 @media only screen and (min-width: 556.8px) {
   .flow-text {
     font-size: 1.15rem; } }
+@media only screen and (min-width: 76.8px) {
+  .flow-text {
+    line-height: 1.61rem; } }
 @media only screen and (min-width: 582.4px) {
   .flow-text {
     font-size: 1.2rem; } }
+@media only screen and (min-width: 102.4px) {
+  .flow-text {
+    line-height: 1.68rem; } }
 @media only screen and (min-width: 608px) {
   .flow-text {
     font-size: 1.25rem; } }
+@media only screen and (min-width: 128px) {
+  .flow-text {
+    line-height: 1.75rem; } }
 @media only screen and (min-width: 633.6px) {
   .flow-text {
     font-size: 1.3rem; } }
+@media only screen and (min-width: 153.6px) {
+  .flow-text {
+    line-height: 1.82rem; } }
 @media only screen and (min-width: 659.2px) {
   .flow-text {
     font-size: 1.35rem; } }
+@media only screen and (min-width: 179.2px) {
+  .flow-text {
+    line-height: 1.89rem; } }
 @media only screen and (min-width: 684.8px) {
   .flow-text {
     font-size: 1.4rem; } }
+@media only screen and (min-width: 204.8px) {
+  .flow-text {
+    line-height: 1.96rem; } }
 @media only screen and (min-width: 710.4px) {
   .flow-text {
     font-size: 1.45rem; } }
+@media only screen and (min-width: 230.4px) {
+  .flow-text {
+    line-height: 2.03rem; } }
 @media only screen and (min-width: 736px) {
   .flow-text {
     font-size: 1.5rem; } }
+@media only screen and (min-width: 256px) {
+  .flow-text {
+    line-height: 2.1rem; } }
 @media only screen and (min-width: 761.6px) {
   .flow-text {
     font-size: 1.55rem; } }
+@media only screen and (min-width: 281.6px) {
+  .flow-text {
+    line-height: 2.17rem; } }
 @media only screen and (min-width: 787.2px) {
   .flow-text {
     font-size: 1.6rem; } }
+@media only screen and (min-width: 307.2px) {
+  .flow-text {
+    line-height: 2.24rem; } }
 @media only screen and (min-width: 812.8px) {
   .flow-text {
     font-size: 1.65rem; } }
+@media only screen and (min-width: 332.8px) {
+  .flow-text {
+    line-height: 2.31rem; } }
 @media only screen and (min-width: 838.4px) {
   .flow-text {
     font-size: 1.7rem; } }
+@media only screen and (min-width: 358.4px) {
+  .flow-text {
+    line-height: 2.38rem; } }
 @media only screen and (min-width: 864px) {
   .flow-text {
     font-size: 1.75rem; } }
+@media only screen and (min-width: 384px) {
+  .flow-text {
+    line-height: 2.45rem; } }
 @media only screen and (min-width: 889.6px) {
   .flow-text {
     font-size: 1.8rem; } }
+@media only screen and (min-width: 409.6px) {
+  .flow-text {
+    line-height: 2.52rem; } }
 @media only screen and (min-width: 915.2px) {
   .flow-text {
     font-size: 1.85rem; } }
+@media only screen and (min-width: 435.2px) {
+  .flow-text {
+    line-height: 2.59rem; } }
 @media only screen and (min-width: 940.8px) {
   .flow-text {
     font-size: 1.9rem; } }
+@media only screen and (min-width: 460.8px) {
+  .flow-text {
+    line-height: 2.66rem; } }
 @media only screen and (min-width: 966.4px) {
   .flow-text {
     font-size: 1.95rem; } }
+@media only screen and (min-width: 486.4px) {
+  .flow-text {
+    line-height: 2.73rem; } }
 @media only screen and (min-width: 992px) {
   .flow-text {
     font-size: 2rem; } }
+@media only screen and (min-width: 512px) {
+  .flow-text {
+    line-height: 2.8rem; } }
 
 body {
   background-color: #ddd; }
@@ -2141,7 +2203,6 @@ body {
   border-bottom: 1px solid #bdbdbd;
   outline: none;
   height: 3em;
-  line-height: 2em;
   width: 100%;
   font-size: 1em;
   padding: 0;
@@ -2168,15 +2229,15 @@ body {
   position: fixed; }
   @media only screen and (min-width: 0) {
     #toast-container {
-      width: 100%;
+      min-width: 100%;
       bottom: 0%; } }
   @media only screen and (min-width: 768px) {
     #toast-container {
-      width: 50%;
+      min-width: 50%;
       right: 5%; } }
   @media only screen and (min-width: 992px) {
     #toast-container {
-      width: 15%;
+      min-width: 8%;
       top: 5%;
       right: 5%; } }
 
@@ -2186,21 +2247,21 @@ body {
   width: 100%;
   height: 40px;
   background-color: #323232;
-  padding: 10px 4rem;
+  padding: 10px 15px;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   border-radius: 2px;
   display: table;
   top: 0px; }
   .toast span {
-    margin: auto 0;
     padding: 0px;
     font-size: 1.1rem;
     font-weight: 300;
     display: table-cell;
     color: #FFF;
-    vertical-align: middle; }
+    vertical-align: middle;
+    text-align: center; }
 
 ul.tabs {
   position: relative;
@@ -2216,6 +2277,7 @@ ul.tabs {
     padding: 0 20px;
     margin: 0;
     text-transform: uppercase;
+    letter-spacing: .8px;
     width: auto; }
     ul.tabs li.tab a {
       color: #5677fc;
@@ -2235,7 +2297,7 @@ ul.tabs {
   padding: 10px 8px;
   margin: 20px 0px;
   font-size: 1rem;
-  background-color: rgba(0, 0, 0, 0.54);
+  background-color: #323232;
   border-radius: 2px;
   color: #fff;
   height: 1rem;
@@ -2249,6 +2311,7 @@ ul.tabs {
   display: block;
   height: 36px;
   width: 176px;
+  margin-bottom: 15px;
   padding: 0 20px;
   text-decoration: none;
   color: #FFFFFF;
@@ -2258,7 +2321,8 @@ ul.tabs {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  background-clip: padding-box; }
+  background-clip: padding-box;
+  letter-spacing: .8px; }
   .button.raise {
     background-color: #5677fc;
     color: #FFFFFF;