Skip to content

Commit d452a53

Browse files
ktranDevtools-frontend LUCI CQ
ktran
authored and
Devtools-frontend LUCI CQ
committed
[cleanup] Merge design_tokens.css into other token css files
This merges the definitions that were in design_tokens into theme_colors.css and application_color_tokens.css. In a follow up, we'll rename these two (theme_colors and application_color_tokens). Keeping the same name here in order to keep the diff easier to read for review purposes. Bug: 390330089 Change-Id: Ia8510ca0818d31409250c1d5e6ef67897e6fc193 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6203922 Reviewed-by: Benedikt Meurer <[email protected]> Commit-Queue: Kim-Anh Tran <[email protected]> Reviewed-by: Kateryna Prokopenko <[email protected]>
1 parent 53aa187 commit d452a53

File tree

8 files changed

+374
-351
lines changed

8 files changed

+374
-351
lines changed

‎config/gni/devtools_grd_files.gni‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ grd_files_release_sources = [
303303
"front_end/core/root/root.js",
304304
"front_end/core/sdk/sdk-meta.js",
305305
"front_end/core/sdk/sdk.js",
306-
"front_end/design_tokens.css",
307306
"front_end/device_mode_emulation_frame.html",
308307
"front_end/devtools_app.html",
309308
"front_end/devtools_compatibility.js",

‎docs/styleguide/ux/styles.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ example CL that adds application tokens can be found
328328
## Sizes
329329

330330
[**System
331-
tokens**](https://crsrc.org/c/third_party/devtools-frontend/src/front_end/design_tokens.css)
331+
tokens**](https://crsrc.org/c/third_party/devtools-frontend/src/front_end/theme_colors.css)
332332
include a set of tokens to be used for sizes, ranging from `--sys-size-1` (which
333333
corresponds to a single pixel) to `--sys-size-41` (which corresponds to the HD
334334
resolution width).

‎front_end/BUILD.gn‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ group("front_end") {
3636
copy_to_gen("integration_test_runner-gen") {
3737
sources = [
3838
"application_color_tokens.css",
39-
"design_tokens.css",
4039
"integration_test_runner.html",
4140
"theme_colors.css",
4241
]

‎front_end/application_color_tokens.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
* Use of this source code is governed by a BSD-style license that can be
44
* found in the LICENSE file.
55
*/
6+
7+
/**
8+
* Application-specific tokens list tokens that differ from our core design system.
9+
*
10+
* Before adding to this file, make sure that there's really no usable --sys-* definition
11+
* in design_system_tokens.css. Additions to this file should be an exception.
12+
*/
613
:root {
714
--icon-action: var(--sys-color-primary-bright);
815
--icon-arrow-main-thread: var(--sys-color-primary-bright);
@@ -228,6 +235,11 @@
228235
}
229236
}
230237

238+
/**
239+
* Combobox image.
240+
*/
241+
--combobox-dropdown-arrow: var(--image-file-arrow-drop-down-light);
242+
231243
&.theme-with-dark-background {
232244
--color-primary-old: rgb(138 180 248);
233245
--color-primary-variant: rgb(102 157 246);
@@ -366,5 +378,10 @@
366378
* Color for input driver for AI assistance chat
367379
*/
368380
--app-color-ai-assistance-input-divider: rgb(255 255 255 / 15%);
381+
382+
/**
383+
* Combobox image.
384+
*/
385+
--combobox-dropdown-arrow: var(--image-file-arrow-drop-down-dark);
369386
}
370387
}

‎front_end/design_tokens.css‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎front_end/entrypoint_template.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@
1818
<meta name="referrer" content="no-referrer">
1919
<script type="module" src="./entrypoints/%ENTRYPOINT_NAME%/%ENTRYPOINT_NAME%.js"></script>
2020
<link href="./application_color_tokens.css" rel="stylesheet">
21-
<link href="./design_tokens.css" rel="stylesheet">
2221
<link href="./theme_colors.css" rel="stylesheet">
2322
<body class="undocked" id="-blink-dev-tools">

0 commit comments

Comments
 (0)