From 9a2c4c954b08bc11406462c8e76aa6193f21ced8 Mon Sep 17 00:00:00 2001 From: mkpaz Date: Tue, 2 Aug 2022 13:16:55 +0400 Subject: [PATCH] Fix CSS rules order Components styles should not precede root styles. --- styles/src/primer-dark.scss | 3 ++- styles/src/primer-light.scss | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/styles/src/primer-dark.scss b/styles/src/primer-dark.scss index c1204bf..1726924 100755 --- a/styles/src/primer-dark.scss +++ b/styles/src/primer-dark.scss @@ -48,6 +48,8 @@ $color-delta-active: 20% ); +@use "general"; + @forward "components/titled-pane" as titled-pane-* with ( $elevation-color: -color-bg-inset ); @@ -57,5 +59,4 @@ $color-fg: -color-fg-default ); -@use "general"; @use "components"; diff --git a/styles/src/primer-light.scss b/styles/src/primer-light.scss index 2fecc3b..d1159dc 100755 --- a/styles/src/primer-light.scss +++ b/styles/src/primer-light.scss @@ -15,11 +15,14 @@ // @forward "settings/config" with ( // ... // ); -// + +// This should precede components customization, as it guarantees +// that .root styles will precede components styles. +@use "general"; + // Individual component property customization. // @forward "components/split-pane" with ( // ... // ); -@use "general"; @use "components"; \ No newline at end of file