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' of https://github.com/twbs/bootstrap into v4-dev

Browse Source
This commit is contained in:
Mark Otto
2018-02-24 12:38:51 -08:00
parent 982aeea1f7 6708c4dba5
commit b8bfd26358
9 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scss/_variables.scss
View File

@@ -608,6 +608,8 @@ $nav-pills-border-radius: $border-radius !default;
$nav-pills-link-active-color: $component-active-color !default;
$nav-pills-link-active-bg: $component-active-bg !default;
$nav-divider-margin-y: ($spacer / 2) !default;
// Navbar
$navbar-padding-y: ($spacer / 2) !default;

2
scss/mixins/_hover.scss
View File

@@ -1,5 +1,3 @@
// stylelint-disable indentation
// Hover mixin and `$enable-hover-media-query` are deprecated.
//
// Origally added during our alphas and maintained during betas, this mixin was

4
scss/mixins/_nav-divider.scss
View File

@@ -2,9 +2,9 @@
//
// Dividers (basically an hr) within dropdowns and nav lists
@mixin nav-divider($color: #e5e5e5) {
@mixin nav-divider($color: #e5e5e5, $margin-y: $nav-divider-margin-y) {
height: 0;
margin: ($spacer / 2) 0;
margin: $margin-y 0;
overflow: hidden;
border-top: 1px solid $color;
}