aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-11-22 22:09:04 -0500
committerMark Otto <[email protected]>2013-11-22 22:09:04 -0500
commit98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3 (patch)
tree1eb37ecb58bc71628504273161dd0bb11dd4753e /dist/css/bootstrap.css
parent37f3944bd9a1cc2b7cb2dda6f767b708daab5fc1 (diff)
parent4c246c0117ea56cb10b91b635ff415ec20d9c97d (diff)
downloadbootstrap-98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3.tar.xz
bootstrap-98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3.zip
Merge branch 'master' into docs_derp
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css2
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 68e8b8c75..d8dfe14c4 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4665,13 +4665,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.navbar-text {
- float: left;
margin-top: 15px;
margin-bottom: 15px;
}
@media (min-width: 768px) {
.navbar-text {
+ float: left;
margin-right: 15px;
margin-left: 15px;
}