Skip to content

Commit 454310e

Browse files
ktranDevtools-frontend LUCI CQ
authored andcommitted
[GM3Restyling] Update IconDialog to use ButtonDialog
This switches the usage of IconDialog to ButtonDialog and makes a few padding changes, and removes the now obsolete IconDialog. Before: https://i.imgur.com/Oj2qOSW.png After: https://i.imgur.com/Piaam45.png Bug: 383278166, 379036632 Change-Id: I58bbcdcf09f1f295904a48f27daad715de387004 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6110475 Auto-Submit: Kim-Anh Tran <[email protected]> Reviewed-by: Nancy Li <[email protected]> Commit-Queue: Nancy Li <[email protected]>
1 parent f39406f commit 454310e

File tree

22 files changed

+12
-365
lines changed

22 files changed

+12
-365
lines changed

config/gni/devtools_grd_files.gni

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2201,11 +2201,9 @@ grd_files_debug_sources = [
22012201
"front_end/ui/components/data_grid/dataGridController.css.js",
22022202
"front_end/ui/components/dialogs/ButtonDialog.js",
22032203
"front_end/ui/components/dialogs/Dialog.js",
2204-
"front_end/ui/components/dialogs/IconDialog.js",
22052204
"front_end/ui/components/dialogs/ShortcutDialog.js",
22062205
"front_end/ui/components/dialogs/buttonDialog.css.js",
22072206
"front_end/ui/components/dialogs/dialog.css.js",
2208-
"front_end/ui/components/dialogs/iconDialog.css.js",
22092207
"front_end/ui/components/dialogs/shortcutDialog.css.js",
22102208
"front_end/ui/components/diff_view/DiffView.js",
22112209
"front_end/ui/components/diff_view/diffView.css.js",

front_end/panels/application/preloading/components/PreloadingDisabledInfobar.ts

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import '../../../../ui/components/report_view/report_view.js';
77
import * as i18n from '../../../../core/i18n/i18n.js';
88
import type * as Platform from '../../../../core/platform/platform.js';
99
import type * as Protocol from '../../../../generated/protocol.js';
10+
import * as Buttons from '../../../../ui/components/buttons/buttons.js';
1011
import * as ChromeLink from '../../../../ui/components/chrome_link/chrome_link.js';
1112
import * as Dialogs from '../../../../ui/components/dialogs/dialogs.js';
1213
import * as IconButton from '../../../../ui/components/icon_button/icon_button.js';
@@ -148,27 +149,24 @@ export class PreloadingDisabledInfobar extends LegacyWrapper.LegacyWrapper.Wrapp
148149
${header}
149150
</span>
150151
151-
<devtools-icon-dialog
152+
<devtools-button-dialog
152153
.data=${{
153-
iconData: {
154-
iconName: 'info',
155-
color: 'var(--icon-default-hover)',
156-
width: '16px',
157-
height: '16px',
158-
},
154+
iconName: 'info',
155+
variant: Buttons.Button.Variant.ICON,
159156
closeButton: true,
160157
position: Dialogs.Dialog.DialogVerticalPosition.AUTO,
161158
horizontalAlignment: Dialogs.Dialog.DialogHorizontalAlignment.AUTO,
162159
closeOnESC: true,
163160
closeOnScroll: false,
164-
}}
161+
dialogTitle: i18nString(UIStrings.titleReasonsPreventingPreloading),
162+
} as Dialogs.ButtonDialog.ButtonDialogData}
165163
jslog=${VisualLogging.dialog('preloading-disabled').track({resize: true, keydown: 'Escape'})}
166164
>
167165
${this.#dialogContents()}
168-
</devtools-icon-dialog>
166+
</devtools-button-dialog>
169167
</div>
170168
`;
171-
// clang-format on
169+
// clang-format on
172170
}
173171

174172
#dialogContents(): LitHtml.LitTemplate {
@@ -186,19 +184,13 @@ export class PreloadingDisabledInfobar extends LegacyWrapper.LegacyWrapper.Wrapp
186184

187185
return html`
188186
<div id='contents'>
189-
<div id='title'>${i18nString(UIStrings.titleReasonsPreventingPreloading)}</div>
190-
191187
<devtools-report>
192188
${this.#maybeDisalebByPreference()}
193189
${this.#maybeDisalebByDataSaver()}
194190
${this.#maybeDisalebByBatterySaver()}
195191
${this.#maybeDisalebByHoldbackPrefetchSpeculationRules()}
196192
${this.#maybeDisalebByHoldbackPrerenderSpeculationRules()}
197-
198-
<devtools-report-divider>
199-
</devtools-report-divider>
200193
</devtools-report>
201-
202194
<div id='footer'>
203195
${learnMoreLink}
204196
${iconLink}

front_end/panels/application/preloading/components/preloadingDisabledInfobar.css

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,19 @@
77
#container {
88
padding: 6px 12px;
99
border-bottom: 1px solid var(--sys-color-divider);
10+
align-items: center;
11+
display: flex;
1012
}
1113

1214
#contents {
13-
margin-top: 14px;
15+
margin-top: calc(-1 * var(--sys-size-6));
16+
padding: 0 var(--sys-size-8) var(--sys-size-2);
1417
}
1518

1619
#contents * {
1720
background: var(--color-background-elevation-dark-only);
1821
}
1922

20-
#title {
21-
padding-bottom: 12px;
22-
font-size: 15px;
23-
white-space: nowrap;
24-
overflow: hidden;
25-
text-overflow: ellipsis;
26-
border-bottom: 1px solid var(--sys-color-divider);
27-
color: var(--sys-color-token-subtle);
28-
grid-column-start: span 2;
29-
font-weight: bold;
30-
}
31-
3223
#contents .key {
3324
grid-column-start: span 2;
3425
padding: 12px 0;
@@ -42,14 +33,10 @@
4233
}
4334

4435
#footer {
45-
padding-top: 12px;
46-
font-size: 15px;
4736
white-space: nowrap;
4837
overflow: hidden;
4938
text-overflow: ellipsis;
50-
color: var(--sys-color-token-subtle);
5139
grid-column-start: span 2;
52-
font-weight: bold;
5340
}
5441

