Use styles from site-shared/dash_design (dart-lang#8280)

isoos · Nov 15, 2024 · d7efc04 · d7efc04
1 parent 515b42d
commit d7efc04
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/pkg/web_css/lib/src/_variables.scss b/pkg/web_css/lib/src/_variables.scss
@@ -16,17 +16,18 @@
 //   - `[property]` may be `color`, `opacity` for specific values, or a `value` for multi-part properties.
 
 :root {
+  @include dash_variables.light-theme;
+
   --pub-color-white:         #ffffff;
   --pub-color-snowWhite:     #fafafa; // slight deviation from official snow-white (fffafa)
   --pub-color-smokeWhite:    #f5f5f7; // slight deviation from official white-smoke (f5f5f5)
   --pub-color-bubblesBlue:   #e7f8ff; // slight deviation from official bubbles-blue (e7feff)
-  --pub-color-gunpowderGray: #4a4a4a; // hsl(0, 0%, 29%);
 
   --pub-color-dangerRed: #ff4242;
 
   --pub-neutral-bgColor:       var(--pub-color-white);
   --pub-neutral-borderColor:   var(--pub-color-smokeWhite);
-  --pub-neutral-textColor:     var(--pub-color-gunpowderGray);
+  --pub-neutral-textColor:     var(--dash-surface-fgColor);
   --pub-neutral-hover-bgColor: var(--pub-color-snowWhite);
   --pub-inset-bgColor:         var(--pub-color-smokeWhite);
   --pub-selected-bgColor:      var(--pub-color-bubblesBlue);
@@ -115,15 +116,16 @@
 }
 
 .dark-theme {
+  @include dash_variables.dark-theme;
+
   --pub-color-darkGunmetal:    #1f262a; // close to #1d2026
   --pub-color-shadowBlack:     #373737;
   --pub-color-anchorBlack:     #41424c;
   --pub-color-nipponUltraBlue: #23607f;
-  --pub-color-gainsboro:       #dcdcdc;
 
   --pub-neutral-bgColor:       var(--pub-color-darkGunmetal);
   --pub-neutral-borderColor:   var(--pub-color-anchorBlack);
-  --pub-neutral-textColor:     var(--pub-color-gainsboro);
+  --pub-neutral-textColor:     var(--dash-surface-fgColor);
   --pub-neutral-hover-bgColor: var(--pub-color-shadowBlack);
   --pub-inset-bgColor:         var(--pub-color-anchorBlack);
   --pub-selected-bgColor:      var(--pub-color-nipponUltraBlue);

diff --git a/pkg/web_css/lib/style.scss b/pkg/web_css/lib/style.scss
@@ -2,6 +2,8 @@
 // to reduce the number of HTTP requests.
 @use '../../../third_party/css/github-markdown.css';
 
+@use '../../../third_party/site-shared/dash_design/lib/styles/variables.scss' as dash_variables;
+
 .light-theme {
   @import "../../../third_party/highlight/github";
 }

diff --git a/pkg/web_css/test/variables_test.dart b/pkg/web_css/test/variables_test.dart
@@ -33,18 +33,33 @@ void main() {
   });
 
   group('CSS variables', () {
+    final dashVariables = <String>{};
     late Set<String> variables;
 
-    setUp(() async {
-      variables = (await File('lib/src/_variables.scss').readAsLines())
+    Iterable<String> extractVariables(List<String> lines) {
+      return lines
           .map((l) => l.trim())
           .where((l) => l.startsWith('--') && l.contains(':'))
           .map((l) => l.split(':').first.trim())
           .where((v) => v.isNotEmpty)
           .toSet();
+    }
+
+    setUpAll(() async {
+      variables =
+          extractVariables(await File('lib/src/_variables.scss').readAsLines())
+              .toSet();
 
       // remove Material design variables
       variables.removeWhere((v) => v.startsWith('--mdc-'));
+
+      for (final f
+          in Directory('../../third_party/site-shared/dash_design/lib/')
+              .listSync(recursive: true)
+              .whereType<File>()
+              .where((f) => f.path.endsWith('.scss'))) {
+        dashVariables.addAll(extractVariables(f.readAsLinesSync()));
+      }
     });
 
     test('variables are present', () {
@@ -92,6 +107,10 @@ void main() {
             if (name.startsWith('--mdc-')) {
               continue;
             }
+            // exempt known dash variables
+            if (name.startsWith('--dash-') && dashVariables.contains(name)) {
+              continue;
+            }
 
             fail('${file.path} references `$name` without definition.');
           }