diff options
| author | Mark Otto <[email protected]> | 2013-07-21 08:52:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-21 08:52:25 -0700 |
| commit | 12468c61037469985e0cc1669966d63208becc75 (patch) | |
| tree | b286e5447c8195e91eee96caa007295c088f4988 /less | |
| parent | a63db4d2f91c056310fc9a24891dbd161672451b (diff) | |
| parent | 582e9986a865dbf7e0bf1aca2dbec19cb3218506 (diff) | |
| download | bootstrap-12468c61037469985e0cc1669966d63208becc75.tar.xz bootstrap-12468c61037469985e0cc1669966d63208becc75.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/breadcrumbs.less | 1 | ||||
| -rw-r--r-- | less/button-groups.less | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index b127473a7..92643d167 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -12,7 +12,6 @@ > li { display: inline-block; &+li:before { - display: inline-block; content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space padding: 0 5px; color: @breadcrumb-color; diff --git a/less/button-groups.less b/less/button-groups.less index cba0b267a..f345f4e13 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -40,11 +40,12 @@ float: left; } // Space out series of button groups - > .btn + .btn, - > .btn-group + .btn, - > .btn + .btn-group, - > .btn-group + .btn-group { - margin-left: 5px; + > .btn, + > .btn-group { + + .btn, + + .btn-group { + margin-left: 5px; + } } } |