0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

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

This commit is contained in:
Gijs Boddeus 2017-10-05 08:38:59 +02:00 committed by GitHub
commit 8f483dc432
7 changed files with 11 additions and 23 deletions

View File

@ -14,7 +14,7 @@ When reporting a bug, include:
- Operating system and version (Windows, Mac OS X, Android, iOS, Win10 Mobile)
- Browser and version (Chrome, Firefox, Safari, IE, MS Edge, Opera 15+, Android Browser)
- Reduced test cases and potential fixes using [JS Bin](https://jsbin.com/)
- Reduced test cases and potential fixes using [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/)
When suggesting a feature, include:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 KiB

View File

@ -3,8 +3,7 @@
"parser": "babel-eslint",
"env": {
"browser": true,
"es6": true,
"jquery": true
"es6": true
},
"extends": "eslint:recommended",
"plugins": ["compat"],

View File

@ -1,7 +1,8 @@
{
"env": {
"es6": false,
"qunit": true
"qunit": true,
"jquery": true
},
"globals": {
"Util": false

View File

@ -74,13 +74,6 @@
position: static;
float: none;
}
.dropdown-toggle {
&::after {
border-top: $caret-width solid;
border-bottom: 0;
}
}
}
@ -151,18 +144,6 @@
padding-right: 0;
padding-left: 0;
}
.dropup {
.dropdown-menu {
position: absolute;
top: auto;
bottom: 100%;
}
.dropdown-toggle {
@include caret(up);
}
}
}
@include media-breakpoint-up($next) {
@ -203,6 +184,13 @@
.navbar-toggler {
display: none;
}
.dropup {
.dropdown-menu {
top: auto;
bottom: 100%;
}
}
}
}
}