Skip to content

Commit 9667003

Browse files
ktranDevtools-frontend LUCI CQ
authored andcommitted
Adjust card settings margins and paddings
This CL makes two main changes: 1. Unify paddings from different settings pages 2. Increase margins to not crop shadows in narrow view Drive-by: Slotted elements into contents need to come first since we rely on a first-child selector, and correctly include the icon button in Cards. Fixed: 376194355 Change-Id: I064c84be94c7406d15831122a1cf5fbfe21e0ed2 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5979930 Reviewed-by: Kateryna Prokopenko <[email protected]> Commit-Queue: Kim-Anh Tran <[email protected]>
1 parent 1d90c97 commit 9667003

File tree

7 files changed

+24
-13
lines changed

7 files changed

+24
-13
lines changed

front_end/panels/settings/FrameworkIgnoreListSettingsTab.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export class FrameworkIgnoreListSettingsTab extends UI.Widget.VBox implements
108108
ignoreListingDescription.textContent = i18nString(UIStrings.ignoreListingDescription);
109109
const enabledSetting =
110110
Common.Settings.Settings.instance().moduleSetting('enable-ignore-listing') as Common.Settings.Setting<boolean>;
111-
const enableIgnoreListing = this.contentElement.createChild('div');
111+
const enableIgnoreListing = this.contentElement.createChild('div', 'enable-ignore-listing');
112112
enableIgnoreListing.appendChild(
113113
UI.SettingsUI.createSettingCheckbox(i18nString(UIStrings.enableIgnoreListing), enabledSetting, true));
114114
UI.Tooltip.Tooltip.install(enableIgnoreListing, i18nString(UIStrings.enableIgnoreListingTooltip));
@@ -121,6 +121,7 @@ export class FrameworkIgnoreListSettingsTab extends UI.Widget.VBox implements
121121
settingsContent.appendChild(enableIgnoreListingCard);
122122

123123
const generalExclusionGroup = this.createSettingGroup();
124+
generalExclusionGroup.classList.add('general-exclusion-group');
124125
const ignoreListContentScripts = generalExclusionGroup.createChild('div', 'ignore-list-option');
125126
ignoreListContentScripts.appendChild(UI.SettingsUI.createSettingCheckbox(
126127
i18nString(UIStrings.ignoreListContentScripts),

front_end/panels/settings/emulation/devicesSettingsTab.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
}
3333

3434
.devices-list-item {
35-
padding: var(--sys-size-3) var(--sys-size-7);
35+
padding: var(--sys-size-3) var(--sys-size-6);
3636
height: var(--sys-size-13);
3737
display: flex;
3838
align-items: center;

front_end/panels/settings/frameworkIgnoreListSettingsTab.css

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
.ignore-list-option {
88
flex: none;
9+
display: flex;
10+
align-items: center;
11+
height: var(--sys-size-13);
912
}
1013

1114
.ignore-list-option devtools-button {
@@ -25,13 +28,16 @@
2528
flex: 0 1 auto;
2629
}
2730

31+
.enable-ignore-listing, .ignore-list-item, .general-exclusion-group {
32+
padding-left: var(--sys-size-4);
33+
}
34+
2835
.custom-exclusion-group {
2936
padding-left: 0;
3037
padding-right: 0;
3138
}
3239

3340
.ignore-list-item {
34-
padding: var(--sys-size-3) var(--sys-size-5);
3541
height: var(--sys-size-13);
3642
display: flex;
3743
align-items: center;

front_end/panels/settings/keybindsSettingsTab.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424

2525
.keybinds-list-item {
26-
margin: 0 var(--sys-size-7);
26+
margin: 0 var(--sys-size-6);
2727
padding: var(--sys-size-4) 0;
2828
display: grid;
2929
grid-template-rows: 1fr ;

front_end/panels/settings/settingsScreen.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ label {
165165
display: flex;
166166
flex-direction: column;
167167
align-items: center;
168-
gap: var(--sys-size-11);
168+
gap: var(--sys-size-9);
169169
}
170170

171171
.settings-tab.settings-content {

front_end/ui/components/cards/Card.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import '../../../ui/components/icon_button/icon_button.js';
6+
57
import * as LitHtml from '../../lit-html/lit-html.js';
68

79
import cardStyles from './card.css.js';
@@ -31,18 +33,20 @@ export class Card extends HTMLElement {
3133
this.#heading = data.heading;
3234
this.#headingIconName = data.headingIconName;
3335

34-
this.#headingSuffix?.remove();
35-
if (data.headingSuffix) {
36-
this.#headingSuffix = data.headingSuffix;
37-
data.headingSuffix.slot = 'heading-suffix';
38-
this.append(data.headingSuffix);
39-
}
4036
this.#content.forEach(content => content.remove());
4137
data.content.forEach(content => {
4238
content.slot = 'content';
4339
this.append(content);
4440
});
4541
this.#content = data.content;
42+
43+
this.#headingSuffix?.remove();
44+
if (data.headingSuffix) {
45+
this.#headingSuffix = data.headingSuffix;
46+
data.headingSuffix.slot = 'heading-suffix';
47+
this.append(data.headingSuffix);
48+
}
49+
4650
this.#render();
4751
}
4852

front_end/ui/components/cards/card.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
.card {
1212
min-width: var(--sys-size-31);
1313
max-width: var(--sys-size-37);
14-
margin: var(--sys-size-3);
14+
margin: var(--sys-size-3) var(--sys-size-5) var(--sys-size-5) var(--sys-size-5);
1515
}
1616

1717
.heading-wrapper {
@@ -42,7 +42,7 @@ slot[name="heading-suffix"]::slotted(*) {
4242
}
4343

4444
slot[name="content"]::slotted(*) {
45-
padding: var(--sys-size-5);
45+
padding: var(--sys-size-5) var(--sys-size-6);
4646
}
4747

4848
slot[name="content"]::slotted(*:not(:first-child)) {

0 commit comments

Comments
 (0)