mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-02 01:42:36 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v4-dev' into yiq-function-update

Browse Source
This commit is contained in:
Gijs Boddeus
2017-10-15 11:55:02 +02:00
committed by GitHub
parent 8f483dc432 3ccb7ef16a
commit 98778164e0
38 changed files with 1125 additions and 844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scss/mixins/_buttons.scss
View File

@@ -32,8 +32,8 @@
border-color: $border;
}
&:active,
&.active,
&:not([disabled]):not(.disabled):active,
&:not([disabled]):not(.disabled).active,
.show > &.dropdown-toggle {
background-color: $active-background;
background-image: none; // Remove the gradient for the pressed/active state
@@ -65,8 +65,8 @@
background-color: transparent;
}
&:active,
&.active,
&:not([disabled]):not(.disabled):active,
&:not([disabled]):not(.disabled).active,
.show > &.dropdown-toggle {
color: $color-hover;
background-color: $color;

3
scss/mixins/_grid.scss
View File

@@ -47,5 +47,6 @@
}
@mixin make-col-offset($size, $columns: $grid-columns) {
margin-left: percentage($size / $columns);
$num: $size / $columns;
margin-left: if($num == 0, 0, percentage($num));
}