From bef8ee675bc05b0907116af46026fe15c81dc65f Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 17 Sep 2018 17:22:23 +0100 Subject: [PATCH] Moved cookies policy modal and cookies banner colors to darkswarm/base/colors.scss --- app/assets/stylesheets/darkswarm/base/colors.css.scss | 9 +++++++++ .../stylesheets/darkswarm/pages/cookies_banner.css.scss | 6 +++--- .../darkswarm/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 4b36b9cb9b8f..fbe309de5b76 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/app/assets/stylesheets/darkswarm/pages/cookies_banner.css.scss b/app/assets/stylesheets/darkswarm/pages/cookies_banner.css.scss index 62232209771a..b76d05429034 100644 --- a/app/assets/stylesheets/darkswarm/pages/cookies_banner.css.scss +++ b/app/assets/stylesheets/darkswarm/pages/cookies_banner.css.scss @@ -1,18 +1,18 @@ @import '../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/app/assets/stylesheets/darkswarm/pages/cookies_policy_modal.css.scss b/app/assets/stylesheets/darkswarm/pages/cookies_policy_modal.css.scss index 8cf87b1ebb1f..5522fa6a49dc 100644 --- a/app/assets/stylesheets/darkswarm/pages/cookies_policy_modal.css.scss +++ b/app/assets/stylesheets/darkswarm/pages/cookies_policy_modal.css.scss @@ -1,14 +1,14 @@ @import '../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 {