Skip to content

Commit 32bb0e1

Browse files
authored
Merge pull request #222 from deholic/feature/fix-layout
fix: 레이아웃/컴포넌트 반응형 개선
2 parents 6c8f2d8 + a349c84 commit 32bb0e1

3 files changed

Lines changed: 17 additions & 20 deletions

File tree

src/ui/styles/base.css

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,14 @@
186186
--color-pomodoro-focus: #ff6347;
187187
--color-pomodoro-break: #22c55e;
188188
--color-pomodoro-long-break: #3b82f6;
189+
--height-app-paddingY: 16px;
190+
--height-app-container: calc(100vh - var(--height-app-paddingY) * 2 - 10px); /* 10px은 브라우저 스크롤바 여유 공간 */
191+
--height-panel-paddingY: 16px;
192+
--height-timeline-column: calc(var(--height-app-container) - var(--height-panel-paddingY) * 2 - var(--height-timeline-column-paddingY) * 2);
193+
--height-timeline-column-paddingY: 12px;
194+
--height-timeline-column-gap: 12px;
195+
--height-timeline-header: 48px;
196+
--height-timeline-column-body: calc(var(--height-timeline-column) - var(--height-timeline-column-gap) - var(--height-timeline-header));
189197
}
190198

191199
:root[data-color-scheme="light"] {
@@ -238,8 +246,5 @@ html,
238246
body,
239247
#root {
240248
height: 100%;
241-
}
242-
243-
body {
244249
margin: 0;
245250
}

src/ui/styles/components.css

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,20 +1219,20 @@ button.ghost {
12191219
max-width: var(--timeline-column-max-width);
12201220
display: flex;
12211221
flex-direction: column;
1222-
gap: 12px;
1222+
gap: var(--height-timeline-column-gap);
12231223
position: relative;
12241224
background: var(--color-timeline-column-bg);
12251225
border: 1px solid var(--color-timeline-column-border);
12261226
border-radius: 14px;
1227-
padding: 12px;
1228-
min-height: 90vh;
1227+
padding: var(--height-timeline-column-paddingY) 12px;
1228+
min-height: var(--height-timeline-column);
12291229
box-shadow: var(--shadow-timeline-column);
12301230
scroll-snap-align: start;
12311231
}
12321232

12331233
.timeline-column-header {
12341234
display: flex;
1235-
gap: 12px;
1235+
gap: var(--height-timeline-column-gap);
12361236
align-items: center;
12371237
}
12381238

@@ -1456,7 +1456,7 @@ button.ghost {
14561456

14571457
.timeline-column-body {
14581458
overflow-y: auto;
1459-
max-height: 85vh;
1459+
max-height: var(--height-timeline-column-body);
14601460
padding-right: 6px;
14611461
}
14621462

@@ -2532,8 +2532,6 @@ button.ghost {
25322532
white-space: nowrap;
25332533
}
25342534

2535-
2536-
25372535
.status-modal-body {
25382536
padding: 16px;
25392537
overflow-y: auto;

src/ui/styles/layout.css

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.app {
2-
padding: 16px 32px 8px;
3-
min-height: 100%;
2+
padding: var(--height-app-paddingY) 16px;
3+
min-height: var(--height-app-container);
44
}
55

66
.app-header {
@@ -81,9 +81,8 @@
8181
.layout {
8282
display: grid;
8383
grid-template-columns: minmax(260px, 320px) 1fr;
84-
gap: 24px;
84+
gap: 16px;
8585
align-items: start;
86-
min-height: calc(100vh - 24px);
8786
}
8887

8988
.layout.layout-empty {
@@ -102,7 +101,7 @@ aside {
102101
background: var(--color-panel-bg);
103102
border: 1px solid var(--color-panel-border);
104103
border-radius: 16px;
105-
padding: 16px;
104+
padding: var(--height-panel-paddingY) 16px;
106105
box-shadow: var(--shadow-panel);
107106
position: relative;
108107
}
@@ -183,7 +182,6 @@ aside {
183182
flex-direction: column;
184183
gap: 24px;
185184
overflow: hidden;
186-
min-height: 100%;
187185
}
188186

189187
.mobile-blocker {
@@ -285,10 +283,6 @@ aside {
285283
display: none;
286284
}
287285

288-
.main-column {
289-
gap: 12px;
290-
}
291-
292286
.panel,
293287
section.panel {
294288
background: transparent;

0 commit comments

Comments
 (0)