Updating material design lite to 1.3.0 => Fix #1367

klee-contrib · Apr 27, 2017 · 71a5578 · 71a5578
1 parent 35493a8
commit 71a5578
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
         "daterangepicker": "0.0.3",
         "immutable": "^3.7.4",
         "lodash": "^3.10.1",
-        "material-design-lite": "1.1.3",
+        "material-design-lite": "1.3.0",
         "object-assign": "^2.0.0",
         "react-addons-css-transition-group": "^15.2.1",
         "react-date-picker": "^3.1.6",

diff --git a/src/style/_mdl_variables.scss b/src/style/_mdl_variables.scss
@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
-/// 14/03/2016 - FOCUS OVERRIDE see scripts/mdl-variables-copy.scss
+/// 06/04/2017 - FOCUS OVERRIDE see scripts/mdl-variables-copy.scss
 /// ////////////////////////////////////////////////////////////////////////
-
 /**
  * Copyright 2015 Google Inc. All Rights Reserved.
  *
@@ -46,6 +45,8 @@
  * -----Data table
  * -----Dialog
  * -----Snackbar
+ * -----Tooltip
+ * -----Chip
  *
  * Even though all variables have the `!default` directive, most of them
  * should not be changed as they are dependent one another. This can cause
@@ -193,8 +194,8 @@ $layout-drawer-bg-color: unquote("rgb(#{$palette-grey-50})") !default;
 $layout-drawer-border-color: unquote("rgb(#{$palette-grey-300})") !default;
 $layout-text-color: unquote("rgb(#{$palette-grey-800})") !default;
 $layout-drawer-navigation-color: #757575 !default;
-$layout-drawer-navigation-link-active-background: unquote("rgb(#{$color-light-contrast})") !default;
-$layout-drawer-navigation-link-active-color: unquote("rgb(#{$palette-grey-300})") !default;
+$layout-drawer-navigation-link-active-background: unquote("rgb(#{$palette-grey-300})") !default;
+$layout-drawer-navigation-link-active-color: unquote("rgb(#{$color-light-contrast})") !default;
 
 // Header
 $layout-header-bg-color: unquote("rgb(#{$color-primary})") !default;
@@ -434,7 +435,7 @@ $footer-btn-size: 36px !default;
 
 /* CHECKBOX */
 
-$checkbox-label-font-size: 13px !default;
+$checkbox-label-font-size: 13   px !default;
 $checkbox-label-height: 24px !default;
 $checkbox-button-size: 16px !default;
 $checkbox-inner-margin: 2px !default;
@@ -587,6 +588,11 @@ $snackbar-action-color: unquote("rgb(#{$color-accent})") !default;
 $tooltip-font-size: 10px !default;
 $tooltip-font-size-large: 14px !default;
 
+/* CHIP */
+$chip-bg-color: rgb(222, 222, 222) !default;
+$chip-bg-active-color: rgb(214, 214, 214) !default;
+$chip-height: 32px !default;
+$chip-font-size: 13px !default; 
 ////////////////////////////////////////////////////////////////////////////
-/// 14/03/2016 - FOCUS OVERRIDE see scripts/mdl-variables-copy.scss
-/// ////////////////////////////////////////////////////////////////////////
+/// 06/04/2017 - FOCUS OVERRIDE see scripts/mdl-variables-copy.scss
+/// ////////////////////////////////////////////////////////////////////////