mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch '3.0.0-wip' into bs3_restore_glyphicons

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-18 10:28:32 -07:00
parent 6b24297c5b 6496ffb7d4
commit f8b65b41ab
11 changed files with 381 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/button-groups.less
+3 -2
View File
@@ -159,11 +159,12 @@
}
// Carets in other button sizes
.btn-lg .caret {
border-width: @caret-width-large;
border-width: @caret-width-large @caret-width-large 0;
border-bottom-width: 0;
}
// Upside down carets for .dropup
.dropup .btn-lg .caret {
border-bottom-width: @caret-width-large;
border-width: 0 @caret-width-large @caret-width-large;
}
less/theme.less
+1 -1
View File
@@ -94,7 +94,7 @@
// Basic navbar
.navbar {
#gradient > .vertical(@start-color: lighten(@navbar-bg, 10%); @end-color: @navbar-bg;);
border-radius: @border-radius-base;
border-radius: @navbar-border-radius;
@shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
.box-shadow(@shadow);