From fbe62a4dc3659eaa6c36492ed4e80c8d5d2d2bb9 Mon Sep 17 00:00:00 2001 From: Elad Bezalel Date: Tue, 22 Mar 2016 00:48:10 +0200 Subject: [PATCH] fix(theme): remove default background theme (grey) `1000` value - Other palettes doesn't have `1000` therefor when registering a new background palette 1000 couldn't be found fixes #7600 --- src/components/datepicker/calendar-theme.scss | 4 ++-- src/components/menu/menu-theme.scss | 10 +++++----- src/components/menuBar/menu-bar-theme.scss | 4 ++-- src/core/services/theming/theme.palette.js | 3 +-- src/core/services/theming/theming.js | 2 +- src/core/style/themes.scss | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/components/datepicker/calendar-theme.scss b/src/components/datepicker/calendar-theme.scss index db254f5f73b..681eb425961 100644 --- a/src/components/datepicker/calendar-theme.scss +++ b/src/components/datepicker/calendar-theme.scss @@ -2,7 +2,7 @@ .md-calendar.md-THEME_NAME-theme { background: '{{background-A100}}'; - color: '{{background-1000-0.87}}'; + color: '{{background-A200-0.87}}'; tr:last-child td { border-bottom-color: '{{background-200}}'; @@ -11,7 +11,7 @@ .md-THEME_NAME-theme { .md-calendar-day-header { background: '{{background-300}}'; - color: '{{background-1000-0.87}}'; + color: '{{background-A200-0.87}}'; } .md-calendar-date.md-calendar-date-today { diff --git a/src/components/menu/menu-theme.scss b/src/components/menu/menu-theme.scss index 127996200d4..831ebaa5d3b 100644 --- a/src/components/menu/menu-theme.scss +++ b/src/components/menu/menu-theme.scss @@ -2,23 +2,23 @@ md-menu-content.md-THEME_NAME-theme { background-color: '{{background-A100}}'; md-menu-item { - color: '{{background-1000-0.87}}'; + color: '{{background-A200-0.87}}'; md-icon { - color: '{{background-1000-0.54}}'; + color: '{{background-A200-0.54}}'; } .md-button[disabled] { - color: '{{background-1000-0.25}}'; + color: '{{background-A200-0.25}}'; md-icon { - color: '{{background-1000-0.25}}'; + color: '{{background-A200-0.25}}'; } } } md-menu-divider { - background-color: '{{background-1000-0.11}}'; + background-color: '{{background-A200-0.11}}'; } } diff --git a/src/components/menuBar/menu-bar-theme.scss b/src/components/menuBar/menu-bar-theme.scss index ac0fce985c5..87b9138f984 100644 --- a/src/components/menuBar/menu-bar-theme.scss +++ b/src/components/menuBar/menu-bar-theme.scss @@ -23,7 +23,7 @@ md-menu-bar.md-THEME_NAME-theme { md-menu-content.md-THEME_NAME-theme { .md-menu > .md-button:after { - color: '{{background-1000-0.54}}'; + color: '{{background-A200-0.54}}'; } .md-menu._md-open > .md-button { @@ -33,7 +33,7 @@ md-menu-content.md-THEME_NAME-theme { md-toolbar.md-THEME_NAME-theme.md-menu-toolbar { background-color: '{{background-A100}}'; - color: '{{background-1000}}'; + color: '{{background-A200}}'; md-toolbar-filler { background-color: '{{primary-color}}'; color: '{{background-A100-0.87}}'; diff --git a/src/core/services/theming/theme.palette.js b/src/core/services/theming/theme.palette.js index 1a4cef66648..79a16e2eb16 100644 --- a/src/core/services/theming/theme.palette.js +++ b/src/core/services/theming/theme.palette.js @@ -330,9 +330,8 @@ angular.module('material.core.theming.palette', []) '700': '#616161', '800': '#424242', '900': '#212121', - '1000': '#000000', 'A100': '#ffffff', - 'A200': '#eeeeee', + 'A200': '#000000', 'A400': '#303030', 'A700': '#616161', 'contrastDefaultColor': 'dark', diff --git a/src/core/services/theming/theming.js b/src/core/services/theming/theming.js index e5987616109..f8f95fe807a 100644 --- a/src/core/services/theming/theming.js +++ b/src/core/services/theming/theming.js @@ -109,7 +109,7 @@ var DARK_DEFAULT_HUES = { 'default': 'A400', 'hue-1': '800', 'hue-2': '900', - 'hue-3': '1000' + 'hue-3': 'A200' } }; THEME_COLOR_TYPES.forEach(function(colorType) { diff --git a/src/core/style/themes.scss b/src/core/style/themes.scss index 026a798e587..d409f7020f8 100644 --- a/src/core/style/themes.scss +++ b/src/core/style/themes.scss @@ -3,7 +3,7 @@ html, body { &.md-THEME_NAME-theme { color: '{{foreground-1}}'; - background-color: '{{background-50}}'; + background-color: '{{background-color}}'; } }