5542
#footer .icon-link {

front_end/ui/components/dialogs/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ generate_css("css_files") {
1111
sources = [
1212
"buttonDialog.css",
1313
"dialog.css",
14-
"iconDialog.css",
1514
"shortcutDialog.css",
1615
]
1716
}
@@ -20,7 +19,6 @@ devtools_module("dialogs") {
2019
sources = [
2120
"ButtonDialog.ts",
2221
"Dialog.ts",
23-
"IconDialog.ts",
2422
"ShortcutDialog.ts",
2523
]
2624
deps = [

front_end/ui/components/dialogs/IconDialog.ts

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

front_end/ui/components/dialogs/dialogs.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44

55
import * as ButtonDialog from './ButtonDialog.js';
66
import * as Dialog from './Dialog.js';
7-
import * as IconDialog from './IconDialog.js';
87
import * as ShortcutDialog from './ShortcutDialog.js';
98

109
export {
1110
ButtonDialog,
1211
Dialog,
13-
IconDialog,
1412
ShortcutDialog,
1513
};

front_end/ui/components/dialogs/iconDialog.css

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

front_end/ui/components/docs/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ group("docs") {
2828
"./floating_button",
2929
"./icon_button",
3030
"./icon_component",
31-
"./icon_dialog",
3231
"./input",
3332
"./issue_counter",
3433
"./issue_link_icon",

front_end/ui/components/docs/icon_dialog/BUILD.gn

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

front_end/ui/components/docs/icon_dialog/basic.html

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

0 commit comments

Comments
 (0)