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

resolve conflicts

This commit is contained in:
Mark Otto
2011-09-02 00:52:22 -07:00
5 changed files with 27 additions and 23 deletions
+1 -1
View File
@@ -200,7 +200,7 @@ div.topbar-wrapper div.topbar {
margin: 0 -20px;
}
div.topbar-wrapper div.topbar .fill {
div.topbar-wrapper div.topbar .topbar-inner {
padding-left: 20px;
padding-right: 20px;
-webkit-border-radius: 4px;