2
0
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:
Mark Otto
2014-05-12 20:26:23 -07:00
7 changed files with 12 additions and 5 deletions
+1 -1
View File
@@ -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: [
+3
View File
@@ -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;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+4
View File
@@ -216,6 +216,10 @@
> .btn-group .btn {
width: 100%;
}
> .btn-group .dropdown-menu {
left: auto;
}
}