Commit 27370555 authored by Thomas Park's avatar Thomas Park
Browse files

yeti: btn dropdowns inherit styles like navbar, no border on nav open

parent 1c02bd2c
......@@ -7502,13 +7502,11 @@ td.visible-print {
}
.navbar .dropdown-menu {
padding: 0;
border: none;
}
.navbar .dropdown-menu > li > a,
.navbar .dropdown-menu > li > a:focus {
padding: 12px 15px;
font-size: 13px;
font-weight: 300;
background-color: transparent;
......@@ -7564,11 +7562,99 @@ td.visible-print {
padding: 4px 8px;
}
.btn-group > .btn + .dropdown-toggle {
.btn-group .btn ~ .dropdown-toggle {
padding-right: 16px;
padding-left: 16px;
}
.btn-group .dropdown-menu {
border-top-width: 0;
}
.btn-group.dropup .dropdown-menu {
margin-bottom: 0;
border-top-width: 1px;
border-bottom-width: 0;
}
.btn-group .dropdown-toggle.btn-default + .dropdown-menu {
background-color: #e7e7e7;
border-color: #dadada;
}
.btn-group .dropdown-toggle.btn-default + .dropdown-menu > li > a {
color: #333333;
}
.btn-group .dropdown-toggle.btn-default + .dropdown-menu > li > a:hover {
background-color: #d3d3d3;
}
.btn-group .dropdown-toggle.btn-primary + .dropdown-menu {
background-color: #008cba;
border-color: #0079a1;
}
.btn-group .dropdown-toggle.btn-primary + .dropdown-menu > li > a {
color: #ffffff;
}
.btn-group .dropdown-toggle.btn-primary + .dropdown-menu > li > a:hover {
background-color: #006d91;
}
.btn-group .dropdown-toggle.btn-success + .dropdown-menu {
background-color: #43ac6a;
border-color: #3c9a5f;
}
.btn-group .dropdown-toggle.btn-success + .dropdown-menu > li > a {
color: #ffffff;
}
.btn-group .dropdown-toggle.btn-success + .dropdown-menu > li > a:hover {
background-color: #388f58;
}
.btn-group .dropdown-toggle.btn-info + .dropdown-menu {
background-color: #5bc0de;
border-color: #46b8da;
}
.btn-group .dropdown-toggle.btn-info + .dropdown-menu > li > a {
color: #ffffff;
}
.btn-group .dropdown-toggle.btn-info + .dropdown-menu > li > a:hover {
background-color: #39b3d7;
}
.btn-group .dropdown-toggle.btn-warning + .dropdown-menu {
background-color: #e99002;
border-color: #d08002;
}
.btn-group .dropdown-toggle.btn-warning + .dropdown-menu > li > a {
color: #ffffff;
}
.btn-group .dropdown-toggle.btn-warning + .dropdown-menu > li > a:hover {
background-color: #c17702;
}
.btn-group .dropdown-toggle.btn-danger + .dropdown-menu {
background-color: #f04124;
border-color: #ea2f10;
}
.btn-group .dropdown-toggle.btn-danger + .dropdown-menu > li > a {
color: #ffffff;
}
.btn-group .dropdown-toggle.btn-danger + .dropdown-menu > li > a:hover {
background-color: #dc2c0f;
}
.lead {
color: #6f6f6f;
}
......@@ -7617,6 +7703,12 @@ label,
font-size: 12px;
}
.nav .open > a,
.nav .open > a:hover,
.nav .open > a:focus {
border-color: transparent;
}
.nav-tabs > li > a {
color: #222222;
background-color: #e7e7e7;
......@@ -7716,10 +7808,15 @@ label,
}
.dropdown-menu {
padding: 0;
margin-top: 0;
font-size: 12px;
}
.dropdown-menu > li > a {
padding: 12px 15px;
}
.dropdown-header {
padding-right: 15px;
padding-left: 15px;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -23,12 +23,10 @@
.dropdown {
&-menu {
padding: 0;
border: none;
> li > a,
> li > a:focus {
padding: 12px 15px;
background-color: transparent;
font-size: 13px;
font-weight: 300;
......@@ -94,11 +92,105 @@
&-xs {
padding: 4px 8px;
}
}
.btn-group {
&-group > .btn + .dropdown-toggle {
.btn ~ .dropdown-toggle {
padding-left: 16px;
padding-right: 16px;
}
.dropdown-menu {
border-top-width: 0;
}
&.dropup .dropdown-menu {
border-top-width: 1px;
border-bottom-width: 0;
margin-bottom: 0;
}
.dropdown-toggle {
&.btn-default + .dropdown-menu {
background-color: @btn-default-bg;
border-color: @btn-default-border;
> li > a {
color: @btn-default-color;
}
> li > a:hover {
background-color: darken(@btn-default-bg, 8%);
}
}
&.btn-primary + .dropdown-menu {
background-color: @btn-primary-bg;
border-color: @btn-primary-border;
> li > a {
color: @btn-primary-color;
}
> li > a:hover {
background-color: darken(@btn-primary-bg, 8%);
}
}
&.btn-success + .dropdown-menu {
background-color: @btn-success-bg;
border-color: @btn-success-border;
> li > a {
color: @btn-success-color;
}
> li > a:hover {
background-color: darken(@btn-success-bg, 8%);
}
}
&.btn-info + .dropdown-menu {
background-color: @btn-info-bg;
border-color: @btn-info-border;
> li > a {
color: @btn-info-color;
}
> li > a:hover {
background-color: darken(@btn-info-bg, 8%);
}
}
&.btn-warning + .dropdown-menu {
background-color: @btn-warning-bg;
border-color: @btn-warning-border;
> li > a {
color: @btn-warning-color;
}
> li > a:hover {
background-color: darken(@btn-warning-bg, 8%);
}
}
&.btn-danger + .dropdown-menu {
background-color: @btn-danger-bg;
border-color: @btn-danger-border;
> li > a {
color: @btn-danger-color;
}
> li > a:hover {
background-color: darken(@btn-danger-bg, 8%);
}
}
}
}
// Typography =================================================================
......@@ -157,6 +249,14 @@ label,
// Navs =======================================================================
.nav {
.open > a,
.open > a:hover,
.open > a:focus {
border-color: transparent;
}
}
.nav-tabs {
> li > a {
background-color: @btn-default-bg;
......@@ -264,8 +364,13 @@ label,
.dropdown {
&-menu {
padding: 0;
margin-top: 0;
font-size: @font-size-small;
> li > a {
padding: 12px 15px;
}
}
&-header {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment