Skip to content

Commit 10e8cb6

Browse files
committed
fix(web): correct mobile settings config editor layout
1 parent 8c84c06 commit 10e8cb6

2 files changed

Lines changed: 30 additions & 6 deletions

File tree

packages/web/src/styles/components.css

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,14 @@
822822
display: flex;
823823
flex-direction: column;
824824
align-items: center;
825-
justify-content: center;
825+
justify-content: flex-start;
826+
}
827+
828+
.settings-content--fill-height > .settings-content-surface {
829+
display: flex;
830+
flex: 1;
831+
min-height: 0;
832+
flex-direction: column;
826833
}
827834

828835
.settings-content-surface {
@@ -7938,11 +7945,15 @@ textarea.input {
79387945
min-height: 0;
79397946
}
79407947

7941-
.config-card-body--fill-height > * {
7948+
.config-card-body--fill-height > .monaco-host {
79427949
flex: 1;
79437950
min-height: 0;
79447951
}
79457952

7953+
.config-card-body--fill-height > .config-card-actions {
7954+
flex: 0 0 auto;
7955+
}
7956+
79467957
/* Monaco Editor */
79477958
.config-card-body .monaco-host {
79487959
min-height: 200px;

packages/web/src/styles/components.theme.test.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,9 @@ describe("components.css theme-sensitive surfaces", () => {
561561
const settingsSidebar = getLastRuleBlock(".settings-sidebar");
562562
const settingsContent = getLastRuleBlock(".settings-content");
563563
const settingsContentFillHeight = getLastRuleBlock(".settings-content--fill-height");
564+
const settingsContentFillHeightSurface = getLastRuleBlock(
565+
".settings-content--fill-height > .settings-content-surface"
566+
);
564567
const settingsNavItem = getLastRuleBlock(".settings-nav-item");
565568
const settingsNavItemHover = getLastRuleBlock(".settings-nav-item:hover");
566569
const settingsNavItemActive = getLastRuleBlock(".settings-nav-item-active");
@@ -602,7 +605,11 @@ describe("components.css theme-sensitive surfaces", () => {
602605
expect(settingsContent).toContain("justify-content: center");
603606
expect(settingsContent).toContain("padding: var(--sp-6)");
604607
expect(settingsContent).toContain("background: var(--bg-page)");
605-
expect(settingsContentFillHeight).toContain("justify-content: center");
608+
expect(settingsContentFillHeight).toContain("justify-content: flex-start");
609+
expect(settingsContentFillHeightSurface).toContain("display: flex");
610+
expect(settingsContentFillHeightSurface).toContain("flex-direction: column");
611+
expect(settingsContentFillHeightSurface).toContain("flex: 1");
612+
expect(settingsContentFillHeightSurface).toContain("min-height: 0");
606613
expect(settingsNavItem).toContain("min-height: 40px");
607614
expect(settingsNavItem).toContain("border: 1px solid transparent");
608615
expect(settingsNavItem).toContain("border-radius: var(--radius-md)");
@@ -1087,7 +1094,12 @@ describe("components.css theme-sensitive surfaces", () => {
10871094
const configCardHeaderBase = getRuleBlocksFrom(stylesheet, ".config-card-header")[0];
10881095
const configCardBody = getLastRuleBlock(".config-card-body");
10891096
const configCardBodyFillHeight = getLastRuleBlock(".config-card-body--fill-height");
1090-
const configCardBodyFillHeightChild = getLastRuleBlock(".config-card-body--fill-height > *");
1097+
const configCardBodyFillHeightMonaco = getLastRuleBlock(
1098+
".config-card-body--fill-height > .monaco-host"
1099+
);
1100+
const configCardBodyFillHeightActions = getLastRuleBlock(
1101+
".config-card-body--fill-height > .config-card-actions"
1102+
);
10911103
const configCardActionsBase = getRuleBlocksFrom(stylesheet, ".config-card-actions")[0];
10921104
const configCardMobile = getLastGroupedRuleBlockFrom(
10931105
stylesheet,
@@ -1116,8 +1128,9 @@ describe("components.css theme-sensitive surfaces", () => {
11161128
expect(configCardBody).toContain("background: transparent");
11171129
expect(configCardBodyFillHeight).toContain("display: flex");
11181130
expect(configCardBodyFillHeight).toContain("flex-direction: column");
1119-
expect(configCardBodyFillHeightChild).toContain("flex: 1");
1120-
expect(configCardBodyFillHeightChild).toContain("min-height: 0");
1131+
expect(configCardBodyFillHeightMonaco).toContain("flex: 1");
1132+
expect(configCardBodyFillHeightMonaco).toContain("min-height: 0");
1133+
expect(configCardBodyFillHeightActions).toContain("flex: 0 0 auto");
11211134
expect(configCardActionsBase).toContain("border-top: 1px solid var(--border)");
11221135
expect(configCardActionsBase).toContain("background: transparent");
11231136
expect(configEmptyStateBase).toContain("align-items: flex-start");

0 commit comments

Comments
 (0)