From ed0e1e28b4a77b6173b2d030fb72587834e3e717 Mon Sep 17 00:00:00 2001 From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com> Date: Tue, 18 Aug 2020 14:25:38 -0500 Subject: [PATCH] FIX: Fix css var issues + button :active gradient (#10469) * FIX: Fix css var issues Adds ability for published page to use css `var()` + import the `var()` definitions --- app/assets/stylesheets/publish.scss | 12 ++++++------ app/views/published_pages/show.html.erb | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/publish.scss b/app/assets/stylesheets/publish.scss index df6ac9625fa..15bdadfb230 100644 --- a/app/assets/stylesheets/publish.scss +++ b/app/assets/stylesheets/publish.scss @@ -9,7 +9,7 @@ width: 100%; top: 0; z-index: z("header"); - background-color: $secondary; + background-color: var(--secondary, $secondary); box-shadow: 0 2px 4px -1px rgba(0, 0, 0, 0.25); position: sticky; top: 0; @@ -25,7 +25,7 @@ line-height: 1em; } .published-page-title { - color: $header_primary; + color: var(--header_primary, $header_primary); font-size: 2em; margin: 0; max-height: 1.25em; @@ -34,8 +34,8 @@ } .published-page { - background-color: $secondary; - color: $primary; + background-color: var(--secondary, $secondary); + color: var(--primary, $primary); blockquote { margin-left: 0; @@ -53,10 +53,10 @@ margin-right: 1em; height: 45px; width: 45px; - border: 4px solid rgba($tertiary, 0.75); + border: 4px solid var(--tertiary-medium, $tertiary-medium); } .topic-created-at { - color: $primary-medium; + color: var(--primary-medium, $primary-medium); } } diff --git a/app/views/published_pages/show.html.erb b/app/views/published_pages/show.html.erb index d1a0588c8df..0f84c9c1fb1 100644 --- a/app/views/published_pages/show.html.erb +++ b/app/views/published_pages/show.html.erb @@ -1,3 +1,5 @@ +<%= discourse_color_scheme_stylesheets() %> +