diff --git a/dist/ratchet.css b/dist/ratchet.css index 100e51b..866bebc 100644 --- a/dist/ratchet.css +++ b/dist/ratchet.css @@ -547,13 +547,6 @@ input[type="button"] { color: #428bca; } -.popover .bar-nav { - border-bottom: 1px solid #dddddd; - border-radius: 12px 12px 0 0; - -webkit-box-shadow: none; - box-shadow: none; -} - .bar-nav .btn { position: relative; z-index: 20; @@ -612,16 +605,16 @@ input[type="button"] { margin: 0 auto; } -.bar > .icon { +.bar .icon { position: relative; z-index: 20; font-size: 24px; margin-top: 11px; } -.bar > .icon.pull-left { +.bar .icon.pull-left { margin-left: -3px; } -.bar > .icon.pull-right { +.bar .icon.pull-right { margin-right: -3px; } @@ -1023,6 +1016,13 @@ select { margin-bottom: 0; } +.popover .bar-nav { + border-bottom: 1px solid #dddddd; + border-radius: 12px 12px 0 0; + -webkit-box-shadow: none; + box-shadow: none; +} + .popover .table-view { width: auto; max-height: 300px; diff --git a/lib/sass/bars.scss b/lib/sass/bars.scss index b19fda4..104753d 100644 --- a/lib/sass/bars.scss +++ b/lib/sass/bars.scss @@ -124,16 +124,6 @@ } -// Nav bar in popovers -// -------------------------------------------------- - -.popover .bar-nav { - border-bottom: $border-default; - border-radius: 12px 12px 0 0; - @include box-shadow(none); -} - - // Nav bars with buttons // -------------------------------------------------- @@ -166,7 +156,7 @@ &.active { color: darken($primary-color, 10%); } - + // Make sure link buttons line up with the content correctly &.pull-left { margin-left: 5px; @@ -221,7 +211,7 @@ // Nav bars with Ratchicons // -------------------------------------------------- -.bar > .icon { +.bar .icon { position: relative; z-index: 20; // Position the buttons on top of .title font-size: 24px; diff --git a/lib/sass/popovers.scss b/lib/sass/popovers.scss index fd8ccd9..ee8d40f 100644 --- a/lib/sass/popovers.scss +++ b/lib/sass/popovers.scss @@ -69,6 +69,16 @@ } +// Popovers with nav bars +// -------------------------------------------------- + +.popover .bar-nav { + border-bottom: $border-default; + border-radius: 12px 12px 0 0; + @include box-shadow(none); +} + + // Table views in popovers // --------------------------------------------------