summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.co>2015-06-16 21:40:15 -0400
committerThomas Park <thomas@thomaspark.co>2015-06-16 21:40:15 -0400
commitea56c37ca9674f0155448699918650bbfcfbb888 (patch)
tree12b2d28dc05b533adb55e0ff344c41df36d51301 /bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins
parent06885df3cfbb7d498f59dc5ac61a4cc1cc4f6dc2 (diff)
update bootstrap to 3.3.5
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins')
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_background-variant.scss3
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss20
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid-framework.scss4
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid.scss4
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss2
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss5
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss3
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_reset-text.scss18
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss2
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss3
10 files changed, 51 insertions, 13 deletions
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_background-variant.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_background-variant.scss
index 4993bd2b..4c7769e1 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_background-variant.scss
+++ b/bower_components/bootstrap-sass-official/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/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss
index 74a4ffc5..ad311873 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss
+++ b/bower_components/bootstrap-sass-official/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/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid-framework.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
index fb28cb47..16d038c0 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
+++ b/bower_components/bootstrap-sass-official/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/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid.scss
index ae164338..0820258c 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid.scss
+++ b/bower_components/bootstrap-sass-official/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/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss
index c59d7361..cd17cba6 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss
@@ -1,6 +1,6 @@
// CSS image replacement
//
-// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
+// Heads up! v3 launched with only `.hide-text()`, but per our pattern for
// mixins being reused as classes with the same name, this doesn't hold up. As
// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
//
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss
index 5f05e7ba..c478eeb3 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss
@@ -5,10 +5,11 @@
color: $color;
background-color: $background;
- // [converter] extracted a& to a.list-group-item-#{$state}
+ // [converter] extracted a&, button& to a.list-group-item-#{$state}, button.list-group-item-#{$state}
}
- a.list-group-item-#{$state} {
+ a.list-group-item-#{$state},
+ button.list-group-item-#{$state} {
color: $color;
.list-group-item-heading {
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss
index 43fff686..d4a5404f 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss
@@ -1,11 +1,12 @@
// Pagination
-@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) {
+@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
> li {
> a,
> span {
padding: $padding-vertical $padding-horizontal;
font-size: $font-size;
+ line-height: $line-height;
}
&:first-child {
> a,
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_reset-text.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_reset-text.scss
new file mode 100644
index 00000000..c9c28417
--- /dev/null
+++ b/bower_components/bootstrap-sass-official/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/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
index 9867db01..cbdf7772 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
+++ b/bower_components/bootstrap-sass-official/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/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
index 1101e036..3b446c41 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
+++ b/bower_components/bootstrap-sass-official/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%);
}
}