diff options
| author | Mark Otto <[email protected]> | 2014-03-10 00:08:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-10 00:08:29 -0700 |
| commit | a36643dd338537a9b4319fbab6e1dbf2e7d1cf9c (patch) | |
| tree | a097e839bc115709770b6e1b533a63bf653e58f0 /dist/css/bootstrap.css | |
| parent | 3a2d6e40503019823bf197f278681e830bc14f31 (diff) | |
| parent | 6dd51fab44df852697564f6257403b57f85f492b (diff) | |
| download | bootstrap-a36643dd338537a9b4319fbab6e1dbf2e7d1cf9c.tar.xz bootstrap-a36643dd338537a9b4319fbab6e1dbf2e7d1cf9c.zip | |
Merge branch 'master' into modular-the-mixins
Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b631bb364..9e230e27d 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3207,7 +3207,7 @@ tbody.collapse.in { } .btn-group > .btn:focus, .btn-group-vertical > .btn:focus { - outline: none; + outline: 0; } .btn-group .btn + .btn, .btn-group .btn + .btn-group, @@ -3835,7 +3835,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-radius: 4px; } .navbar-toggle:focus { - outline: none; + outline: 0; } .navbar-toggle .icon-bar { display: block; @@ -5303,7 +5303,7 @@ button.close { border: 1px solid #999; border: 1px solid rgba(0, 0, 0, .2); border-radius: 6px; - outline: none; + outline: 0; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5); box-shadow: 0 3px 9px rgba(0, 0, 0, .5); } @@ -5678,7 +5678,7 @@ button.close { color: #fff; text-decoration: none; filter: alpha(opacity=90); - outline: none; + outline: 0; opacity: .9; } .carousel-control .icon-prev, |