Skip to content

Commit 84b15e1

Browse files
committed
Reorder styles and common variables
1 parent f1fc317 commit 84b15e1

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

components/button/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $button-floating-height-mini: $unit * 4;
4949
padding: 0 $unit * 1.2;
5050
font-size: 1.4 * $unit;
5151
text-transform: uppercase;
52-
border-radius: 3px;
52+
border-radius: $border-radius;
5353

5454
.icon {
5555
margin-right: $unit * .6;

components/card/style.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ $card-title-height: 17.6 * $unit;
66
$card-width-normal: 32 * $unit;
77
$card-width-large: 51.2 * $unit;
88
$card-text-overlay: unquote("rgba(#{$color-black}, 0.2)");
9-
$offset: 1.6 * $unit;
10-
119

1210
.figure {
1311
position: relative;

components/drawer/style.scss

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ $drawer-width: 24 * $unit;
66
$drawer-bg-color: unquote("rgb(#{$palette-grey-50})") !default;
77
$drawer-text-color: unquote("rgb(#{$palette-grey-800})") !default;
88
$drawer-border-color: unquote("rgb(#{$palette-grey-300})") !default;
9-
$drawer-overlay-color: unquote("rgb(#{$color-black})");
10-
$drawer-transition-duration: .2s;
11-
$drawer-transition-delay: .1s;
129

1310
//-- Local styles
1411
.drawer {
@@ -24,14 +21,13 @@ $drawer-transition-delay: .1s;
2421

2522
.active {
2623
pointer-events: all;
27-
2824
> .content {
29-
transition-delay: $drawer-transition-delay;
25+
transition-delay: $animation-delay;
3026
transform: translateX(0);
3127
}
3228

3329
> .overlay {
34-
opacity: .5;
30+
opacity: $color-overlay-opacity;
3531
}
3632
}
3733

@@ -60,10 +56,10 @@ $drawer-transition-delay: .1s;
6056
.overlay {
6157
width: 100%;
6258
height: 100%;
63-
background-color: $drawer-overlay-color;
59+
background-color: $color-overlay;
6460
opacity: 0;
6561
transition-timing-function: $animation-curve-default;
66-
transition-duration: $drawer-transition-duration;
62+
transition-duration: $animation-duration;
6763
transition-property: opacity;
6864
}
6965

@@ -79,7 +75,7 @@ $drawer-transition-delay: .1s;
7975
background-color: $drawer-bg-color;
8076
transition-delay: 0s;
8177
transition-timing-function: $animation-curve-default;
82-
transition-duration: $drawer-transition-duration;
78+
transition-duration: $animation-duration;
8379
transition-property: transform;
8480
transform-style: preserve-3d;
8581
will-change: transform;

components/variables.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
//-- Color configuration
44
$color-divider: unquote("rgb(#{$palette-grey-200})") !default;
55
$color-background: unquote("rgb(#{$color-white})") !default;
6-
6+
$color-overlay: unquote("rgb(#{$color-black})");
7+
$color-overlay-opacity: 0.5;
78
$color-text: unquote("rgb(#{$palette-grey-900})") !default;
89
$color-text-secondary: unquote("rgb(#{$palette-grey-600})") !default;
910

@@ -15,6 +16,8 @@ $color-accent-contrast: $color-dark-contrast !default;
1516

1617
//-- Units and config
1718
$unit: 1rem;
19+
$offset: 1.6 * $unit;
20+
$border-radius: 0.2 * $unit;
1821

1922
// -- Fonts
2023
$font-size: 1.6 * $unit;
@@ -39,6 +42,8 @@ $zdepth-shadow-4: 0 14px 45px rgba(0,0,0,0.25), 0 10px 18px rgba(0,0,0,0.22);
3942
$zdepth-shadow-5: 0 19px 60px rgba(0,0,0,0.30), 0 15px 20px rgba(0,0,0,0.22);
4043

4144
//-- Animation
45+
$animation-duration: .35s;
46+
$animation-delay: $animation-duration / 5;
4247
$animation-curve-fast-out-slow-in: cubic-bezier(0.4, 0, 0.2, 1) !default;
4348
$animation-curve-linear-out-slow-in: cubic-bezier(0, 0, 0.2, 1) !default;
4449
$animation-curve-fast-out-linear-in: cubic-bezier(0.4, 0, 1, 1) !default;

0 commit comments

Comments
 (0)