From aa07d23caa615e6b64fb11538205191a47c465a4 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 25 Aug 2017 17:08:10 -0400 Subject: [PATCH] FIX: Un-revert the btn class added to the topic post menu --- app/assets/javascripts/discourse/widgets/button.js.es6 | 2 +- app/assets/stylesheets/desktop/topic-post.scss | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6 index ebc7b561495..ee130126f0c 100644 --- a/app/assets/javascripts/discourse/widgets/button.js.es6 +++ b/app/assets/javascripts/discourse/widgets/button.js.es6 @@ -78,5 +78,5 @@ export const ButtonClass = { export default createWidget('button', ButtonClass); createWidget('flat-button', jQuery.extend(ButtonClass, { - tagName: 'button.widget-button.btn-flat' + tagName: 'button.widget-button.btn.btn-flat' })); diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 5a05da205b1..070e91f68ae 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -119,6 +119,11 @@ nav.post-controls { margin-right: 5px; } + .btn:disabled { + background: transparent; + cursor: default; + } + button { font-size: 1.143em; padding: 8px 10px; @@ -127,7 +132,7 @@ nav.post-controls { border: none; margin-left: 3px; - &.d-hover { + &.d-hover, &:hover { background: $primary-low; color: $primary; }