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 <glebm@google.com>2015-04-27 11:59:39 +0300
committerGleb Mazovetskiy <glebm@google.com>2015-04-27 11:59:39 +0300
commitf95e617f9d165c85a7d9fe658f56b53c5b756dcb (patch)
tree1a5b728c2153985adf4d60ef4c9bed7d8ee847d6 /assets/stylesheets/bootstrap/mixins
parent4d879df2cb2dd4ef6dc72478a1a389d5f60a45f6 (diff)
rake convert
Diffstat (limited to 'assets/stylesheets/bootstrap/mixins')
-rw-r--r--assets/stylesheets/bootstrap/mixins/_background-variant.scss3
-rw-r--r--assets/stylesheets/bootstrap/mixins/_buttons.scss20
-rw-r--r--assets/stylesheets/bootstrap/mixins/_grid-framework.scss4
-rw-r--r--assets/stylesheets/bootstrap/mixins/_grid.scss4
-rw-r--r--assets/stylesheets/bootstrap/mixins/_reset-text.scss18
-rw-r--r--assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss2
-rw-r--r--assets/stylesheets/bootstrap/mixins/_text-emphasis.scss3
7 files changed, 45 insertions, 9 deletions
diff --git a/assets/stylesheets/bootstrap/mixins/_background-variant.scss b/assets/stylesheets/bootstrap/mixins/_background-variant.scss
index 4993bd2..4c7769e 100644
--- a/assets/stylesheets/bootstrap/mixins/_background-variant.scss
+++ b/assets/stylesheets/bootstrap/mixins/_background-variant.scss
@@ -5,7 +5,8 @@
#{$parent} {
background-color: $color;
}
- a#{$parent}:hover {
+ a#{$parent}:hover,
+ a#{$parent}:focus {
background-color: darken($color, 10%);
}
}
diff --git a/assets/stylesheets/bootstrap/mixins/_buttons.scss b/assets/stylesheets/bootstrap/mixins/_buttons.scss
index 74a4ffc..ad31187 100644
--- a/assets/stylesheets/bootstrap/mixins/_buttons.scss
+++ b/assets/stylesheets/bootstrap/mixins/_buttons.scss
@@ -8,15 +8,31 @@
background-color: $background;
border-color: $border;
- &:hover,
&:focus,
- &.focus,
+ &.focus {
+ color: $color;
+ background-color: darken($background, 10%);
+ border-color: darken($border, 25%);
+ }
+ &:hover {
+ color: $color;
+ background-color: darken($background, 10%);
+ border-color: darken($border, 12%);
+ }
&:active,
&.active,
.open > &.dropdown-toggle {
color: $color;
background-color: darken($background, 10%);
border-color: darken($border, 12%);
+
+ &:hover,
+ &:focus,
+ &.focus {
+ color: $color;
+ background-color: darken($background, 17%);
+ border-color: darken($border, 25%);
+ }
}
&:active,
&.active,
diff --git a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
index fb28cb4..16d038c 100644
--- a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
+++ b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
@@ -13,8 +13,8 @@
// Prevent columns from collapsing when empty
min-height: 1px;
// Inner gutter via padding
- padding-left: ($grid-gutter-width / 2);
- padding-right: ($grid-gutter-width / 2);
+ padding-left: ceil(($grid-gutter-width / 2));
+ padding-right: floor(($grid-gutter-width / 2));
}
}
diff --git a/assets/stylesheets/bootstrap/mixins/_grid.scss b/assets/stylesheets/bootstrap/mixins/_grid.scss
index ae16433..0820258 100644
--- a/assets/stylesheets/bootstrap/mixins/_grid.scss
+++ b/assets/stylesheets/bootstrap/mixins/_grid.scss
@@ -13,8 +13,8 @@
// Creates a wrapper for a series of columns
@mixin make-row($gutter: $grid-gutter-width) {
- margin-left: ($gutter / -2);
- margin-right: ($gutter / -2);
+ margin-left: ceil(($gutter / -2));
+ margin-right: floor(($gutter / -2));
@include clearfix;
}
diff --git a/assets/stylesheets/bootstrap/mixins/_reset-text.scss b/assets/stylesheets/bootstrap/mixins/_reset-text.scss
new file mode 100644
index 0000000..c9c2841
--- /dev/null
+++ b/assets/stylesheets/bootstrap/mixins/_reset-text.scss
@@ -0,0 +1,18 @@
+@mixin reset-text() {
+ font-family: $font-family-base;
+ // We deliberately do NOT reset font-size.
+ font-style: normal;
+ font-weight: normal;
+ letter-spacing: normal;
+ line-break: auto;
+ line-height: $line-height-base;
+ text-align: left; // Fallback for where `start` is not supported
+ text-align: start;
+ text-decoration: none;
+ text-shadow: none;
+ text-transform: none;
+ white-space: normal;
+ word-break: normal;
+ word-spacing: normal;
+ word-wrap: normal;
+}
diff --git a/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss b/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
index 9867db0..cbdf777 100644
--- a/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
+++ b/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
@@ -7,7 +7,7 @@
#{$parent} {
display: block !important;
}
- table#{$parent} { display: table; }
+ table#{$parent} { display: table !important; }
tr#{$parent} { display: table-row !important; }
th#{$parent},
td#{$parent} { display: table-cell !important; }
diff --git a/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss b/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
index 1101e03..3b446c4 100644
--- a/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
+++ b/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
@@ -5,7 +5,8 @@
#{$parent} {
color: $color;
}
- a#{$parent}:hover {
+ a#{$parent}:hover,
+ a#{$parent}:focus {
color: darken($color, 10%);
}
}