This commit is contained in:
Kevin Ross 2016-06-05 10:20:34 -05:00
parent ad6aa0a47b
commit e74f336a8f
5 changed files with 116 additions and 42 deletions

View File

@ -2313,31 +2313,47 @@ legend {
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }
.navbar .navbar-nav .open .dropdown-menu > .dropdown-header { .navbar .navbar-nav .dropdown .dropdown-toggle .caret {
display: none;
}
.navbar .navbar-nav .dropdown .dropdown-toggle:after {
content: 'keyboard_arrow_right';
font-family: 'Material Icons';
font-size: 1.5em;
float: right;
}
.navbar .navbar-nav .dropdown .dropdown-menu {
margin-left: 20px;
}
.navbar .navbar-nav .dropdown.open .dropdown-toggle:after {
content: 'keyboard_arrow_down';
}
.navbar .navbar-nav .dropdown.open .dropdown-menu > .dropdown-header {
border: 0; border: 0;
color: inherit; color: inherit;
} }
.navbar .navbar-nav .open .dropdown-menu .divider { .navbar .navbar-nav .dropdown.open .dropdown-menu .divider {
border-bottom: 1px solid; border-bottom: 1px solid;
opacity: 0.08; opacity: 0.08;
} }
.navbar .navbar-nav .open .dropdown-menu > li > a { .navbar .navbar-nav .dropdown.open .dropdown-menu > li > a {
color: inherit; color: inherit;
font-size: inherit;
} }
.navbar .navbar-nav .open .dropdown-menu > li > a:hover, .navbar .navbar-nav .dropdown.open .dropdown-menu > li > a:hover,
.navbar .navbar-nav .open .dropdown-menu > li > a:focus { .navbar .navbar-nav .dropdown.open .dropdown-menu > li > a:focus {
color: inherit; color: inherit;
background-color: transparent; background-color: transparent;
} }
.navbar .navbar-nav .open .dropdown-menu > .active > a, .navbar .navbar-nav .dropdown.open .dropdown-menu > .active > a,
.navbar .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar .navbar-nav .dropdown.open .dropdown-menu > .active > a:hover,
.navbar .navbar-nav .open .dropdown-menu > .active > a:focus { .navbar .navbar-nav .dropdown.open .dropdown-menu > .active > a:focus {
color: inherit; color: inherit;
background-color: transparent; background-color: transparent;
} }
.navbar .navbar-nav .open .dropdown-menu > .disabled > a, .navbar .navbar-nav .dropdown.open .dropdown-menu > .disabled > a,
.navbar .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar .navbar-nav .dropdown.open .dropdown-menu > .disabled > a:hover,
.navbar .navbar-nav .open .dropdown-menu > .disabled > a:focus { .navbar .navbar-nav .dropdown.open .dropdown-menu > .disabled > a:focus {
color: inherit; color: inherit;
background-color: transparent; background-color: transparent;
} }
@ -2409,6 +2425,12 @@ fieldset[disabled] .navbar .btn-link:focus {
.navbar.navbar-default .dropdown-menu { .navbar.navbar-default .dropdown-menu {
border-radius: 2px; border-radius: 2px;
} }
@media (max-width: 767px) {
.navbar .dropdown-menu .dropdown-header,
.navbar.navbar-default .dropdown-menu .dropdown-header {
background-color: #00b09f;
}
}
.navbar .dropdown-menu li > a, .navbar .dropdown-menu li > a,
.navbar.navbar-default .dropdown-menu li > a { .navbar.navbar-default .dropdown-menu li > a {
font-size: 16px; font-size: 16px;
@ -2451,6 +2473,11 @@ fieldset[disabled] .navbar .btn-link:focus {
.navbar.navbar-inverse .dropdown-menu { .navbar.navbar-inverse .dropdown-menu {
border-radius: 2px; border-radius: 2px;
} }
@media (max-width: 767px) {
.navbar.navbar-inverse .dropdown-menu .dropdown-header {
background-color: #4d5ec1;
}
}
.navbar.navbar-inverse .dropdown-menu li > a { .navbar.navbar-inverse .dropdown-menu li > a {
font-size: 16px; font-size: 16px;
padding: 13px 16px; padding: 13px 16px;
@ -2487,6 +2514,11 @@ fieldset[disabled] .navbar .btn-link:focus {
.navbar.navbar-primary .dropdown-menu { .navbar.navbar-primary .dropdown-menu {
border-radius: 2px; border-radius: 2px;
} }
@media (max-width: 767px) {
.navbar.navbar-primary .dropdown-menu .dropdown-header {
background-color: #00b09f;
}
}
.navbar.navbar-primary .dropdown-menu li > a { .navbar.navbar-primary .dropdown-menu li > a {
font-size: 16px; font-size: 16px;
padding: 13px 16px; padding: 13px 16px;
@ -2523,6 +2555,11 @@ fieldset[disabled] .navbar .btn-link:focus {
.navbar.navbar-success .dropdown-menu { .navbar.navbar-success .dropdown-menu {
border-radius: 2px; border-radius: 2px;
} }
@media (max-width: 767px) {
.navbar.navbar-success .dropdown-menu .dropdown-header {
background-color: #5cb860;
}
}
.navbar.navbar-success .dropdown-menu li > a { .navbar.navbar-success .dropdown-menu li > a {
font-size: 16px; font-size: 16px;
padding: 13px 16px; padding: 13px 16px;
@ -2559,6 +2596,11 @@ fieldset[disabled] .navbar .btn-link:focus {
.navbar.navbar-info .dropdown-menu { .navbar.navbar-info .dropdown-menu {
border-radius: 2px; border-radius: 2px;
} }
@media (max-width: 767px) {
.navbar.navbar-info .dropdown-menu .dropdown-header {
background-color: #14b4fc;
}
}
.navbar.navbar-info .dropdown-menu li > a { .navbar.navbar-info .dropdown-menu li > a {
font-size: 16px; font-size: 16px;
padding: 13px 16px; padding: 13px 16px;
@ -2595,6 +2637,11 @@ fieldset[disabled] .navbar .btn-link:focus {
.navbar.navbar-warning .dropdown-menu { .navbar.navbar-warning .dropdown-menu {
border-radius: 2px; border-radius: 2px;
} }
@media (max-width: 767px) {
.navbar.navbar-warning .dropdown-menu .dropdown-header {
background-color: #ff6a3c;
}
}
.navbar.navbar-warning .dropdown-menu li > a { .navbar.navbar-warning .dropdown-menu li > a {
font-size: 16px; font-size: 16px;
padding: 13px 16px; padding: 13px 16px;
@ -2631,6 +2678,11 @@ fieldset[disabled] .navbar .btn-link:focus {
.navbar.navbar-danger .dropdown-menu { .navbar.navbar-danger .dropdown-menu {
border-radius: 2px; border-radius: 2px;
} }
@media (max-width: 767px) {
.navbar.navbar-danger .dropdown-menu .dropdown-header {
background-color: #f55a4e;
}
}
.navbar.navbar-danger .dropdown-menu li > a { .navbar.navbar-danger .dropdown-menu li > a {
font-size: 16px; font-size: 16px;
padding: 13px 16px; padding: 13px 16px;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -96,37 +96,59 @@
} }
// Dropdowns get custom display // Dropdowns get custom display
.open .dropdown-menu { .dropdown{
> .dropdown-header { .dropdown-toggle{
border: 0; .caret{
color: inherit; display:none;
} }
.divider { &:after{
border-bottom: 1px solid; content: 'keyboard_arrow_right';
opacity: 0.08; font-family: 'Material Icons';
} font-size: 1.5em;
> li > a { float:right;
color: inherit;
&:hover,
&:focus {
color: inherit;
background-color: transparent;
} }
} }
> .active > a { .dropdown-menu{
&, margin-left:20px;
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
} }
> .disabled > a { &.open{
&, .dropdown-toggle:after{
&:hover, content: 'keyboard_arrow_down';
&:focus { }
color: inherit; .dropdown-menu {
background-color: transparent; > .dropdown-header {
border: 0;
color: inherit;
}
.divider {
border-bottom: 1px solid;
opacity: 0.08;
}
> li > a {
color: inherit;
font-size: inherit;
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
> .active > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
> .disabled > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
} }
} }
} }