diff options
| author | Mark Otto <[email protected]> | 2013-10-20 19:55:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 19:55:56 -0700 |
| commit | 369f5ba760993001fe6c4cc56ee3cf0327c3395d (patch) | |
| tree | c462c6071aa0601fa505df6ab82292991103f19b /dist/css/bootstrap.css | |
| parent | dd34102cb6bb601c3103f2c74804d2382271c0e1 (diff) | |
| parent | 976f6dfdad663e43237a3da07cb64a41932f264e (diff) | |
| download | bootstrap-369f5ba760993001fe6c4cc56ee3cf0327c3395d.tar.xz bootstrap-369f5ba760993001fe6c4cc56ee3cf0327c3395d.zip | |
Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4d49328bd..c8ff1ff18 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4413,7 +4413,6 @@ textarea.input-group-sm > .input-group-btn > .btn { position: fixed; right: 0; left: 0; - border-width: 0 0 1px; } @media (min-width: 768px) { @@ -4426,11 +4425,13 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-fixed-top { top: 0; z-index: 1030; + border-width: 0 0 1px; } .navbar-fixed-bottom { bottom: 0; margin-bottom: 0; + border-width: 1px 0 0; } .navbar-brand { |