From 8e83a7ba838fd27d8f0bc2b358fea373b2c1b936 Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Mon, 21 Sep 2020 14:51:04 +0200 Subject: [PATCH 1/4] EZEE-3271: Fixed styles for 'Send to review' action menu --- src/bundle/Resources/public/scss/_buttons.scss | 4 ++-- src/bundle/Resources/public/scss/_tag.scss | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bundle/Resources/public/scss/_buttons.scss b/src/bundle/Resources/public/scss/_buttons.scss index 0f08fc37af..d656bbbf00 100644 --- a/src/bundle/Resources/public/scss/_buttons.scss +++ b/src/bundle/Resources/public/scss/_buttons.scss @@ -95,7 +95,7 @@ .ez-side-menu, .ez-context-menu { - .btn:not(.ez-btn--confirm-send-to-trash):not(.ez-btn--hide-confirm) { + .btn:not(.ez-btn--confirm-send-to-trash):not(.ez-btn--hide-confirm):not(.ez-btn--workflow-apply) { width: calculateRem(80px); height: calculateRem(80px); padding: calculateRem(2px); @@ -135,7 +135,7 @@ } .ez-context-menu { - .btn:not(.ez-btn--confirm-send-to-trash):not(.ez-btn--hide-confirm) { + .btn:not(.ez-btn--confirm-send-to-trash):not(.ez-btn--hide-confirm):not(.ez-btn--workflow-apply) { &:hover, &:focus { color: $ibexa-color-primary; diff --git a/src/bundle/Resources/public/scss/_tag.scss b/src/bundle/Resources/public/scss/_tag.scss index 23b4b6b1a1..9fc0284e9c 100644 --- a/src/bundle/Resources/public/scss/_tag.scss +++ b/src/bundle/Resources/public/scss/_tag.scss @@ -24,5 +24,9 @@ padding: 0; outline: none; line-height: 0; + + .ez-icon { + fill: $ibexa-color-base-black; + } } } From 293bb8e0173392eebbd2a9f70ad2f464b884766e Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Mon, 21 Sep 2020 16:26:03 +0200 Subject: [PATCH 2/4] EZEE-3271: Refactor selector for buttons in side-menu and context-menu --- .../Resources/public/scss/_buttons.scss | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/bundle/Resources/public/scss/_buttons.scss b/src/bundle/Resources/public/scss/_buttons.scss index d656bbbf00..700673b314 100644 --- a/src/bundle/Resources/public/scss/_buttons.scss +++ b/src/bundle/Resources/public/scss/_buttons.scss @@ -95,7 +95,7 @@ .ez-side-menu, .ez-context-menu { - .btn:not(.ez-btn--confirm-send-to-trash):not(.ez-btn--hide-confirm):not(.ez-btn--workflow-apply) { + .ez-sticky-container > .btn { width: calculateRem(80px); height: calculateRem(80px); padding: calculateRem(2px); @@ -110,9 +110,14 @@ &:hover, &:focus { + color: $ibexa-color-primary; box-shadow: none; background: $ibexa-white; outline: none; + + .ez-icon { + fill: $ibexa-color-primary; + } } &:first-child { @@ -134,21 +139,8 @@ } } -.ez-context-menu { - .btn:not(.ez-btn--confirm-send-to-trash):not(.ez-btn--hide-confirm):not(.ez-btn--workflow-apply) { - &:hover, - &:focus { - color: $ibexa-color-primary; - - .ez-icon { - fill: $ibexa-color-primary; - } - } - } -} - .ez-side-menu { - .btn { + .ez-sticky-container > .btn { &:focus, &:hover { color: $ibexa-black; @@ -158,6 +150,8 @@ } } } + + } .ez-context-menu { From c4cfad75d3bc7e54c74fce1cd97e048a87fb2711 Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Mon, 21 Sep 2020 16:28:07 +0200 Subject: [PATCH 3/4] Fixed code styles --- src/bundle/Resources/public/scss/_buttons.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bundle/Resources/public/scss/_buttons.scss b/src/bundle/Resources/public/scss/_buttons.scss index 700673b314..e1b1231cdf 100644 --- a/src/bundle/Resources/public/scss/_buttons.scss +++ b/src/bundle/Resources/public/scss/_buttons.scss @@ -150,8 +150,6 @@ } } } - - } .ez-context-menu { From a6fae50b28626a126a3cf7a77a9e8ec41689f431 Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Tue, 22 Sep 2020 09:09:45 +0200 Subject: [PATCH 4/4] After CR --- .../Resources/public/scss/_buttons.scss | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/bundle/Resources/public/scss/_buttons.scss b/src/bundle/Resources/public/scss/_buttons.scss index e1b1231cdf..0a7d501494 100644 --- a/src/bundle/Resources/public/scss/_buttons.scss +++ b/src/bundle/Resources/public/scss/_buttons.scss @@ -110,14 +110,8 @@ &:hover, &:focus { - color: $ibexa-color-primary; box-shadow: none; - background: $ibexa-white; outline: none; - - .ez-icon { - fill: $ibexa-color-primary; - } } &:first-child { @@ -139,12 +133,27 @@ } } +.ez-context-menu { + .ez-sticky-container > .btn { + &:focus, + &:hover { + color: $ibexa-color-primary; + background: $ibexa-white; + + .ez-icon { + fill: $ibexa-color-primary; + } + } + } +} + .ez-side-menu { .ez-sticky-container > .btn { &:focus, &:hover { color: $ibexa-black; - + background: $ibexa-white; + .ez-icon { fill: $ibexa-black; }