From dc43fb69d1bd6553efdafd2729f226dce9f6c4fe Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 4 Feb 2019 12:46:12 -0500 Subject: [PATCH] UX: Minor button icon color fixes --- .../javascripts/discourse/templates/selected-posts.hbs | 6 +++--- app/assets/stylesheets/common/admin/backups.scss | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/selected-posts.hbs b/app/assets/javascripts/discourse/templates/selected-posts.hbs index 517bd3a00a..e2de58c845 100644 --- a/app/assets/javascripts/discourse/templates/selected-posts.hbs +++ b/app/assets/javascripts/discourse/templates/selected-posts.hbs @@ -13,15 +13,15 @@ {{/if}} {{#if canMergeTopic}} - {{d-button action=(route-action "moveToTopic") icon="sign-out-alt" label="topic.move_to.action" class="move-to-topic"}} + {{d-button action=(route-action "moveToTopic") icon="sign-out-alt" label="topic.move_to.action" class="btn-primary move-to-topic"}} {{/if}} {{#if canChangeOwner}} - {{d-button action=(route-action "changeOwner") icon="user" label="topic.change_owner.action"}} + {{d-button action=(route-action "changeOwner") icon="user" label="topic.change_owner.action" class="btn-primary"}} {{/if}} {{#if canMergePosts}} - {{d-button action=(action "mergePosts") icon="arrows-v" label="topic.merge_posts.action"}} + {{d-button action=(action "mergePosts") icon="arrows-v" label="topic.merge_posts.action" class="btn-primary"}} {{/if}}

{{i18n 'topic.multi_select.cancel'}}

diff --git a/app/assets/stylesheets/common/admin/backups.scss b/app/assets/stylesheets/common/admin/backups.scss index 20b9836986..51fc9f46e5 100644 --- a/app/assets/stylesheets/common/admin/backups.scss +++ b/app/assets/stylesheets/common/admin/backups.scss @@ -6,8 +6,14 @@ $rollback-darker: darken($rollback, 20%) !default; .btn-rollback { color: $secondary; background: $rollback; + .d-icon { + color: $secondary; + } &:hover { background: $rollback-dark; + .d-icon { + color: currentColor; + } } &:active { @include linear-gradient($rollback-darker, $rollback-dark);