Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
fix(theme): remove default background theme (grey) 1000 value
Browse files Browse the repository at this point in the history
- Other palettes doesn't have `1000` therefor when registering a new background palette 1000 couldn't be found

fixes #7600

Closes #7686
  • Loading branch information
EladBezalel authored and ThomasBurleson committed Mar 30, 2016
1 parent 0b89a87 commit 4b49f23
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/components/datepicker/calendar-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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}}';
Expand All @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions src/components/menu/menu-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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}}';
}
}
4 changes: 2 additions & 2 deletions src/components/menuBar/menu-bar-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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}}';
Expand Down
3 changes: 1 addition & 2 deletions src/core/services/theming/theme.palette.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/core/services/theming/theming.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/core/style/themes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
html, body {
&.md-THEME_NAME-theme {
color: '{{foreground-1}}';
background-color: '{{background-50}}';
background-color: '{{background-color}}';
}
}

Expand Down

0 comments on commit 4b49f23

Please sign in to comment.