mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-05-18 12:39:41 +03:00
Merge branch 'master' into icon_paths
Conflicts: dist/css/bootstrap.css.map docs/dist/css/bootstrap.css.map
This commit is contained in:
+1
-1
@@ -238,7 +238,7 @@ module.exports = function (grunt) {
|
||||
options: {
|
||||
compatibility: 'ie8',
|
||||
keepSpecialComments: '*',
|
||||
noAdvanced: true // turn advanced optimizations off until the issue is fixed in clean-css
|
||||
noAdvanced: true
|
||||
},
|
||||
docs: {
|
||||
src: [
|
||||
|
||||
Vendored
+3
@@ -3365,6 +3365,9 @@ tbody.collapse.in {
|
||||
.btn-group-justified > .btn-group .btn {
|
||||
width: 100%;
|
||||
}
|
||||
.btn-group-justified > .btn-group .dropdown-menu {
|
||||
left: auto;
|
||||
}
|
||||
[data-toggle="buttons"] > .btn > input[type="radio"],
|
||||
[data-toggle="buttons"] > .btn > input[type="checkbox"] {
|
||||
position: absolute;
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -216,6 +216,10 @@
|
||||
> .btn-group .btn {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
> .btn-group .dropdown-menu {
|
||||
left: auto;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user