material_design_lite-sass 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2fef800435b17f9b16f3513e34f59dbea3eb7e8
-  data.tar.gz: d61e25399084c0bb39602b3ed0414c33458df540
+  metadata.gz: 1526d803fc2195a1e95ceca0960641716ee1aad5
+  data.tar.gz: fd7a77fe0d962aeebc396708bfd4e443f6014ad5
 SHA512:
-  metadata.gz: 45dd2286e27638b6cd459e554b71a22bbcf2adc6401868f8ac37ded573a7a4d640ee0fcde1ca2f93ca1e50b9d2d2c2d177cc17783cde52c37d20169119b961e4
-  data.tar.gz: 365db8127f5295c925fd96fd0db0d4daba62e5ab32c17c1b82dd8159a7dc3c179a2a067f8ac880aa653349fb3e6d590619bf6d8c61c23e073f458a9d6ea9d45d
+  metadata.gz: 5d4e2350472aeaced9398f37ae36d8e02c559bbda70d6cf8541e2d678d7bc88e7e8f4464698e8d9baeb2827dca21bf40f472b6b6366a64d69a1723af771a979a
+  data.tar.gz: 53a152686b37cdfcca1391dc18571be75d12076135d24ca7cee6709793eef650b22614547ed67736657c6d5767511940ccf2fe8b8d9b89a950d3a36a578e68dc

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.1.1 (2016-02-03)
+
+- Update assets to match upstream version
+
+Library version: 
+
+- Material Design Lite v1.1.1
+- Material Icons v2.1
+
 ## 1.1.0 (2016-02-02)
 
 - Update assets to match upstream version

data/lib/material_design_lite/sass/version.rb

@@ -1,5 +1,5 @@
 module MaterialDesignLite
   module Sass
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

data/vendor/assets/javascripts/material/layout.js

@@ -137,16 +137,24 @@
       return;
     }
 
+    var headerVisible =
+        !this.element_.classList.contains(this.CssClasses_.IS_SMALL_SCREEN) ||
+        this.element_.classList.contains(this.CssClasses_.FIXED_HEADER);
+
     if (this.content_.scrollTop > 0 &&
         !this.header_.classList.contains(this.CssClasses_.IS_COMPACT)) {
       this.header_.classList.add(this.CssClasses_.CASTING_SHADOW);
       this.header_.classList.add(this.CssClasses_.IS_COMPACT);
-      this.header_.classList.add(this.CssClasses_.IS_ANIMATING);
+      if (headerVisible) {
+        this.header_.classList.add(this.CssClasses_.IS_ANIMATING);
+      }
     } else if (this.content_.scrollTop <= 0 &&
         this.header_.classList.contains(this.CssClasses_.IS_COMPACT)) {
       this.header_.classList.remove(this.CssClasses_.CASTING_SHADOW);
       this.header_.classList.remove(this.CssClasses_.IS_COMPACT);
-      this.header_.classList.add(this.CssClasses_.IS_ANIMATING);
+      if (headerVisible) {
+        this.header_.classList.add(this.CssClasses_.IS_ANIMATING);
+      }
     }
   };
 

data/vendor/assets/javascripts/material/mdlComponentHandler.js

@@ -224,7 +224,7 @@ componentHandler = (function() {
         }
       } else {
         throw new Error(
-            'Unable to find a registered component for the given class.');
+          'Unable to find a registered component for the given class.');
       }
 
       var ev = document.createEvent('Events');

data/vendor/assets/javascripts/material.js

@@ -227,7 +227,7 @@ componentHandler = (function() {
         }
       } else {
         throw new Error(
-            'Unable to find a registered component for the given class.');
+          'Unable to find a registered component for the given class.');
       }
 
       var ev = document.createEvent('Events');
