diff --git a/scss/_card.scss b/scss/_card.scss index 25c511a90b..b4d4950dc9 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -213,6 +213,10 @@ } } + &:only-child { + @include border-radius($card-border-radius); + } + &:not(:first-child):not(:last-child):not(:only-child) { border-radius: 0; @@ -221,10 +225,6 @@ border-radius: 0; } } - - &:only-child { - @include border-radius($card-border-radius); - } } } } diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 32657167f5..1782d5b9f1 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -9,19 +9,6 @@ @include caret; } -// Allow for dropdowns to go bottom up (aka, dropup-menu) -// Just add .dropup after the standard .dropdown class and you're set. -.dropup { - .dropdown-menu { - margin-top: 0; - margin-bottom: $dropdown-spacer; - } - - .dropdown-toggle { - @include caret(up); - } -} - // The dropdown menu .dropdown-menu { position: absolute; @@ -44,6 +31,19 @@ @include box-shadow($dropdown-box-shadow); } +// Allow for dropdowns to go bottom up (aka, dropup-menu) +// Just add .dropup after the standard .dropdown class and you're set. +.dropup { + .dropdown-menu { + margin-top: 0; + margin-bottom: $dropdown-spacer; + } + + .dropdown-toggle { + @include caret(up); + } +} + // Dividers (basically an `