Summary Files Commits Branches @commit @diff @stats
path: root / src
diff options
context:
space:
mode:
Commit399678ca36318e62af0c37a1958243fbc34ce7ab (patch)
Author
 Yan Zhu <picturepan2@hotmail.com>
2018-11-15 10:30:46 +0800
Committer
 Yan Zhu <picturepan2@hotmail.com>
2018-11-15 10:30:46 +0800
Files639105c7cf861c794d68b7c178ac8c30b75c087e /src
Spectre-Dark-Gruvbox-399678ca36318e62af0c37a1958243fbc34ce7ab.tar
Spectre-Dark-Gruvbox-399678ca36318e62af0c37a1958243fbc34ce7ab.tar.gz
Spectre-Dark-Gruvbox-399678ca36318e62af0c37a1958243fbc34ce7ab.zip
Parent62777073267f956f0207c18e6336fac1174bb52a (diff)
Update transition rules
5 files changed, 6 insertions, 11 deletions
-rw-r--r--src/_buttons.scss2
-rw-r--r--src/_calendars.scss2
-rw-r--r--src/_forms.scss6
-rw-r--r--src/_mixins.scss3
-rw-r--r--src/mixins/_transition.scss4
diff --git a/src/_buttons.scss b/src/_buttons.scss
index 2b1e902..9158f0f 100644
--- a/src/_buttons.scss
+++ b/src/_buttons.scss
@@ -1,6 +1,5 @@
// Buttons
.btn {
- @include control-transition();
appearance: none;
background: $bg-color-light;
border: $border-width solid $primary-color;
@@ -15,6 +14,7 @@
padding: $control-padding-y $control-padding-x;
text-align: center;
text-decoration: none;
+ transition: background .2s, border .2s, box-shadow .2s, color .2s;
user-select: none;
vertical-align: middle;
white-space: nowrap;
diff --git a/src/_calendars.scss b/src/_calendars.scss
index ff00145..1e9fd15 100644
--- a/src/_calendars.scss
+++ b/src/_calendars.scss
@@ -45,7 +45,6 @@
padding: $unit-1;
.date-item {
- @include control-transition();
appearance: none;
background: transparent;
border: $border-width solid transparent;
@@ -60,6 +59,7 @@
position: relative;
text-align: center;
text-decoration: none;
+ transition: background .2s, border .2s, box-shadow .2s, color .2s;
vertical-align: middle;
white-space: nowrap;
width: $unit-7;
diff --git a/src/_forms.scss b/src/_forms.scss
index 50fb585..2c60dfc 100644
--- a/src/_forms.scss
+++ b/src/_forms.scss
@@ -34,7 +34,6 @@ legend {
// Form element: Input
.form-input {
- @include control-transition();
appearance: none;
background: $bg-color-light;
background-image: none;
@@ -49,6 +48,7 @@ legend {
outline: none;
padding: $control-padding-y $control-padding-x;
position: relative;
+ transition: background .2s, border .2s, box-shadow .2s, color .2s;
width: 100%;
&:focus {
@include control-shadow();
@@ -221,11 +221,11 @@ textarea.form-input {
}
.form-icon {
- @include control-transition();
border: $border-width solid $border-color-dark;
cursor: pointer;
display: inline-block;
position: absolute;
+ transition: background .2s, border .2s, box-shadow .2s, color .2s;
}
// Input checkbox, radio and switch sizes
@@ -331,7 +331,6 @@ textarea.form-input {
top: ($control-size-sm - $unit-4) / 2 - $border-width;
width: $unit-8;
&::before {
- @include control-transition();
background: $bg-color-light;
border-radius: 50%;
content: "";
@@ -340,6 +339,7 @@ textarea.form-input {
left: 0;
position: absolute;
top: 0;
+ transition: background .2s, border .2s, box-shadow .2s, color .2s, left .2s;
width: $unit-4;
}
}
diff --git a/src/_mixins.scss b/src/_mixins.scss
index 54bed34..d3a28d5 100644
--- a/src/_mixins.scss
+++ b/src/_mixins.scss
@@ -7,5 +7,4 @@
@import "mixins/position";
@import "mixins/shadow";
@import "mixins/text";
-@import "mixins/toast";
-@import "mixins/transition";
+@import "mixins/toast"; \ No newline at end of file
diff --git a/src/mixins/_transition.scss b/src/mixins/_transition.scss
deleted file mode 100644
index e6fec2a..0000000
--- a/src/mixins/_transition.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// Component transition
-@mixin control-transition() {
- transition: background .2s, border .2s, box-shadow .2s, color .2s;
-}