diff --git a/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars b/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars index 7d10dcc8d84..97eca39fbaf 100644 --- a/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars +++ b/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars @@ -4,55 +4,55 @@ diff --git a/app/assets/stylesheets/components/buttons.css.scss b/app/assets/stylesheets/components/buttons.css.scss index 74e25ad4a51..c86eaac4e8a 100755 --- a/app/assets/stylesheets/components/buttons.css.scss +++ b/app/assets/stylesheets/components/buttons.css.scss @@ -59,6 +59,12 @@ } } +// Buttons used in admin panel +// -------------------------------------------------- +.btn-admin { + text-align:left; +} + // Primary button // -------------------------------------------------- @@ -86,6 +92,34 @@ @include linear-gradient($btn-primary-background-color, $btn-primary-background-color-dark); @include box-shadow((inset 0 1px 0 rgba($white, 0.33), inset 0 -1px 2px rgba($black, 0.2))); } + + // Danger button + // -------------------------------------------------- + + .btn-danger { + border: 1px solid $btn-danger-border-color; + color: $white; + text-shadow: 0 1px 0 rgba($black, 0.2); + font-weight: bold; + @include linear-gradient($btn-danger-background-color, $btn-danger-background-color-dark); + @include box-shadow((inset 0 1px 0 rgba($white, 0.33), inset 0 -1px 2px rgba($black, 0.2))); + &[href] { + color: $white; + } + &:hover, + &:focus { + @include linear-gradient($btn-danger-background-color, $btn-danger-background-color-light); + @include box-shadow(inset 0 1px 0 rgba($white, 0.33)); + } + &:active { + @include linear-gradient($btn-danger-background-color-dark, $btn-danger-background-color); + @include box-shadow(inset 0 1px 3px rgba($black, 0.2)); + } + &[disabled] { + text-shadow: 0 1px 0 rgba($black, 0.2); + @include linear-gradient($btn-danger-background-color, $btn-danger-background-color-dark); + @include box-shadow((inset 0 1px 0 rgba($white, 0.33), inset 0 -1px 2px rgba($black, 0.2))); + } } // Social buttons diff --git a/app/assets/stylesheets/foundation/variables.scss b/app/assets/stylesheets/foundation/variables.scss index 7458b94caf6..39eea57160c 100644 --- a/app/assets/stylesheets/foundation/variables.scss +++ b/app/assets/stylesheets/foundation/variables.scss @@ -48,6 +48,13 @@ $btn-primary-background-color: #00aeef !default; $btn-primary-background-color-dark: #009dd8 !default; $btn-primary-background-color-light: #00b0f0 !default; +// Danger button (delete, etc) + +$btn-danger-border-color: #7D1D16 !default; +$btn-danger-background-color: #EE1C0B !default; +$btn-danger-background-color-dark: #D81100 !default; +$btn-danger-background-color-light: #EE1C0B !default; + // Navigation menus // --------------------------------------------------