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

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
	less/variables.less
This commit is contained in:
Mark Otto
2012-11-05 18:27:25 -08:00
parent 34880e3ef5 79b7017227
commit c0bbe1692c
40 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/variables.less
+1 -1
View File
@@ -66,7 +66,7 @@
@paddingLarge: 11px 19px; // 44px
@paddingSmall: 2px 10px; // 26px
@paddingMini: 0 6px; // 24px
@paddingMini: 0 6px; // 22px
@baseBorderRadius: 4px;
@borderRadiusLarge: 6px;