From abca00870f862d024a943b2c563bd42ff3f8418f Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Sun, 18 Aug 2013 23:05:56 +0200 Subject: Add a .navbar-default class for default colors * Extract color styles from .navbar { } and put them into .navbar-default { } * Change variable names * Change the docs accordingly (i.e., add the .navbar-default class to all default navbars) * Change customizer accordingly --- dist/css/bootstrap.css | 197 +++++++++++++++++++++++++++++-------------------- 1 file changed, 117 insertions(+), 80 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 7f4529a34..fc651a9ba 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3942,8 +3942,7 @@ textarea.input-group-sm > .input-group-btn > .btn { position: relative; min-height: 50px; margin-bottom: 20px; - background-color: #f8f8f8; - border: 1px solid #e7e7e7; + border: 1px solid transparent; } .navbar:before, @@ -4003,7 +4002,7 @@ textarea.input-group-sm > .input-group-btn > .btn { padding-right: 15px; padding-left: 15px; overflow-x: visible; - border-top: 1px solid #e6e6e6; + border-top: 1px solid transparent; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch; } @@ -4106,14 +4105,11 @@ textarea.input-group-sm > .input-group-btn > .btn { padding: 15px 15px; font-size: 18px; line-height: 20px; - color: #777777; } .navbar-brand:hover, .navbar-brand:focus { - color: #5e5e5e; text-decoration: none; - background-color: transparent; } @media (min-width: 768px) { @@ -4130,20 +4126,14 @@ textarea.input-group-sm > .input-group-btn > .btn { margin-right: 15px; margin-bottom: 8px; background-color: transparent; - border: 1px solid #dddddd; + border: 1px solid transparent; border-radius: 4px; } -.navbar-toggle:hover, -.navbar-toggle:focus { - background-color: #dddddd; -} - .navbar-toggle .icon-bar { display: block; width: 22px; height: 2px; - background-color: #cccccc; border-radius: 1px; } @@ -4165,27 +4155,6 @@ textarea.input-group-sm > .input-group-btn > .btn { padding-top: 10px; padding-bottom: 10px; line-height: 20px; - color: #777777; -} - -.navbar-nav > li > a:hover, -.navbar-nav > li > a:focus { - color: #333333; - background-color: transparent; -} - -.navbar-nav > .active > a, -.navbar-nav > .active > a:hover, -.navbar-nav > .active > a:focus { - color: #555555; - background-color: #e7e7e7; -} - -.navbar-nav > .disabled > a, -.navbar-nav > .disabled > a:hover, -.navbar-nav > .disabled > a:focus { - color: #cccccc; - background-color: transparent; } @media (max-width: 767px) { @@ -4204,26 +4173,11 @@ textarea.input-group-sm > .input-group-btn > .btn { } .navbar-nav .open .dropdown-menu > li > a { line-height: 20px; - color: #777777; } .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:focus { - color: #333333; - background-color: transparent; background-image: none; } - .navbar-nav .open .dropdown-menu > .active > a, - .navbar-nav .open .dropdown-menu > .active > a:hover, - .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #555555; - background-color: #e7e7e7; - } - .navbar-nav .open .dropdown-menu > .disabled > a, - .navbar-nav .open .dropdown-menu > .disabled > a:hover, - .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #cccccc; - background-color: transparent; - } } @media (min-width: 768px) { @@ -4259,8 +4213,8 @@ textarea.input-group-sm > .input-group-btn > .btn { margin-right: -15px; margin-bottom: 8px; margin-left: -15px; - border-top: 1px solid #e6e6e6; - border-bottom: 1px solid #e6e6e6; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); } @@ -4318,31 +4272,6 @@ textarea.input-group-sm > .input-group-btn > .btn { border-bottom-left-radius: 0; } -.navbar-nav > .dropdown > a:hover .caret, -.navbar-nav > .dropdown > a:focus .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} - -.navbar-nav > .open > a, -.navbar-nav > .open > a:hover, -.navbar-nav > .open > a:focus { - color: #555555; - background-color: #e7e7e7; -} - -.navbar-nav > .open > a .caret, -.navbar-nav > .open > a:hover .caret, -.navbar-nav > .open > a:focus .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar-nav > .dropdown > a .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - .navbar-nav.pull-right > li > .dropdown-menu, .navbar-nav > li > .dropdown-menu.pull-right { right: 0; @@ -4358,7 +4287,6 @@ textarea.input-group-sm > .input-group-btn > .btn { float: left; margin-top: 15px; margin-bottom: 15px; - color: #777777; } @media (min-width: 768px) { @@ -4368,11 +4296,120 @@ textarea.input-group-sm > .input-group-btn > .btn { } } -.navbar-link { +.navbar-default { + background-color: #f8f8f8; + border-color: #e7e7e7; +} + +.navbar-default .navbar-brand { + color: #777777; +} + +.navbar-default .navbar-brand:hover, +.navbar-default .navbar-brand:focus { + color: #5e5e5e; + background-color: transparent; +} + +.navbar-default .navbar-text { + color: #777777; +} + +.navbar-default .navbar-nav > li > a { + color: #777777; +} + +.navbar-default .navbar-nav > li > a:hover, +.navbar-default .navbar-nav > li > a:focus { + color: #333333; + background-color: transparent; +} + +.navbar-default .navbar-nav > .active > a, +.navbar-default .navbar-nav > .active > a:hover, +.navbar-default .navbar-nav > .active > a:focus { + color: #555555; + background-color: #e7e7e7; +} + +.navbar-default .navbar-nav > .disabled > a, +.navbar-default .navbar-nav > .disabled > a:hover, +.navbar-default .navbar-nav > .disabled > a:focus { + color: #cccccc; + background-color: transparent; +} + +.navbar-default .navbar-toggle { + border-color: #dddddd; +} + +.navbar-default .navbar-toggle:hover, +.navbar-default .navbar-toggle:focus { + background-color: #dddddd; +} + +.navbar-default .navbar-toggle .icon-bar { + background-color: #cccccc; +} + +.navbar-default .navbar-collapse, +.navbar-default .navbar-form { + border-color: #e6e6e6; +} + +.navbar-default .navbar-nav > .dropdown > a:hover .caret, +.navbar-default .navbar-nav > .dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; +} + +.navbar-default .navbar-nav > .open > a, +.navbar-default .navbar-nav > .open > a:hover, +.navbar-default .navbar-nav > .open > a:focus { + color: #555555; + background-color: #e7e7e7; +} + +.navbar-default .navbar-nav > .open > a .caret, +.navbar-default .navbar-nav > .open > a:hover .caret, +.navbar-default .navbar-nav > .open > a:focus .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} + +.navbar-default .navbar-nav > .dropdown > a .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} + +@media (max-width: 767px) { + .navbar-default .navbar-nav .open .dropdown-menu > li > a { + color: #777777; + } + .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { + color: #333333; + background-color: transparent; + } + .navbar-default .navbar-nav .open .dropdown-menu > .active > a, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #555555; + background-color: #e7e7e7; + } + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #cccccc; + background-color: transparent; + } +} + +.navbar-default .navbar-link { color: #777777; } -.navbar-link:hover { +.navbar-default .navbar-link:hover { color: #333333; } @@ -6560,4 +6597,4 @@ td.visible-print { td.hidden-print { display: none !important; } -} \ No newline at end of file +} -- cgit v1.2.3 From 9b61b7a72219888ff662186dbe552150497715f9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 15:10:28 -0700 Subject: fixes #9803: label and input alignment in horizontal forms --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 7f4529a34..8e0869178 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1886,7 +1886,7 @@ textarea.input-lg { .form-horizontal .control-label, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline { - padding-top: 6px; + padding-top: 7px; } .form-horizontal .form-group { -- cgit v1.2.3 From fe767a18d369080df509377e049b616c0c572dcc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 15:41:24 -0700 Subject: fixes #9798: update spacing on checkboxes and radios for horizontal --- dist/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8e0869178..47b934b67 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1884,9 +1884,13 @@ textarea.input-lg { } .form-horizontal .control-label, +.form-horizontal .radio, +.form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline { padding-top: 7px; + margin-top: 0; + margin-bottom: 0; } .form-horizontal .form-group { -- cgit v1.2.3