From 0fe5deae89f140d2721e5c914b4ad06fea426623 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Tue, 7 Jul 2020 19:26:08 +0200 Subject: [PATCH] Change styling of account note editing buttons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Mélanie Chauvel (ariasuni) --- .../account/components/account_note.js | 6 ++-- .../glitch/styles/components/accounts.scss | 29 +++++++++++++++---- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/app/javascript/flavours/glitch/features/account/components/account_note.js b/app/javascript/flavours/glitch/features/account/components/account_note.js index 8a99bfcb8..6e5ed7703 100644 --- a/app/javascript/flavours/glitch/features/account/components/account_note.js +++ b/app/javascript/flavours/glitch/features/account/components/account_note.js @@ -54,11 +54,11 @@ class Header extends ImmutablePureComponent { if (isEditing) { action_buttons = (
-
-
@@ -66,7 +66,7 @@ class Header extends ImmutablePureComponent { } else { action_buttons = (
-
diff --git a/app/javascript/flavours/glitch/styles/components/accounts.scss b/app/javascript/flavours/glitch/styles/components/accounts.scss index c1e3ae835..0fc2a11ff 100644 --- a/app/javascript/flavours/glitch/styles/components/accounts.scss +++ b/app/javascript/flavours/glitch/styles/components/accounts.scss @@ -742,8 +742,31 @@ justify-content: flex-end; flex: 1 0; + .icon-button { + font-size: 14px; + padding: 2px 6px; + color: $darker-text-color; + + &:hover, + &:active, + &:focus { + color: lighten($darker-text-color, 7%); + background-color: rgba($darker-text-color, 0.15); + } + + &:focus { + background-color: rgba($darker-text-color, 0.3); + } + + &[disabled] { + color: darken($darker-text-color, 13%); + background-color: transparent; + cursor: default; + } + } + .flex-spacer { - flex: 0 0 15px; + flex: 0 0 5px; background: transparent; } } @@ -754,10 +777,6 @@ text-transform: uppercase; } - button:hover span { - text-decoration: underline; - } - textarea { display: block; box-sizing: border-box;