From cdc589979100fb8361b5bfa0f0cfd13ab3c70069 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 17 Sep 2018 17:22:23 +0100 Subject: [PATCH 1/3] Moved cookies policy modal and cookies banner colors to darkswarm/base/colors.scss --- app/assets/stylesheets/darkswarm/base/colors.css.scss | 9 +++++++++ .../assets/stylesheets/web/pages/cookies_banner.css.scss | 6 +++--- .../stylesheets/web/pages/cookies_policy_modal.css.scss | 6 +++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/base/colors.css.scss b/app/assets/stylesheets/darkswarm/base/colors.css.scss index 4b36b9cb9b8..dfff9cb584e 100644 --- a/app/assets/stylesheets/darkswarm/base/colors.css.scss +++ b/app/assets/stylesheets/darkswarm/base/colors.css.scss @@ -1,4 +1,13 @@ +@import '../branding'; + $modal-background-color: #efefef; $modal-content-background-color: #fff; $modal-alert-link-color: #fff; $modal-alert-link-hover-color: rgba(255, 255, 255, .7); + +$cookies-banner-background-color: $dark-grey; +$cookies-banner-button-background-color: $clr-turquoise; +$cookies-banner-text-color: $white; +$cookies-policy-modal-background-color: $disabled-light; +$cookies-policy-modal-border-bottom-color: $disabled-light; +$cookies-policy-modal-table-tr-even-background-color: $disabled-very-light; diff --git a/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss b/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss index a655c513a80..a85ba1f77d0 100644 --- a/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss +++ b/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss @@ -1,18 +1,18 @@ @import 'darkswarm/branding'; .cookies-banner { - background: $dark-grey; + background: $cookies-banner-background-color; bottom: 0; position: fixed; top: 15% !important; z-index: 100000; button { - background-color: $clr-turquoise; + background-color: $cookies-banner-button-background-color; } p { - color: $white; + color: $cookies-banner-text-color; font-size: .75rem; } diff --git a/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss b/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss index 490fe6e529c..b363238f299 100644 --- a/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss +++ b/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss @@ -1,14 +1,14 @@ @import 'darkswarm/branding'; .cookies-policy-modal { - background: $disabled-light; - border-bottom-color: $disabled-light; + background: $cookies-policy-modal-background-color; + border-bottom-color: $cookies-policy-modal-border-bottom-color; table { width: 100%; tr:nth-of-type(even) { - background-color: $disabled-very-light; + background-color: $cookies-policy-modal-table-tr-even-background-color; } p { From 93e1310debd273c10353e6ce3375a746de291c2e Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 24 Sep 2018 17:16:39 +0100 Subject: [PATCH 2/3] Fixed bug in cookies css, import colors, not branding --- .../app/assets/stylesheets/web/pages/cookies_banner.css.scss | 2 +- .../assets/stylesheets/web/pages/cookies_policy_modal.css.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss b/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss index a85ba1f77d0..6d204e1d4e6 100644 --- a/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss +++ b/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss @@ -1,4 +1,4 @@ -@import 'darkswarm/branding'; +@import 'darkswarm/base/colors'; .cookies-banner { background: $cookies-banner-background-color; diff --git a/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss b/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss index b363238f299..4c3706d8d77 100644 --- a/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss +++ b/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss @@ -1,4 +1,4 @@ -@import 'darkswarm/branding'; +@import 'darkswarm/base/colors'; .cookies-policy-modal { background: $cookies-policy-modal-background-color; From 1c5d94472f13dc04703d093e7177436c1c0c96e3 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Thu, 29 Nov 2018 18:39:58 +0000 Subject: [PATCH 3/3] Make colors.css relative reference to branding.css an absolute reference so that colors can be imported in engines --- app/assets/stylesheets/darkswarm/base/colors.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/darkswarm/base/colors.css.scss b/app/assets/stylesheets/darkswarm/base/colors.css.scss index dfff9cb584e..fddcbc9f6ac 100644 --- a/app/assets/stylesheets/darkswarm/base/colors.css.scss +++ b/app/assets/stylesheets/darkswarm/base/colors.css.scss @@ -1,4 +1,4 @@ -@import '../branding'; +@import 'darkswarm/branding'; $modal-background-color: #efefef; $modal-content-background-color: #fff;