Summary Files Commits Branches @commit @diff @stats
path: root / src
diff options
context:
space:
mode:
Commitc3f9c6fa422a0413672086ed305a2a91e5fb3533 (patch)
Author
 Yan Zhu <picturepan2@hotmail.com>
2018-06-19 08:49:16 +0800
Committer
 GitHub <noreply@github.com>
2018-06-19 08:49:16 +0800
Files8c0471d628a06b937a8f549c6936ebdad68dcf50 /src
Spectre-Dark-Gruvbox-c3f9c6fa422a0413672086ed305a2a91e5fb3533.tar
Spectre-Dark-Gruvbox-c3f9c6fa422a0413672086ed305a2a91e5fb3533.tar.gz
Spectre-Dark-Gruvbox-c3f9c6fa422a0413672086ed305a2a91e5fb3533.zip
Parent8eee30d11744ab9b20ca0c8b60087b64c4588ce6 (diff)
Parentc844709948fa925c837a22e0c13c6c54e0906383 (diff)
Merge pull request #456 from picturepan2/0.5.3 v0.5.3
0.5.3
10 files changed, 48 insertions, 35 deletions
-rw-r--r--src/_avatars.scss2
-rw-r--r--src/_badges.scss12
-rw-r--r--src/_cards.scss4
-rw-r--r--src/_chips.scss4
-rw-r--r--src/_forms.scss21
-rw-r--r--src/_popovers.scss26
-rw-r--r--src/_variables.scss4
-rw-r--r--src/mixins/_label.scss2
-rw-r--r--src/utilities/_colors.scss2
-rw-r--r--src/utilities/_shapes.scss6
diff --git a/src/_avatars.scss b/src/_avatars.scss
index 5eb23f8..b203aa2 100644
--- a/src/_avatars.scss
+++ b/src/_avatars.scss
@@ -74,4 +74,4 @@
transform: translate(-50%, -50%);
z-index: $zindex-0;
}
-}
+} \ No newline at end of file
diff --git a/src/_badges.scss b/src/_badges.scss
index 554ab1b..d67f6d1 100644
--- a/src/_badges.scss
+++ b/src/_badges.scss
@@ -13,7 +13,7 @@
color: $light-color;
content: attr(data-badge);
display: inline-block;
- transform: translate(-.1rem, -.5rem);
+ transform: translate(-.05rem, -.5rem);
}
}
&[data-badge] {
@@ -57,14 +57,4 @@
z-index: $zindex-1;
}
}
-
- &.avatar-xs {
- &::after {
- content: "";
- height: $unit-2;
- min-width: $unit-2;
- padding: 0;
- width: $unit-2;
- }
- }
}
diff --git a/src/_cards.scss b/src/_cards.scss
index 3ecdc0a..6b712e1 100644
--- a/src/_cards.scss
+++ b/src/_cards.scss
@@ -17,6 +17,10 @@
}
}
+ .card-body {
+ flex: 1 1 auto;
+ }
+
.card-image {
padding-top: $layout-spacing-lg;
diff --git a/src/_chips.scss b/src/_chips.scss
index f6d7d6e..1763567 100644
--- a/src/_chips.scss
+++ b/src/_chips.scss
@@ -23,4 +23,8 @@
margin-left: -$unit-2;
margin-right: $unit-1;
}
+
+ .btn-clear {
+ transform: scale(.75);
+ }
}
diff --git a/src/_forms.scss b/src/_forms.scss
index cd3fc5e..8b53df9 100644
--- a/src/_forms.scss
+++ b/src/_forms.scss
@@ -193,7 +193,7 @@ textarea.form-input {
.form-checkbox,
.form-radio,
.form-switch {
- display: inline-block;
+ display: block;
line-height: $line-height;
margin: ($control-size - $control-size-sm) / 2 0;
min-height: 1.2rem;
@@ -462,6 +462,18 @@ textarea.form-input {
}
}
+.form-checkbox {
+ .has-error &,
+ &.is-error {
+ input {
+ &:indeterminate + .form-icon {
+ background: $error-color;
+ border-color: $error-color;
+ }
+ }
+ }
+}
+
// validation based on :placeholder-shown (Edge doesn't support it yet)
.form-input {
&:not(:placeholder-shown) {
@@ -517,7 +529,7 @@ input {
}
}
-// Form Horizontal
+// Form horizontal
.form-horizontal {
padding: $layout-spacing 0;
@@ -526,3 +538,8 @@ input {
flex-wrap: wrap;
}
}
+
+// Form inline
+.form-inline {
+ display: inline-block;
+} \ No newline at end of file
diff --git a/src/_popovers.scss b/src/_popovers.scss
index 34ac7bd..c43a6d1 100644
--- a/src/_popovers.scss
+++ b/src/_popovers.scss
@@ -16,11 +16,10 @@
}
*:focus + .popover-container,
- &:hover .popover-container,
- .popover-container:hover {
+ &:hover .popover-container {
display: block;
opacity: 1;
- transform: translate(-50%, -100%) scale(1);
+ transform: translate(-50%, -100%);
}
&.popover-right {
@@ -29,10 +28,9 @@
top: 50%;
}
- :focus + .popover-container,
- &:hover .popover-container,
- .popover-container:hover {
- transform: translate(0, -50%) scale(1);
+ *:focus + .popover-container,
+ &:hover .popover-container {
+ transform: translate(0, -50%);
}
}
@@ -42,10 +40,9 @@
top: 100%;
}
- :focus + .popover-container,
- &:hover .popover-container,
- .popover-container:hover {
- transform: translate(-50%, 0) scale(1);
+ *:focus + .popover-container,
+ &:hover .popover-container {
+ transform: translate(-50%, 0);
}
}
@@ -55,10 +52,9 @@
top: 50%;
}
- :focus + .popover-container,
- &:hover .popover-container,
- .popover-container:hover {
- transform: translate(-100%, -50%) scale(1);
+ *:focus + .popover-container,
+ &:hover .popover-container {
+ transform: translate(-100%, -50%);
}
}
diff --git a/src/_variables.scss b/src/_variables.scss
index 1162aab..c101520 100644
--- a/src/_variables.scss
+++ b/src/_variables.scss
@@ -1,5 +1,5 @@
// Core variables
-$version: "0.5.2";
+$version: "0.5.3";
// Core features
$rtl: false !default;
@@ -72,7 +72,7 @@ $html-line-height: 1.5 !default;
$font-size: .8rem !default;
$font-size-sm: .7rem !default;
$font-size-lg: .9rem !default;
-$line-height: 1rem !default;
+$line-height: 1.2rem !default;
// Sizes
$layout-spacing: $unit-2 !default;
diff --git a/src/mixins/_label.scss b/src/mixins/_label.scss
index fad20c1..70dcac3 100644
--- a/src/mixins/_label.scss
+++ b/src/mixins/_label.scss
@@ -2,7 +2,7 @@
@mixin label-base() {
border-radius: $border-radius;
line-height: 1.2;
- padding: .1rem .15rem;
+ padding: .1rem .2rem;
}
@mixin label-variant($color: $light-color, $bg-color: $primary-color) {
diff --git a/src/utilities/_colors.scss b/src/utilities/_colors.scss
index eced5ad..28dd221 100644
--- a/src/utilities/_colors.scss
+++ b/src/utilities/_colors.scss
@@ -7,6 +7,8 @@
@include text-color-variant(".text-light", $light-color);
+@include text-color-variant(".text-dark", $body-font-color);
+
@include text-color-variant(".text-success", $success-color);
@include text-color-variant(".text-warning", $warning-color);
diff --git a/src/utilities/_shapes.scss b/src/utilities/_shapes.scss
index c11d5df..23e131e 100644
--- a/src/utilities/_shapes.scss
+++ b/src/utilities/_shapes.scss
@@ -1,8 +1,8 @@
// Shapes
-.rounded {
+.s-rounded {
border-radius: $border-radius;
}
-.circle {
+.s-circle {
border-radius: 50%;
-}
+} \ No newline at end of file