From e662907d74b1572203bf2bb5d2e2cf49cb8a7abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20So=C3=B3s?= Date: Wed, 11 Sep 2024 11:24:27 +0200 Subject: [PATCH] Starting separate CSS color definitions. (#8048) --- pkg/web_css/lib/src/_base.scss | 5 ++--- pkg/web_css/lib/src/_variables.scss | 24 +++++++++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkg/web_css/lib/src/_base.scss b/pkg/web_css/lib/src/_base.scss index 2b97c4a914..a34400f10c 100644 --- a/pkg/web_css/lib/src/_base.scss +++ b/pkg/web_css/lib/src/_base.scss @@ -32,7 +32,7 @@ p { } p.warning { - border-left: 0.25em solid $color-input-danger; + border-left: 0.25em solid var(--pub-color-dangerRed); padding-left: 10px; } @@ -77,8 +77,7 @@ button { border: none; &.pub-button-danger { - // TODO: figure out why we can't use $color-input-danger here - --mdc-theme-primary: #ff4242; + --mdc-theme-primary: var(--pub-color-dangerRed); } &.pub-button-cancel { diff --git a/pkg/web_css/lib/src/_variables.scss b/pkg/web_css/lib/src/_variables.scss index 3293ffa552..03d8fa2997 100644 --- a/pkg/web_css/lib/src/_variables.scss +++ b/pkg/web_css/lib/src/_variables.scss @@ -1,9 +1,17 @@ -// suggested naming convention: `--pub-[component]-[role]-[property]`, where -// - `[component]` may be: `default`, `button`, `link`, `card`, ... -// - `[role]` may be the `background`, `text`, `border`, ... (multiple parts are separated by `_`) -// - `[property]` may be `color`, `opacity` for specific values, or a `value` for multi-part properties. +// suggested naming convention: +// +// color definitions: +// `--pub-color-` +// +// components: +// `--pub-[component]-[role]-[property]`, where +// - `[component]` may be: `default`, `button`, `link`, `card`, ... +// - `[role]` may be the `background`, `text`, `border`, ... (multiple parts are separated by `_`) +// - `[property]` may be `color`, `opacity` for specific values, or a `value` for multi-part properties. :root { + --pub-color-dangerRed: #ff4242; + --pub-default-background-color: #ffffff; --pub-default-headline-font_family: "Google Sans Display", "Google Sans", "Roboto", sans-serif; --pub-default-text-color: hsl(0, 0%, 29%); @@ -13,7 +21,7 @@ --pub-link-text-color: #0175c2; --pub-code-text-font_family: "Google Sans Mono", "Roboto Mono", "Source Code Pro", Menlo, "Bitstream Vera Sans Mono", "DejaVu Sans Mono", Monaco, Consolas, monospace; --pub-badge-default-color: var(--pub-link-text-color); - --pub-badge-red-color: #ff4242; + --pub-badge-red-color: var(--pub-color-dangerRed); --pub-carousel-background-color: rgba(0,0,0,0.85); --pub-carousel_nav-background-color: rgba(0,0,0,0.7); --pub-carousel_nav_hover-background-color: #4285f4; @@ -47,7 +55,7 @@ --pub-input-placeholder-color: #888; --pub-pkg_list_item_hover-background-color: #fafafa; --pub-pkg_list_recent_item-text-color: #6d7278; - --pub-remove_button-background-color: #ff4242; + --pub-remove_button-background-color: var(--pub-color-dangerRed); --pub-remove_button-text-color: #ffffff; --pub-report_header_score_error-text-color: #e13701; --pub-report_header_score_warning-text-color: #ffa500; @@ -102,7 +110,7 @@ --pub-code-text-color: var(--pub-default-text-color); --pub-link-text-color: #40c4ff; --pub-badge-default-color: var(--pub-link-text-color); - --pub-badge-red-color: #ff4242; + --pub-badge-red-color: var(--pub-color-dangerRed); --pub-copy_feedback-background-color: #404040; --pub-detail_tab-background-color: var(--pub-code-background-color); --pub-detail_tab-text-color: var(--pub-default-text-color); @@ -195,7 +203,5 @@ $z-index-nav-mask: 1000; $site-max-width: 1136px; -$color-input-danger: #ff4242; - // NOTE: keep in sync with hoverable.dart 900ms delay $copy-feedback-transition-opacity-delay: 0.9s;