diff options
| author | Mark Otto <[email protected]> | 2013-08-02 19:30:03 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-02 19:30:03 -0700 |
| commit | a3be713f8f61e8c37c4bf3db94a51dfc83ac935b (patch) | |
| tree | 69324c05407929146e41658e0ca08ce40350539e /dist/css/bootstrap.css | |
| parent | e8145ac9390b92aca69a84dfdd561793b72e7540 (diff) | |
| parent | 7cfcfdfe64159b4ea7b94606f9303ab567049198 (diff) | |
| download | bootstrap-a3be713f8f61e8c37c4bf3db94a51dfc83ac935b.tar.xz bootstrap-a3be713f8f61e8c37c4bf3db94a51dfc83ac935b.zip | |
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8aaf8d451..5e9656918 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3083,6 +3083,8 @@ button.close { } .navbar-text { + float: left; + padding: 0 15px; margin-top: 15px; margin-bottom: 15px; } |