mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-07-21 08:52:25 -07:00
parent a63db4d2f9 582e9986a8
commit 12468c6103
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/breadcrumbs.less
-1
View File
@@ -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;
less/button-groups.less
+6 -5
View File
@@ -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;
}
}
}