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

Commit 4a2c362

Browse files
EladBezalelThomasBurleson
authored andcommitted
fix(content): removed foreground and background colors
* Moved background color and foreground color to theme based file on html and body elements * Update docs and demos to use default grey background color * update subHeader to use background-hue-2 > breaking Closes #7422
1 parent 502a9b1 commit 4a2c362

File tree

10 files changed

+17
-15
lines changed

10 files changed

+17
-15
lines changed

docs/app/css/layout-demo.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
demo-include {
22
display: block;
3-
background-color:white;
43
}
54

65
.colorNested .demo-content > div div {

docs/app/css/style.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -544,11 +544,6 @@ md-tabs.demo-source-tabs .active md-tab-label {
544544
flex: 1 1 0%;
545545
}
546546

547-
md-content.md-default-theme, md-content {
548-
background-color: white;
549-
}
550-
551-
552547
.demo-content > div[layout-fill] {
553548
min-height: 448px;
554549
}

gulp/config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ module.exports = {
2121
],
2222
themeBaseFiles: [
2323
'src/core/style/variables.scss',
24-
'src/core/style/mixins.scss'
24+
'src/core/style/mixins.scss',
25+
'src/core/style/themes.scss'
2526
],
2627
scssBaseFiles: [
2728
'src/core/style/color-palette.scss',
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
md-content.md-THEME_NAME-theme {
22
color: '{{foreground-1}}';
3-
background-color: '{{background-color}}';
43
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
md-divider {
22
margin-top: 10px;
3-
margin-bottom: 10px;
3+
margin-bottom: 0;
44
}
55

src/components/list/demoListControls/style.css

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
md-divider {
2-
margin-top: 10px;
3-
margin-bottom: 10px;
2+
margin-top: 0;
3+
margin-bottom: 0;
44
}
55

6+
md-list {
7+
padding-top:0;
8+
}
69
md-list-item > p,
710
md-list-item > ._md-list-item-inner > p,
811
md-list-item ._md-list-item-inner > p,

src/components/menuBar/demoBasicUsage/style.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.page-container {
2-
background-color: #f1f1f1;
32
padding: 32px;
43
}
54

src/components/subheader/subheader-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.md-subheader.md-THEME_NAME-theme {
22
color: '{{ foreground-2-0.23 }}';
3-
background-color: '{{background-color}}';
3+
background-color: '{{background-hue-2}}';
44

55
&.md-primary {
66
color: '{{primary-color}}'

src/core/style/structure.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
html, body {
22
height: 100%;
3-
color: rgba(0,0,0,0.87);
4-
background: white;
53
position: relative;
64
}
75

src/core/style/themes.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Only used with Theme processes */
2+
3+
html, body {
4+
&.md-THEME_NAME-theme {
5+
color: '{{primary-color}}';
6+
background-color: '{{background-50}}';
7+
}
8+
}

0 commit comments

Comments
 (0)