Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2017-06-01 20:16:17 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2017-06-01 20:16:17 +0300
commite92f95fb42ab938fd6f4d59e7b3b243e297ef58f (patch)
tree780e524de7949337515dec87ff804d51b0f8ecfb /assets/stylesheets
parentd1e4e696b7fefcaec458aa6ab8f31411172011d6 (diff)
rake update[v4-dev]
Diffstat (limited to 'assets/stylesheets')
-rw-r--r--assets/stylesheets/bootstrap/_dropdown.scss4
-rw-r--r--assets/stylesheets/bootstrap/_variables.scss2
-rw-r--r--assets/stylesheets/bootstrap/mixins/_cards.scss2
3 files changed, 4 insertions, 4 deletions
diff --git a/assets/stylesheets/bootstrap/_dropdown.scss b/assets/stylesheets/bootstrap/_dropdown.scss
index d9e75b0..ac19ee0 100644
--- a/assets/stylesheets/bootstrap/_dropdown.scss
+++ b/assets/stylesheets/bootstrap/_dropdown.scss
@@ -10,8 +10,8 @@
display: inline-block;
width: 0;
height: 0;
- margin-left: $caret-width;
- vertical-align: middle;
+ margin-left: $caret-width * .85;
+ vertical-align: $caret-width * .85;
content: "";
border-top: $caret-width solid;
border-right: $caret-width solid transparent;
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
index 20826e8..74e2fab 100644
--- a/assets/stylesheets/bootstrap/_variables.scss
+++ b/assets/stylesheets/bootstrap/_variables.scss
@@ -677,7 +677,7 @@ $card-border-radius-inner: calc(#{$card-border-radius} - #{$card-border-width})
$card-cap-bg: $gray-lightest !default;
$card-bg: $white !default;
-$card-link-hover-color: $white !default;
+$card-inverse-link-hover-color: $white !default;
$card-img-overlay-padding: 1.25rem !default;
diff --git a/assets/stylesheets/bootstrap/mixins/_cards.scss b/assets/stylesheets/bootstrap/mixins/_cards.scss
index e535b31..c32ca68 100644
--- a/assets/stylesheets/bootstrap/mixins/_cards.scss
+++ b/assets/stylesheets/bootstrap/mixins/_cards.scss
@@ -47,7 +47,7 @@
}
.card-link {
@include hover-focus {
- color: $card-link-hover-color;
+ color: $card-inverse-link-hover-color;
}
}
}