summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap/less/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/less/mixins
parent06885df3cfbb7d498f59dc5ac61a4cc1cc4f6dc2 (diff)
update bootstrap to 3.3.5
Diffstat (limited to 'bower_components/bootstrap/less/mixins')
-rw-r--r--bower_components/bootstrap/less/mixins/background-variant.less3
-rw-r--r--bower_components/bootstrap/less/mixins/buttons.less20
-rw-r--r--bower_components/bootstrap/less/mixins/grid-framework.less4
-rw-r--r--bower_components/bootstrap/less/mixins/grid.less4
-rw-r--r--bower_components/bootstrap/less/mixins/hide-text.less2
-rw-r--r--bower_components/bootstrap/less/mixins/list-group.less3
-rw-r--r--bower_components/bootstrap/less/mixins/pagination.less3
-rw-r--r--bower_components/bootstrap/less/mixins/reset-text.less18
-rw-r--r--bower_components/bootstrap/less/mixins/responsive-visibility.less2
-rw-r--r--bower_components/bootstrap/less/mixins/text-emphasis.less3
10 files changed, 50 insertions, 12 deletions
diff --git a/bower_components/bootstrap/less/mixins/background-variant.less b/bower_components/bootstrap/less/mixins/background-variant.less
index 556e490d..a85c22b7 100644
--- a/bower_components/bootstrap/less/mixins/background-variant.less
+++ b/bower_components/bootstrap/less/mixins/background-variant.less
@@ -2,7 +2,8 @@
.bg-variant(@color) {
background-color: @color;
- a&:hover {
+ a&:hover,
+ a&:focus {
background-color: darken(@color, 10%);
}
}
diff --git a/bower_components/bootstrap/less/mixins/buttons.less b/bower_components/bootstrap/less/mixins/buttons.less
index 92d8a056..6875a97c 100644
--- a/bower_components/bootstrap/less/mixins/buttons.less
+++ b/bower_components/bootstrap/less/mixins/buttons.less
@@ -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/less/mixins/grid-framework.less b/bower_components/bootstrap/less/mixins/grid-framework.less
index f3b3929d..8c23eed2 100644
--- a/bower_components/bootstrap/less/mixins/grid-framework.less
+++ b/bower_components/bootstrap/less/mixins/grid-framework.less
@@ -19,8 +19,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));
}
}
.col(1); // kickstart it
diff --git a/bower_components/bootstrap/less/mixins/grid.less b/bower_components/bootstrap/less/mixins/grid.less
index cae5eaff..f144c15f 100644
--- a/bower_components/bootstrap/less/mixins/grid.less
+++ b/bower_components/bootstrap/less/mixins/grid.less
@@ -13,8 +13,8 @@
// Creates a wrapper for a series of columns
.make-row(@gutter: @grid-gutter-width) {
- margin-left: (@gutter / -2);
- margin-right: (@gutter / -2);
+ margin-left: ceil((@gutter / -2));
+ margin-right: floor((@gutter / -2));
&:extend(.clearfix all);
}
diff --git a/bower_components/bootstrap/less/mixins/hide-text.less b/bower_components/bootstrap/less/mixins/hide-text.less
index c2315e57..bc701185 100644
--- a/bower_components/bootstrap/less/mixins/hide-text.less
+++ b/bower_components/bootstrap/less/mixins/hide-text.less
@@ -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/less/mixins/list-group.less b/bower_components/bootstrap/less/mixins/list-group.less
index 8b5b065c..03aa1906 100644
--- a/bower_components/bootstrap/less/mixins/list-group.less
+++ b/bower_components/bootstrap/less/mixins/list-group.less
@@ -5,7 +5,8 @@
color: @color;
background-color: @background;
- a& {
+ a&,
+ button& {
color: @color;
.list-group-item-heading {
diff --git a/bower_components/bootstrap/less/mixins/pagination.less b/bower_components/bootstrap/less/mixins/pagination.less
index 7deb505d..618804f2 100644
--- a/bower_components/bootstrap/less/mixins/pagination.less
+++ b/bower_components/bootstrap/less/mixins/pagination.less
@@ -1,11 +1,12 @@
// Pagination
-.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {
+.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/less/mixins/reset-text.less b/bower_components/bootstrap/less/mixins/reset-text.less
new file mode 100644
index 00000000..58dd4d19
--- /dev/null
+++ b/bower_components/bootstrap/less/mixins/reset-text.less
@@ -0,0 +1,18 @@
+.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/less/mixins/responsive-visibility.less b/bower_components/bootstrap/less/mixins/responsive-visibility.less
index f7951c3d..ecf1e979 100644
--- a/bower_components/bootstrap/less/mixins/responsive-visibility.less
+++ b/bower_components/bootstrap/less/mixins/responsive-visibility.less
@@ -4,7 +4,7 @@
// More easily include all the states for responsive-utilities.less.
.responsive-visibility() {
display: block !important;
- table& { display: table; }
+ table& { display: table !important; }
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
diff --git a/bower_components/bootstrap/less/mixins/text-emphasis.less b/bower_components/bootstrap/less/mixins/text-emphasis.less
index 0868ef9f..9e8a77a6 100644
--- a/bower_components/bootstrap/less/mixins/text-emphasis.less
+++ b/bower_components/bootstrap/less/mixins/text-emphasis.less
@@ -2,7 +2,8 @@
.text-emphasis-variant(@color) {
color: @color;
- a&:hover {
+ a&:hover,
+ a&:focus {
color: darken(@color, 10%);
}
}