From d3b50275e0807955ba3c9f7f4520c90b9edb6295 Mon Sep 17 00:00:00 2001 From: Zimo Date: Mon, 15 Apr 2019 14:13:12 +0200 Subject: [PATCH 1/2] Added hover to member cells in member list --- ghost/admin/app/styles/spirit/_hovers.css | 6 ++++++ ghost/admin/app/templates/members.hbs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ghost/admin/app/styles/spirit/_hovers.css b/ghost/admin/app/styles/spirit/_hovers.css index c06f1bae03..fa1fe92e86 100644 --- a/ghost/admin/app/styles/spirit/_hovers.css +++ b/ghost/admin/app/styles/spirit/_hovers.css @@ -401,3 +401,9 @@ .hover-bg-whitegrey-d1:focus { background-color: var(--whitegrey-d1); } .hover-bg-whitegrey-d2:hover, .hover-bg-whitegrey-d2:focus { background-color: var(--whitegrey-d2); } + +/* Special */ +.hover-bg-table-cell:hover, +.hover-bg-table-cell:focus { + background-color: color-mod(var(--lightgrey) l(+6%) s(-2%)); +} \ No newline at end of file diff --git a/ghost/admin/app/templates/members.hbs b/ghost/admin/app/templates/members.hbs index 34dcee4be4..67f8f02d4a 100644 --- a/ghost/admin/app/templates/members.hbs +++ b/ghost/admin/app/templates/members.hbs @@ -37,7 +37,7 @@ >
{{#link-to "member" member classNames="link whitegrey"}} -
+
From a029e9226679d61186144ae146463494d4eb1220 Mon Sep 17 00:00:00 2001 From: Zimo Date: Mon, 15 Apr 2019 14:21:54 +0200 Subject: [PATCH 2/2] Fixed members labs settings for nightshift --- ghost/admin/app/styles/components/power-select.css | 8 ++++---- ghost/admin/app/styles/layouts/labs.css | 4 ++-- ghost/admin/app/templates/settings/labs.hbs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ghost/admin/app/styles/components/power-select.css b/ghost/admin/app/styles/components/power-select.css index 4efc250028..ad2fe77e22 100644 --- a/ghost/admin/app/styles/components/power-select.css +++ b/ghost/admin/app/styles/components/power-select.css @@ -224,11 +224,11 @@ /* Tag input */ .tag-token--internal { - background: #ebf7fd; - color: #3fb0ef; + background: color-mod(var(--blue) alpha(0.1)); + color: var(--blue); } .tag-token--internal svg path { - stroke: #3fb0ef; - fill: #3fb0ef; + stroke: var(--blue); + fill: var(--blue); } diff --git a/ghost/admin/app/styles/layouts/labs.css b/ghost/admin/app/styles/layouts/labs.css index 20b362d9b3..5e5fd5f669 100644 --- a/ghost/admin/app/styles/layouts/labs.css +++ b/ghost/admin/app/styles/layouts/labs.css @@ -35,10 +35,10 @@ } .gh-btn-labs-toggle { - border: none; + border: none !important; display: flex; align-items: center; - color: var(--blue); + color: var(--blue) !important; } .gh-btn-labs-toggle svg { diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs index 123bec1052..da5c119422 100644 --- a/ghost/admin/app/templates/settings/labs.hbs +++ b/ghost/admin/app/templates/settings/labs.hbs @@ -156,7 +156,7 @@ {{#liquid-if (eq subscriptionSettings.isPaid true)}} -
+