@@ -3213,14 +3213,19 @@ MaterialLayout.prototype.contentScrollHandler_ = function () {
     if (this.header_.classList.contains(this.CssClasses_.IS_ANIMATING)) {
         return;
     }
+    var headerVisible = !this.element_.classList.contains(this.CssClasses_.IS_SMALL_SCREEN) || this.element_.classList.contains(this.CssClasses_.FIXED_HEADER);
     if (this.content_.scrollTop > 0 && !this.header_.classList.contains(this.CssClasses_.IS_COMPACT)) {
         this.header_.classList.add(this.CssClasses_.CASTING_SHADOW);
         this.header_.classList.add(this.CssClasses_.IS_COMPACT);
-        this.header_.classList.add(this.CssClasses_.IS_ANIMATING);
+        if (headerVisible) {
+            this.header_.classList.add(this.CssClasses_.IS_ANIMATING);
+        }
     } else if (this.content_.scrollTop <= 0 && this.header_.classList.contains(this.CssClasses_.IS_COMPACT)) {
         this.header_.classList.remove(this.CssClasses_.CASTING_SHADOW);
         this.header_.classList.remove(this.CssClasses_.IS_COMPACT);
-        this.header_.classList.add(this.CssClasses_.IS_ANIMATING);
+        if (headerVisible) {
+            this.header_.classList.add(this.CssClasses_.IS_ANIMATING);
+        }
     }
 };
 /**

data/vendor/assets/stylesheets/material/_list.scss

@@ -20,30 +20,38 @@
 
 .mdl-list {
   display: block;
-  padding: 8px 0 ;
+  padding: $list-border 0;
   list-style: none;
 }
 
 .mdl-list__item {
-  @include typo-body-1();
+  @include typo-subhead();
+  line-height: 1;
   display: flex;
+  min-height: $list-min-height;
   box-sizing: border-box;
-  height: 48px;
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  padding : 16px 16px 20px 16px;
+  padding: $list-min-padding;
   cursor: default;
+  color: $list-main-text-text-color;
+  overflow: hidden;
+
   & .mdl-list__item-primary-content {
-    order:0;
+    order: 0;
     flex-grow: 2;
     text-decoration: none;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+
+    & .mdl-list__item-icon {
+      margin-right: $list-icon-text-left-distance - $list-icon-size - $list-min-padding;
+    }
 
-    & .material-icons {
-      font-size: 40px;
-      line-height: 0;
-      vertical-align: middle;
-      padding: 0 12px 0 0;
+    & .mdl-list__item-avatar {
+      margin-right: $list-avatar-text-left-distance - $list-avatar-size - $list-min-padding;
     }
   }
 
@@ -51,53 +59,99 @@
     display: flex;
     flex-flow: column;
     align-items: flex-end;
+    margin-left: $list-min-padding;
+
     & .mdl-list__item-secondary-action label { display: inline; }
     & .mdl-list__item-secondary-info {
       @include typo-caption();
-      margin-bottom: 10px;
       color: $list-supporting-text-text-color;
     }
     & .mdl-list__item-sub-header {
-      padding: 0 0 0 16px;
+      padding: 0 0 0 $list-min-padding;
     }
   }
 }
 
-.mdl-list__item-avatar {
-  height: 56px;
+.mdl-list__item-icon,
+.mdl-list__item-icon.material-icons {
+  height: $list-icon-size;
+  width: $list-icon-size;
+  font-size: $list-icon-size;
+  box-sizing: border-box;
+  color: $list-icon-color;
+}
+
+.mdl-list__item-avatar,
+.mdl-list__item-avatar.material-icons {
+  height: $list-avatar-size;
+  width: $list-avatar-size;
+  box-sizing: border-box;
+  border-radius: 50%;
+  // Set a background colour in case the user doesn't provide an image.
+  background-color: $list-icon-color;
+  // Set a font size and color in case the user provides a Material Icon.
+  font-size: $list-avatar-size;
+  color: $list-avatar-color;
 }
 
 .mdl-list__item--two-line {
-  height: 72px;
+  height: $list-two-line-height;
 
   & .mdl-list__item-primary-content {
-    & .material-icons {
-      vertical-align: text-bottom;
+    height: $list-two-line-height - $list-min-padding - $list-bottom-padding;
+    line-height: 20px;
+    display: block;
+
+    & .mdl-list__item-avatar{
+      float: left;
+    }
+
+    & .mdl-list__item-icon {
+      float: left;
+      // Icons are aligned to center of text in a two line list.
+      margin-top:
+        ($list-two-line-height - $list-min-padding - $list-bottom-padding -
+         $list-icon-size) / 2;
+    }
+
+    & .mdl-list__item-secondary-content {
+      height: $list-two-line-height - $list-min-padding - $list-bottom-padding;
     }
 
     & .mdl-list__item-sub-title {
-      @include typo-caption();
+      @include typo-body-1();
+      line-height: 18px;
+      color: $list-supporting-text-text-color;
       display: block;
-      padding : 0 0 0 56px;
+      padding: 0;
     }
   }
 }
 
 .mdl-list__item--three-line {
-  height: 88px;
+  height: $list-three-line-height;
 
   & .mdl-list__item-primary-content {
-    & .material-icons {
-      vertical-align: text-bottom;
+    height: $list-three-line-height - $list-min-padding - $list-bottom-padding;
+    line-height: 20px;
+    display: block;
+
+    & .mdl-list__item-avatar,
+    & .mdl-list__item-icon {
+      float: left;
     }
   }
 
+  & .mdl-list__item-secondary-content {
+    height: $list-three-line-height - $list-min-padding - $list-bottom-padding;
+  }
+
   & .mdl-list__item-text-body {
-    @include typo-caption();
+    @include typo-body-1();
+    line-height: 18px;
+    height: $list-three-line-height - $list-min-padding - $list-bottom-padding;
     color: $list-supporting-text-text-color;
     display: block;
-    height: 24px;
-    padding: 0 0 0 56px;
-    overflow: hidden;
+    padding: 0;
   }
 }

data/vendor/assets/stylesheets/material/_material-icons.scss

@@ -22,6 +22,8 @@
   text-transform: none;
   letter-spacing: normal;
   word-wrap: normal;
+  white-space: nowrap;
+  direction: ltr;
 
   /* Support for all WebKit browsers. */
   -webkit-font-smoothing: antialiased;

