github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Mark Otto
2011-09-02 00:52:22 -07:00
parent fa94b264fa 2a5d829c4a
commit 251882892f
5 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/docs.css
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;

1
docs/index.html
View File

@@ -905,7 +905,6 @@
<div class="page-header">
<h1>Navigation</h1>
</div>
<h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar">