From 37aea4e35aa553af6b056cb5a0a9d06bc0f43e5d Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Wed, 9 Oct 2024 18:17:40 -0500 Subject: [PATCH 1/7] Experiment with a structure for shared styles Regenerate workflow --- .github/workflows/dart.yml | 38 ++++++++++++++++--- pkgs/dash_design/LICENSE | 27 +++++++++++++ pkgs/dash_design/analysis_options.yaml | 1 + pkgs/dash_design/lib/styles.scss | 30 +++++++++++++++ pkgs/dash_design/lib/styles/variables.scss | 44 ++++++++++++++++++++++ pkgs/dash_design/mono_pkg.yaml | 9 +++++ pkgs/dash_design/pubspec.yaml | 15 ++++++++ pkgs/dash_design/test/style_test.dart | 24 ++++++++++++ 8 files changed, 182 insertions(+), 6 deletions(-) create mode 100644 pkgs/dash_design/LICENSE create mode 100644 pkgs/dash_design/analysis_options.yaml create mode 100644 pkgs/dash_design/lib/styles.scss create mode 100644 pkgs/dash_design/lib/styles/variables.scss create mode 100644 pkgs/dash_design/mono_pkg.yaml create mode 100644 pkgs/dash_design/pubspec.yaml create mode 100644 pkgs/dash_design/test/style_test.dart diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index a203978..71f191f 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -39,16 +39,16 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyzer_and_format; Dart 3.5.0; PKGS: pkgs/analysis_defaults, pkgs/excerpter, pkgs/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyzer_and_format; Dart 3.5.0; PKGS: pkgs/analysis_defaults, pkgs/dash_design, pkgs/excerpter, pkgs/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/analysis_defaults-pkgs/excerpter-pkgs/inject_dartpad;commands:format-analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad;commands:format-analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/analysis_defaults-pkgs/excerpter-pkgs/inject_dartpad + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -72,6 +72,19 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.pkgs_analysis_defaults_pub_upgrade.conclusion == 'success'" working-directory: pkgs/analysis_defaults + - id: pkgs_dash_design_pub_upgrade + name: pkgs/dash_design; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/dash_design + - name: "pkgs/dash_design; dart format --output=none --set-exit-if-changed ." + run: "dart format --output=none --set-exit-if-changed ." + if: "always() && steps.pkgs_dash_design_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/dash_design + - name: "pkgs/dash_design; dart analyze --fatal-infos ." + run: dart analyze --fatal-infos . + if: "always() && steps.pkgs_dash_design_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/dash_design - id: pkgs_excerpter_pub_upgrade name: pkgs/excerpter; dart pub upgrade run: dart pub upgrade @@ -99,16 +112,16 @@ jobs: if: "always() && steps.pkgs_inject_dartpad_pub_upgrade.conclusion == 'success'" working-directory: pkgs/inject_dartpad job_003: - name: "analyzer_and_format; Dart dev; PKGS: pkgs/analysis_defaults, pkgs/excerpter, pkgs/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyzer_and_format; Dart dev; PKGS: pkgs/analysis_defaults, pkgs/dash_design, pkgs/excerpter, pkgs/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/analysis_defaults-pkgs/excerpter-pkgs/inject_dartpad;commands:format-analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad;commands:format-analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/analysis_defaults-pkgs/excerpter-pkgs/inject_dartpad + os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad os:ubuntu-latest;pub-cache-hosted;sdk:dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -132,6 +145,19 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.pkgs_analysis_defaults_pub_upgrade.conclusion == 'success'" working-directory: pkgs/analysis_defaults + - id: pkgs_dash_design_pub_upgrade + name: pkgs/dash_design; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/dash_design + - name: "pkgs/dash_design; dart format --output=none --set-exit-if-changed ." + run: "dart format --output=none --set-exit-if-changed ." + if: "always() && steps.pkgs_dash_design_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/dash_design + - name: "pkgs/dash_design; dart analyze --fatal-infos ." + run: dart analyze --fatal-infos . + if: "always() && steps.pkgs_dash_design_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/dash_design - id: pkgs_excerpter_pub_upgrade name: pkgs/excerpter; dart pub upgrade run: dart pub upgrade diff --git a/pkgs/dash_design/LICENSE b/pkgs/dash_design/LICENSE new file mode 100644 index 0000000..b03a788 --- /dev/null +++ b/pkgs/dash_design/LICENSE @@ -0,0 +1,27 @@ +Copyright 2024, the Dart project authors. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Google LLC nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/pkgs/dash_design/analysis_options.yaml b/pkgs/dash_design/analysis_options.yaml new file mode 100644 index 0000000..b9bdf80 --- /dev/null +++ b/pkgs/dash_design/analysis_options.yaml @@ -0,0 +1 @@ +include: package:analysis_defaults/analysis.yaml diff --git a/pkgs/dash_design/lib/styles.scss b/pkgs/dash_design/lib/styles.scss new file mode 100644 index 0000000..1ee908d --- /dev/null +++ b/pkgs/dash_design/lib/styles.scss @@ -0,0 +1,30 @@ +// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +/// styles.scss: +/// +/// Incorporates all styles and CSS custom properties (variables) +/// from the dash_design package. +/// +/// Variables are added at the `:root` (the `html` element), +/// and dark mode variables are set if `data-theme=dark` +/// is added to the `html` element. + +@use 'styles/variables'; + +$google-site: false !default; + +:root { + @include variables.shared; + + @include variables.light-theme; + + &[data-theme=dark] { + @include variables.dark-theme; + } + + @if $google-site { + @include variables.google-overrides; + } +} diff --git a/pkgs/dash_design/lib/styles/variables.scss b/pkgs/dash_design/lib/styles/variables.scss new file mode 100644 index 0000000..c5007a5 --- /dev/null +++ b/pkgs/dash_design/lib/styles/variables.scss @@ -0,0 +1,44 @@ +// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +/// CSS custom properties (variables) to be used across all themes. +@mixin shared { + // Shared typography style variables. + + /// Used for body text and smaller UI elements, like labels. + --dash-default-font-family: 'Roboto', sans-serif; + + /// Used for headlines, titles, and larger UI elements. + --dash-display-font-family: 'Roboto', sans-serif; + + /// Used for monospace text, such as code blocks. + --dash-mono-font-family: 'Roboto Mono', 'Source Code Pro', 'Cascadia Mono', 'JetBrains Mono', monospace; + + /// Used for icons, such as the magnifying glass for search. + --dash-symbol-font-family: 'Material Symbols', 'Material Symbols Outlined'; +} + +/// CSS custom properties (variables) to be used for a light theme. +@mixin light-theme { + /// The default text color, used for body text. + --dash-on-background-text-color: #212121; +} + +/// CSS custom properties (variables) to be used for a dark theme. +@mixin dark-theme { + --dash-on-background-text-color: #e0e0e0; +} + +/// Styles that can only be used by Google sites, +/// such as enabling the Google Sans font families. +/// +/// These overrides should be included after all other variables are defined. +@mixin google-overrides() { + // Non-Google sites, such as self-hosted API docs, + // can't use Google Sans or Google Symbols. + --dash-default-font-family: 'Google Sans Text', 'Google Sans', 'Roboto', sans-serif; + --dash-display-font-family: 'Google Sans', 'Google Sans Text', 'Roboto', sans-serif; + --dash-mono-font-family: 'Google Sans Mono', 'Roboto Mono', 'Source Code Pro', 'Cascadia Mono', 'JetBrains Mono', monospace; + --dash-symbol-font-family: 'Google Symbols', 'Material Symbols', 'Material Symbols Outlined'; +} diff --git a/pkgs/dash_design/mono_pkg.yaml b/pkgs/dash_design/mono_pkg.yaml new file mode 100644 index 0000000..66984e0 --- /dev/null +++ b/pkgs/dash_design/mono_pkg.yaml @@ -0,0 +1,9 @@ +sdk: +- pubspec +- dev + +stages: +- analyzer_and_format: + - group: + - format + - analyze: --fatal-infos . diff --git a/pkgs/dash_design/pubspec.yaml b/pkgs/dash_design/pubspec.yaml new file mode 100644 index 0000000..d960f3a --- /dev/null +++ b/pkgs/dash_design/pubspec.yaml @@ -0,0 +1,15 @@ +name: dash_design +description: Shared styles for Dart and Flutter websites. +version: 0.0.1-wip +publish_to: none +repository: https://github.com/dart-lang/site-shared/tree/main/pkgs/dash_design + +environment: + sdk: ^3.5.0 + +dev_dependencies: + analysis_defaults: + path: ../analysis_defaults + path: ^1.9.0 + sass: ^1.79.4 + test: ^1.25.8 diff --git a/pkgs/dash_design/test/style_test.dart b/pkgs/dash_design/test/style_test.dart new file mode 100644 index 0000000..78639b8 --- /dev/null +++ b/pkgs/dash_design/test/style_test.dart @@ -0,0 +1,24 @@ +// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +import 'dart:isolate'; + +import 'package:path/path.dart' as path; +import 'package:sass/sass.dart' as sass; +import 'package:test/test.dart'; + +void main() { + test('Can build styles.scss file', () { + final compileResult = sass.compileToResult(_stylesPath!); + expect(compileResult.css, contains('--dash-default-font-family')); + }); +} + +String? get _stylesPath { + final packageUri = Uri.parse('package:dash_design/styles.scss'); + final resolvedUri = Isolate.resolvePackageUriSync(packageUri); + if (resolvedUri == null) return null; + if (!resolvedUri.isScheme('file')) return null; + return path.fromUri(resolvedUri); +} From 3cb6eaf632291a11472b31cb43e4aee7048d1e51 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Thu, 10 Oct 2024 12:14:55 -0500 Subject: [PATCH 2/7] Add template for a README --- pkgs/dash_design/README.md | 21 +++++++++++++++++++++ pkgs/dash_design/lib/styles/variables.scss | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/dash_design/README.md diff --git a/pkgs/dash_design/README.md b/pkgs/dash_design/README.md new file mode 100644 index 0000000..5db5149 --- /dev/null +++ b/pkgs/dash_design/README.md @@ -0,0 +1,21 @@ +## Shared styles for Dart and Flutter websites + +> [!CAUTION] +> This package and the styles it contains are in progress, +> and are subject to breakages or removal at any point. + +### Usage + +To be determined. + +### Contributing + +Contribution information and guidelines to be added. + +### Intended clients + +- dart.dev +- docs.flutter.dev +- pub.dev +- api.dart.dev +- api.flutter.dev diff --git a/pkgs/dash_design/lib/styles/variables.scss b/pkgs/dash_design/lib/styles/variables.scss index c5007a5..e117f2e 100644 --- a/pkgs/dash_design/lib/styles/variables.scss +++ b/pkgs/dash_design/lib/styles/variables.scss @@ -2,6 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +/// styles/variables.scss: +/// +/// Mixins that can be included to load CSS custom properties (variables) +/// into any desired scope. + /// CSS custom properties (variables) to be used across all themes. @mixin shared { // Shared typography style variables. @@ -34,7 +39,7 @@ /// such as enabling the Google Sans font families. /// /// These overrides should be included after all other variables are defined. -@mixin google-overrides() { +@mixin google-overrides { // Non-Google sites, such as self-hosted API docs, // can't use Google Sans or Google Symbols. --dash-default-font-family: 'Google Sans Text', 'Google Sans', 'Roboto', sans-serif; From 3858a286b8e473741605eaa518fb423fc7fc8150 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Fri, 18 Oct 2024 01:01:21 -0500 Subject: [PATCH 3/7] Separate typography from colors --- pkgs/dash_design/lib/styles.scss | 4 +++- pkgs/dash_design/lib/styles/variables.scss | 17 ++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/dash_design/lib/styles.scss b/pkgs/dash_design/lib/styles.scss index 1ee908d..4de6aad 100644 --- a/pkgs/dash_design/lib/styles.scss +++ b/pkgs/dash_design/lib/styles.scss @@ -16,7 +16,9 @@ $google-site: false !default; :root { - @include variables.shared; + @include variables.typography; + + @include variables.shared-colors; @include variables.light-theme; diff --git a/pkgs/dash_design/lib/styles/variables.scss b/pkgs/dash_design/lib/styles/variables.scss index e117f2e..c973f6d 100644 --- a/pkgs/dash_design/lib/styles/variables.scss +++ b/pkgs/dash_design/lib/styles/variables.scss @@ -7,10 +7,8 @@ /// Mixins that can be included to load CSS custom properties (variables) /// into any desired scope. -/// CSS custom properties (variables) to be used across all themes. -@mixin shared { - // Shared typography style variables. - +/// Shared typography CSS variables. +@mixin typography { /// Used for body text and smaller UI elements, like labels. --dash-default-font-family: 'Roboto', sans-serif; @@ -24,18 +22,23 @@ --dash-symbol-font-family: 'Material Symbols', 'Material Symbols Outlined'; } -/// CSS custom properties (variables) to be used for a light theme. +/// Color-related, theme-agnostic CSS variables. +@mixin shared-colors { + +} + +/// Light-theme specific CSS variables. @mixin light-theme { /// The default text color, used for body text. --dash-on-background-text-color: #212121; } -/// CSS custom properties (variables) to be used for a dark theme. +/// Dark-theme specific CSS variables. @mixin dark-theme { --dash-on-background-text-color: #e0e0e0; } -/// Styles that can only be used by Google sites, +/// CSS variables that specify values that can only be used by Google sites, /// such as enabling the Google Sans font families. /// /// These overrides should be included after all other variables are defined. From 384c8c1bf4cad30f04e222a9e741bf04cb51c848 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Fri, 18 Oct 2024 01:03:15 -0500 Subject: [PATCH 4/7] Run the build test with all deprecations enabled --- pkgs/dash_design/test/style_test.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/dash_design/test/style_test.dart b/pkgs/dash_design/test/style_test.dart index 78639b8..7038a64 100644 --- a/pkgs/dash_design/test/style_test.dart +++ b/pkgs/dash_design/test/style_test.dart @@ -10,7 +10,8 @@ import 'package:test/test.dart'; void main() { test('Can build styles.scss file', () { - final compileResult = sass.compileToResult(_stylesPath!); + final compileResult = sass.compileToResult(_stylesPath!, + fatalDeprecations: sass.Deprecation.values.where((d) => !d.isFuture)); expect(compileResult.css, contains('--dash-default-font-family')); }); } From 3b5060f2438b924c509f9bcd646f9bddb87487fa Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Fri, 18 Oct 2024 01:07:04 -0500 Subject: [PATCH 5/7] Switch to using dark-theme on body for now --- pkgs/dash_design/lib/styles.scss | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/dash_design/lib/styles.scss b/pkgs/dash_design/lib/styles.scss index 4de6aad..b575311 100644 --- a/pkgs/dash_design/lib/styles.scss +++ b/pkgs/dash_design/lib/styles.scss @@ -7,9 +7,9 @@ /// Incorporates all styles and CSS custom properties (variables) /// from the dash_design package. /// -/// Variables are added at the `:root` (the `html` element), -/// and dark mode variables are set if `data-theme=dark` -/// is added to the `html` element. +/// Most variables are added at the `:root` (the `html` element), +/// but dark mode variable overrides are added to the `body` element if +/// the class `dark-theme` is added to it. @use 'styles/variables'; @@ -17,16 +17,17 @@ $google-site: false !default; :root { @include variables.typography; - @include variables.shared-colors; @include variables.light-theme; - &[data-theme=dark] { - @include variables.dark-theme; - } - @if $google-site { @include variables.google-overrides; } } + +body { + &.dark-theme { + @include variables.dark-theme; + } +} From 029a2f67fb2c4972a550bf1ec7d75eacdf28c7fe Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Fri, 18 Oct 2024 01:10:04 -0500 Subject: [PATCH 6/7] Adjust naming scheme --- pkgs/dash_design/lib/styles/variables.scss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/dash_design/lib/styles/variables.scss b/pkgs/dash_design/lib/styles/variables.scss index c973f6d..f2ef916 100644 --- a/pkgs/dash_design/lib/styles/variables.scss +++ b/pkgs/dash_design/lib/styles/variables.scss @@ -10,16 +10,16 @@ /// Shared typography CSS variables. @mixin typography { /// Used for body text and smaller UI elements, like labels. - --dash-default-font-family: 'Roboto', sans-serif; + --dash-default-fontFamily: 'Roboto', sans-serif; /// Used for headlines, titles, and larger UI elements. - --dash-display-font-family: 'Roboto', sans-serif; + --dash-display-fontFamily: 'Roboto', sans-serif; /// Used for monospace text, such as code blocks. - --dash-mono-font-family: 'Roboto Mono', 'Source Code Pro', 'Cascadia Mono', 'JetBrains Mono', monospace; + --dash-mono-fontFamily: 'Roboto Mono', 'Source Code Pro', 'Cascadia Mono', 'JetBrains Mono', monospace; /// Used for icons, such as the magnifying glass for search. - --dash-symbol-font-family: 'Material Symbols', 'Material Symbols Outlined'; + --dash-symbol-fontFamily: 'Material Symbols', 'Material Symbols Outlined'; } /// Color-related, theme-agnostic CSS variables. @@ -30,12 +30,12 @@ /// Light-theme specific CSS variables. @mixin light-theme { /// The default text color, used for body text. - --dash-on-background-text-color: #212121; + --dash-surface-fgColor: #212121; } /// Dark-theme specific CSS variables. @mixin dark-theme { - --dash-on-background-text-color: #e0e0e0; + --dash-surface-fgColor: #e0e0e0; } /// CSS variables that specify values that can only be used by Google sites, @@ -45,8 +45,8 @@ @mixin google-overrides { // Non-Google sites, such as self-hosted API docs, // can't use Google Sans or Google Symbols. - --dash-default-font-family: 'Google Sans Text', 'Google Sans', 'Roboto', sans-serif; - --dash-display-font-family: 'Google Sans', 'Google Sans Text', 'Roboto', sans-serif; - --dash-mono-font-family: 'Google Sans Mono', 'Roboto Mono', 'Source Code Pro', 'Cascadia Mono', 'JetBrains Mono', monospace; - --dash-symbol-font-family: 'Google Symbols', 'Material Symbols', 'Material Symbols Outlined'; + --dash-default-fontFamily: 'Google Sans Text', 'Google Sans', 'Roboto', sans-serif; + --dash-display-fontFamily: 'Google Sans', 'Google Sans Text', 'Roboto', sans-serif; + --dash-mono-fontFamily: 'Google Sans Mono', 'Roboto Mono', 'Source Code Pro', 'Cascadia Mono', 'JetBrains Mono', monospace; + --dash-symbol-fontFamily: 'Google Symbols', 'Material Symbols', 'Material Symbols Outlined'; } From f53278080f1c2caa5af6f4d8c565b9c6caa404a6 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Fri, 18 Oct 2024 01:13:27 -0500 Subject: [PATCH 7/7] Start with current pub text colors --- pkgs/dash_design/lib/styles/variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dash_design/lib/styles/variables.scss b/pkgs/dash_design/lib/styles/variables.scss index f2ef916..96d082d 100644 --- a/pkgs/dash_design/lib/styles/variables.scss +++ b/pkgs/dash_design/lib/styles/variables.scss @@ -30,12 +30,12 @@ /// Light-theme specific CSS variables. @mixin light-theme { /// The default text color, used for body text. - --dash-surface-fgColor: #212121; + --dash-surface-fgColor: #4a4a4a; } /// Dark-theme specific CSS variables. @mixin dark-theme { - --dash-surface-fgColor: #e0e0e0; + --dash-surface-fgColor: #dcdcdc; } /// CSS variables that specify values that can only be used by Google sites,