data/vendor/assets/stylesheets/material/_variables.scss

@@ -245,7 +245,7 @@ $input-text-bottom-border-color: unquote("rgba(#{$color-black}, 0.12)") !default
 $input-text-highlight-color: unquote("rgb(#{$color-primary})") !default;
 $input-text-disabled-color: $input-text-bottom-border-color !default;
 $input-text-disabled-text-color: $input-text-label-color !default;
-$input-text-error-color: unquote("rgb(222, 50, 38)") !default;
+$input-text-error-color: unquote("rgb(#{$palette-red-A700})") !default;
 
 /* ==========  Card  ========== */
 
@@ -271,9 +271,10 @@ $progress-image-path: $image_path;
 
 /* ==========  List ========== */
 
-$list-container-item-border-color: unquote("rgb(#{$palette-grey-300})") !default;
-$list-container-view-background: unquote("rgb(#{$color-white})") !default;
+$list-main-text-text-color: unquote("rgba(#{$color-black}, 0.87)") !default;
 $list-supporting-text-text-color: unquote("rgba(#{$color-black}, 0.54)") !default;
+$list-icon-color: unquote("rgb(#{$palette-grey-600})") !default;
+$list-avatar-color: white !default;
 
 /* ==========  Item ========== */
 
@@ -364,10 +365,18 @@ $menu-fade-duration: 0.2s !default;
 
 /* LIST */
 
-$list-container-height: 500px !default;
-$list-container-width: 400px !default;
-$list-container-item-height: 70px !default;
-// $list__item-hover-color: unquote("rgb(#{$palette-grey-300})") !default;
+$list-border: 8px !default;
+$list-min-height: 48px !default;
+$list-min-padding: 16px !default;
+$list-bottom-padding: 20px !default;
+$list-avatar-text-left-distance: 72px !default;
+$list-icon-text-left-distance: 72px !default;
+
+$list-avatar-size: 40px !default;
+$list-icon-size: 24px !default;
+
+$list-two-line-height: 72px !default;
+$list-three-line-height: 88px !default;
 
 /* LAYOUT */
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_design_lite-sass
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Dmitriy Tarasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass