Skip to content

Commit 0672356

Browse files
committed
fix(button): cleaned up button theming
1 parent e933e4e commit 0672356

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

src/components/button/_button-base.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ $md-mini-fab-padding: 8px !default;
5151
font-size: $md-body-font-size-base;
5252
font-family: $md-font-family;
5353
font-weight: 500;
54-
color: md-color($md-foreground, text);
54+
color: currentColor;
5555

5656
// Sizing.
5757
margin: $md-button-margin;
@@ -69,7 +69,7 @@ $md-mini-fab-padding: 8px !default;
6969
%md-raised-button {
7070
@extend %md-button-base;
7171

72-
@include md-elevation(1);
72+
@include md-elevation(2);
7373
@include md-button-theme('color', default-contrast);
7474
@include md-button-theme('background-color');
7575

@@ -82,7 +82,7 @@ $md-mini-fab-padding: 8px !default;
8282
md-elevation-transition-property-value();
8383

8484
&:active {
85-
@include md-elevation(2);
85+
@include md-elevation(8);
8686
}
8787

8888
&.md-button-focus {
@@ -102,9 +102,14 @@ $md-mini-fab-padding: 8px !default;
102102
min-width: 0;
103103
border-radius: $md-fab-border-radius;
104104
background-color: md-color($md-accent);
105+
color: md-color($md-accent, default-contrast);
105106
width: $size;
106107
height: $size;
107-
padding: $padding;
108+
padding: 0;
109+
110+
i {
111+
padding: $padding 0;
112+
}
108113

109114
&.md-button-focus {
110115
background-color: md-color($md-accent, 600);

src/demo-app/button/button-demo.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
}
77

88
section {
9+
display: flex;
10+
align-items: center;
911
background-color: #f7f7f7;
1012
margin: 8px;
1113
}

src/demo-app/demo-app.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
justify-content: space-between;
3535
width: 100%;
3636
}
37-
38-
button {
39-
color: white;
40-
}
4137
}
4238

4339
h1 {

0 commit comments

Comments
 (0)