mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 18:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into icon_paths

Browse Source 
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
commit c42cd8164c
7 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -238,7 +238,7 @@ module.exports = function (grunt) {
options: { options: {
compatibility: 'ie8', compatibility: 'ie8',
keepSpecialComments: '*', keepSpecialComments: '*',
noAdvanced: true // turn advanced optimizations off until the issue is fixed in clean-css noAdvanced: true
}, },
docs: { docs: {
src: [ src: [

3
dist/css/bootstrap.css vendored
View File

@ -3365,6 +3365,9 @@ tbody.collapse.in {
.btn-group-justified > .btn-group .btn { .btn-group-justified > .btn-group .btn {
width: 100%; width: 100%;
} }
.btn-group-justified > .btn-group .dropdown-menu {
left: auto;
}
[data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="radio"],
[data-toggle="buttons"] > .btn > input[type="checkbox"] { [data-toggle="buttons"] > .btn > input[type="checkbox"] {
position: absolute; position: absolute;

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
less/button-groups.less
View File

@ -216,6 +216,10 @@
> .btn-group .btn { > .btn-group .btn {
width: 100%; width: 100%;
} }
> .btn-group .dropdown-menu {
left: auto;
}
} }