Summary Files Commits Branches @commit @diff @stats
path: root / src
diff options
context:
space:
mode:
Commitef6d8056d26fe952891e47660f1cb0d1ed7041f1 (patch)
Author
 Yan Zhu <picturepan2@hotmail.com>
2018-11-08 07:42:33 +0800
Committer
 GitHub <noreply@github.com>
2018-11-08 07:42:33 +0800
Files26e1a053ee953a570e54939ef30c2c89636a6acf /src
Spectre-Dark-Gruvbox-ef6d8056d26fe952891e47660f1cb0d1ed7041f1.tar
Spectre-Dark-Gruvbox-ef6d8056d26fe952891e47660f1cb0d1ed7041f1.tar.gz
Spectre-Dark-Gruvbox-ef6d8056d26fe952891e47660f1cb0d1ed7041f1.zip
Parent0a6c76429b294c26d318479c05736537f3d95abb (diff)
Parenteb7fd9d2538accfe5d291ca93d2ce7dd6e62fefa (diff)
Merge pull request #522 from picturepan2/0.5.5 v0.5.5
0.5.5
8 files changed, 21 insertions, 13 deletions
-rw-r--r--src/_asian.scss17
-rw-r--r--src/_chips.scss2
-rw-r--r--src/_forms.scss3
-rwxr-xr-xsrc/_navbar.scss1
-rw-r--r--src/_steps.scss5
-rw-r--r--src/_variables.scss2
-rw-r--r--src/utilities/_colors.scss2
-rw-r--r--src/utilities/_cursors.scss2
diff --git a/src/_asian.scss b/src/_asian.scss
index 38dc77e..e426f39 100644
--- a/src/_asian.scss
+++ b/src/_asian.scss
@@ -1,24 +1,29 @@
// Optimized for East Asian CJK
-:lang(zh),
-:lang(zh-Hans) {
+html:lang(zh),
+html:lang(zh-Hans),
+.lang-zh,
+.lang-zh-hans {
font-family: $cjk-zh-hans-font-family;
}
-:lang(zh-Hant) {
+html:lang(zh-Hant),
+.lang-zh-hant {
font-family: $cjk-zh-hant-font-family;
}
-:lang(ja) {
+html:lang(ja),
+.lang-ja {
font-family: $cjk-jp-font-family;
}
-:lang(ko) {
+html:lang(ko),
+.lang-ko {
font-family: $cjk-ko-font-family;
}
:lang(zh),
:lang(ja),
-.cjk {
+.lang-cjk {
ins,
u {
border-bottom: $border-width solid;
diff --git a/src/_chips.scss b/src/_chips.scss
index d2c0fe2..f89a362 100644
--- a/src/_chips.scss
+++ b/src/_chips.scss
@@ -9,7 +9,7 @@
line-height: $unit-4;
margin: $unit-h;
max-width: $control-width-sm;
- overflow-x: hidden;
+ overflow: hidden;
padding: $unit-1 $unit-2;
text-decoration: none;
text-overflow: ellipsis;
diff --git a/src/_forms.scss b/src/_forms.scss
index b7ef0fa..68de202 100644
--- a/src/_forms.scss
+++ b/src/_forms.scss
@@ -427,6 +427,7 @@ textarea.form-input {
.form-select {
.has-success &,
&.is-success {
+ background: lighten($success-color, 53%);
border-color: $success-color;
&:focus {
@include control-shadow($success-color);
@@ -435,6 +436,7 @@ textarea.form-input {
.has-error &,
&.is-error {
+ background: lighten($error-color, 53%);
border-color: $error-color;
&:focus {
@include control-shadow($error-color);
@@ -484,6 +486,7 @@ textarea.form-input {
border-color: $error-color;
&:focus {
@include control-shadow($error-color);
+ background: lighten($error-color, 10%);
}
& + .form-input-hint {
diff --git a/src/_navbar.scss b/src/_navbar.scss
index 57585ab..1164296 100755
--- a/src/_navbar.scss
+++ b/src/_navbar.scss
@@ -23,7 +23,6 @@
.navbar-brand {
font-size: $font-size-lg;
- font-weight: 500;
text-decoration: none;
}
}
diff --git a/src/_steps.scss b/src/_steps.scss
index d5ddc6e..f642ff8 100644
--- a/src/_steps.scss
+++ b/src/_steps.scss
@@ -24,7 +24,7 @@
}
a {
- color: $gray-color;
+ color: $primary-color;
display: inline-block;
padding: 20px 10px 0;
text-decoration: none;
@@ -59,9 +59,10 @@
}
a {
+ color: $gray-color;
&::before {
- background: $gray-color-light;
+ background: $border-color;
}
}
}
diff --git a/src/_variables.scss b/src/_variables.scss
index ae47abe..0af2bf5 100644
--- a/src/_variables.scss
+++ b/src/_variables.scss
@@ -1,5 +1,5 @@
// Core variables
-$version: "0.5.4";
+$version: "0.5.5";
// Core features
$rtl: false !default;
diff --git a/src/utilities/_colors.scss b/src/utilities/_colors.scss
index 2039038..28dd221 100644
--- a/src/utilities/_colors.scss
+++ b/src/utilities/_colors.scss
@@ -3,7 +3,7 @@
@include text-color-variant(".text-secondary", $secondary-color-dark);
-@include text-color-variant(".text-gray", $gray-color-dark);
+@include text-color-variant(".text-gray", $gray-color);
@include text-color-variant(".text-light", $light-color);
diff --git a/src/utilities/_cursors.scss b/src/utilities/_cursors.scss
index bfc4c6b..bd755c8 100644
--- a/src/utilities/_cursors.scss
+++ b/src/utilities/_cursors.scss
@@ -21,4 +21,4 @@
.c-auto {
cursor: auto;
-}
+} \ No newline at end of file