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

Commit 4cecebb

Browse files
Splaktarmmalerba
authored andcommitted
fix(bottom-sheet): component theme now supports dark mode (#11380)
<!-- Filling out this template is required! Do not delete it when submitting a Pull Request! Without this information, your Pull Request may be auto-closed. --> ## PR Checklist Please check that your PR fulfills the following requirements: - [x] The commit message follows [our guidelines](https://github.com/angular/material/blob/master/.github/CONTRIBUTING.md#-commit-message-format) - [ ] Tests for the changes have been added or this is not a bug fix / enhancement - [x] Docs have been added, updated, or were not required ## PR Type What kind of change does this PR introduce? <!-- Please check the one that applies to this PR using "x". --> ``` [x] Bugfix [ ] Enhancement [ ] Documentation content changes [ ] Code style update (formatting, local variables) [ ] Refactoring (no functional changes, no api changes) [ ] Build related changes [ ] CI related changes [ ] Infrastructure changes [ ] Other... Please describe: ``` ## What is the current behavior? See Before screenshots below. <!-- Please describe the current behavior that you are modifying and link to one or more relevant issues. --> Issue Number: N/A ## What is the new behavior? See After screenshots below. ## Does this PR introduce a breaking change? ``` [ ] Yes [x] No ``` <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. --> <!-- Note that breaking changes are highly unlikely to get merged to master unless the validation is clear and the use case is critical. --> ## Other information ### Before ![screen shot 2018-07-22 at 4 11 13 am](https://user-images.githubusercontent.com/3506071/43043610-6d51e650-8d65-11e8-8c2a-da73944f872e.png) ![screen shot 2018-07-22 at 4 11 24 am](https://user-images.githubusercontent.com/3506071/43043611-6d5e7b9a-8d65-11e8-91c5-57c58bf606e3.png) ![screen shot 2018-07-22 at 4 11 48 am](https://user-images.githubusercontent.com/3506071/43043612-6d6d5728-8d65-11e8-96e0-010c4d1cd176.png) ![screen shot 2018-07-22 at 4 11 55 am](https://user-images.githubusercontent.com/3506071/43043613-6d7c034a-8d65-11e8-9577-95228b822c95.png) ### After ![screen shot 2018-07-22 at 4 07 50 am](https://user-images.githubusercontent.com/3506071/43043600-3475240a-8d65-11e8-968d-a1dd23475a74.png) ![screen shot 2018-07-22 at 4 08 04 am](https://user-images.githubusercontent.com/3506071/43043601-348382fc-8d65-11e8-91d4-cb9ce955bed3.png) ![screen shot 2018-07-22 at 4 09 29 am](https://user-images.githubusercontent.com/3506071/43043602-34922528-8d65-11e8-997a-343ad874073f.png) ![screen shot 2018-07-22 at 4 09 38 am](https://user-images.githubusercontent.com/3506071/43043603-349ebf40-8d65-11e8-8cb9-e797d618756b.png)
1 parent e8f1113 commit 4cecebb

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

src/components/bottomSheet/bottom-sheet-theme.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
md-bottom-sheet.md-THEME_NAME-theme {
3-
background-color: '{{background-50}}';
4-
border-top-color: '{{background-300}}';
2+
background-color: '{{background-color}}';
3+
border-top-color: '{{background-hue-3}}';
54

65
&.md-list {
76
md-list-item {
@@ -10,7 +9,7 @@ md-bottom-sheet.md-THEME_NAME-theme {
109
}
1110

1211
.md-subheader {
13-
background-color: '{{background-50}}';
12+
background-color: '{{background-color}}';
1413
}
1514

1615
.md-subheader {

src/components/bottomSheet/demoBasicUsage/bottom-sheet-list-template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<md-button
77
ng-click="listItemClick($index)"
88
md-autofocus="$index == 2"
9-
class="md-list-item-content" >
9+
class="md-list-item-content">
1010
<md-icon md-svg-src="{{item.icon}}"></md-icon>
1111
<span class="md-inline-list-icon-label">{{ item.name }}</span>
1212
</md-button>
Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,35 @@
11
.md-inline-list-icon-label {
22
display: inline-block;
33
padding-left: 10px;
4-
padding-right:10px;
4+
padding-right: 10px;
55
margin-top: -10px;
66
height: 24px;
77
vertical-align: middle;
8-
98
}
10-
119
.md-grid-item-content {
12-
height:90px;
13-
padding-top:10px;
10+
height: 90px;
11+
padding-top: 10px;
1412
}
1513
.md-grid-item-content md-icon {
1614
height: 48px;
1715
width: 48px;
1816
}
19-
2017
.md-grid-text {
2118
padding-bottom: 5px;
22-
}
23-
24-
19+
}
2520
md-list-item, md-list-item .md-list-item-inner {
2621
min-height: 48px;
27-
2822
}
29-
3023
h2 {
3124
line-height: 36px;
32-
padding-top: 10px;
25+
padding-top: 10px;
3326
}
34-
35-
3627
.md-subheader .md-subheader-inner {
3728
padding: 0;
3829
}
39-
40-
4130
md-toast .md-toast-content {
4231
background-color: #B14141;
4332
}
44-
4533
md-toast > * {
4634
font-weight: bolder;
4735
}

0 commit comments

Comments
 (0)