diff options
| author | Mark Otto <[email protected]> | 2015-04-04 23:52:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-04-04 23:52:40 -0700 |
| commit | 510f56f334087b28581d4a8d02c92eebc693a92b (patch) | |
| tree | c22fcb51754524582a968063acf12eecbe16489a /docs/assets/css/src | |
| parent | a2c69b814509653c454c7a91b9a7ad4521808223 (diff) | |
| parent | 9c41aee780bc1008019684955be7a029679245ca (diff) | |
| download | bootstrap-510f56f334087b28581d4a8d02c92eebc693a92b.tar.xz bootstrap-510f56f334087b28581d4a8d02c92eebc693a92b.zip | |
Merge branch 'master' into fix_15830
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/assets/css/src')
| -rw-r--r-- | docs/assets/css/src/docs.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/css/src/docs.css b/docs/assets/css/src/docs.css index d95ba093c..6cf036a74 100644 --- a/docs/assets/css/src/docs.css +++ b/docs/assets/css/src/docs.css @@ -236,7 +236,7 @@ h4 code { .bs-docs-masthead, .bs-docs-header { position: relative; - padding: 30px 15px; + padding: 30px 0; color: #cdbfe3; text-align: center; text-shadow: 0 1px 0 rgba(0,0,0,.1); |