summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.co>2015-11-24 18:28:55 -0500
committerThomas Park <thomas@thomaspark.co>2015-11-24 18:28:55 -0500
commit3111a85f81a3fb53c7e1259d4a7d298b58d5ccfc (patch)
tree693196431854c805677a065c4e8f31abc7f19c19 /bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins
parentffda96bcf751dee3c70d66507de349bdb2220224 (diff)
update bootstrap to 3.3.6
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins')
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss5
-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/_vendor-prefixes.scss4
4 files changed, 6 insertions, 9 deletions
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 ad311873..b93f84b2 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
@@ -42,12 +42,9 @@
&.disabled,
&[disabled],
fieldset[disabled] & {
- &,
&:hover,
&:focus,
- &.focus,
- &:active,
- &.active {
+ &.focus {
background-color: $background;
border-color: $border;
}
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 0820258c..59551dac 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
@@ -6,8 +6,8 @@
@mixin container-fixed($gutter: $grid-gutter-width) {
margin-right: auto;
margin-left: auto;
- padding-left: ($gutter / 2);
- padding-right: ($gutter / 2);
+ padding-left: floor(($gutter / 2));
+ padding-right: ceil(($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 cd17cba6..1767e029 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
@@ -6,7 +6,7 @@
//
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
-// Deprecated as of v3.0.1 (will be removed in v4)
+// Deprecated as of v3.0.1 (has been removed in v4)
@mixin hide-text() {
font: 0/0 a;
color: transparent;
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss
index df4c1ec8..b3d0371f 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss
@@ -1,7 +1,7 @@
// Vendor Prefixes
//
// All vendor mixins are deprecated as of v3.2.0 due to the introduction of
-// Autoprefixer in our Gruntfile. They will be removed in v4.
+// Autoprefixer in our Gruntfile. They have been removed in v4.
// - Animations
// - Backface visibility
@@ -54,7 +54,7 @@
// Prevent browsers from flickering when using CSS 3D transforms.
// Default value is `visible`, but can be changed to `hidden`
-@mixin backface-visibility($visibility){
+@mixin backface-visibility($visibility) {
-webkit-backface-visibility: $visibility;
-moz-backface-visibility: $visibility;
backface-visibility: $visibility;