Skip to content

Commit 63c3139

Browse files
committed
Core: updated MD styles to new spec
1 parent 4e79eae commit 63c3139

File tree

10 files changed

+33
-18
lines changed

10 files changed

+33
-18
lines changed

src/core/components/button/button-md.less

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
border: none;
1313
transition-duration: 300ms;
1414
transform: translate3d(0,0,0);
15+
font-weight: 500;
16+
letter-spacing: 0.03em;
1517
&.active-state {
1618
background: rgba(0,0,0,0.1);
1719
}
@@ -32,10 +34,10 @@
3234
border-radius: 36px;
3335
}
3436
&.button-outline {
35-
border: 1px solid @themeColor;
36-
line-height: 34px;
37+
border: 2px solid @themeColor;
38+
line-height: 32px;
3739
&.button-big, &.button-big-md {
38-
line-height: 46px;
40+
line-height: 44px;
3941
}
4042
}
4143
&.button-small, &.button-small-md {
@@ -46,7 +48,7 @@
4648
letter-spacing: 0.03em;
4749
&.button-outline {
4850
border-width: 2px;
49-
line-height: 25px;
51+
line-height: 24px;
5052
}
5153
}
5254
> i.icon + span,
@@ -104,7 +106,7 @@
104106
border-left: none;
105107
}
106108
&.button-outline {
107-
border: 1px solid @themeColor;
109+
border: 2px solid @themeColor;
108110
&:nth-child(n + 2) {
109111
border-left: none;
110112
}
@@ -129,7 +131,7 @@
129131
border-right: none;
130132
}
131133
&.button-outline {
132-
border: 1px solid @themeColor;
134+
border: 2px solid @themeColor;
133135
&:nth-child(n + 2) {
134136
border-right: none;
135137
}

src/core/components/card/card-md.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
border: none;
2828
transition-duration: 300ms;
2929
transform: translate3d(0,0,0);
30+
font-weight: 500;
31+
letter-spacing: 0.03em;
3032
&.active-state {
3133
background: rgba(0,0,0,0.1);
3234
}

src/core/components/contacts-list/contacts-list-md.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
padding: 0 16px;
77
pointer-events: none;
88
background: none;
9-
color: #888888;
9+
color: @themeColor;
1010
font-weight: 500;
1111
line-height: 48px;
1212
height: 48px;

src/core/components/dialog/dialog-md.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
border: none;
6767
transition-duration: 300ms;
6868
transform: translate3d(0,0,0);
69+
letter-spacing: 0.03em;
70+
font-weight: 500;
6971
&.active-state {
7072
background: rgba(0,0,0,0.1);
7173
}

src/core/components/fab/fab-md.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@
9494
padding-left: 48px;
9595
}
9696
}
97+
.fab-text {
98+
font-weight: 500;
99+
letter-spacing: 0.03em;
100+
}
97101
// Labels
98102
.fab-label {
99103
.elevation(3);

src/core/components/sortable/sortable-ios.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@import (multiple) '../../less/colors-ios.less';
33
.sortable-handler {
44
width: 35px;
5+
.svg-background("<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 18 12' fill='#c7c7cc'><path d='M0,2V0h22v2H0z'/><path d='M0,7V5h22v2H0z'/><path d='M0,12v-2h22v2H0z'/></svg>");
56
}
67
.sortable {
78
li.sorting {

src/core/components/sortable/sortable-md.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@import (multiple) '../../less/colors-md.less';
33
.sortable-handler {
44
width: 50px;
5+
.svg-background("<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 18 8'><rect x='0' y='0' width='18' height='2' fill='#c7c7cc'></rect><rect x='0' y='6' width='18' height='2' fill='#c7c7cc'></rect></svg>");
56
}
67
.sortable {
78
li.sorting {

src/core/components/sortable/sortable.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
z-index: 10;
88
background-repeat: no-repeat;
99
background-size: 18px 12px;
10-
.svg-background("<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 18 12' fill='#c7c7cc'><path d='M0,2V0h22v2H0z'/><path d='M0,7V5h22v2H0z'/><path d='M0,12v-2h22v2H0z'/></svg>");
1110
opacity: 0;
1211
pointer-events: none;
1312
cursor: move;

src/core/components/stepper/stepper-md.less

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
height: 36px;
55
}
66
.stepper-button, .stepper-button-minus, .stepper-button-plus {
7-
border: 1px solid @themeColor;
7+
border: 2px solid @themeColor;
88
color: @themeColor;
99
line-height: 34px;
1010
height: 36px;
@@ -50,19 +50,19 @@
5050
}
5151
.stepper-value,
5252
.stepper-input-wrap {
53-
border-top: 1px solid @themeColor;
54-
border-bottom: 1px solid @themeColor;
53+
border-top: 2px solid @themeColor;
54+
border-bottom: 2px solid @themeColor;
5555
}
56-
.stepper .stepper-value {
56+
.stepper .stepper-value,
57+
.stepper .stepper-input-wrap input {
5758
color: @themeColor;
58-
font-size: 16px;
59+
font-size: 14px;
60+
font-weight: 500;
61+
text-align: center;
5962
}
6063
.stepper .stepper-input-wrap {
6164
input {
6265
height: 100%;
63-
text-align: center;
64-
color: @themeColor;
65-
font-size: 16px;
6666
}
6767
}
6868
.stepper-fill, .stepper-fill-md {

src/core/components/toolbar/toolbar-md.less

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
padding-right: 0;
4747
font-size: 14px;
4848
text-transform: uppercase;
49+
font-weight: 500;
50+
letter-spacing: 0.03em;
4951
}
5052
i.icon {
5153
height: 24px;
@@ -63,8 +65,8 @@
6365
position: absolute;
6466
left: 0;
6567
bottom: 0;
66-
height: 3px;
67-
background: rgba(255,255,255,0.5);
68+
height: 2px;
69+
background: #fff;
6870
transition-duration: 300ms;
6971
.ltr({
7072
left: 0;
@@ -103,6 +105,8 @@
103105
.tabbar-label {
104106
text-transform: none;
105107
line-height: 1.2;
108+
font-weight: normal;
109+
letter-spacing: 0;
106110
}
107111
}
108112
}

0 commit comments

Comments
 (0)