Skip to content

Commit 8ba7b11

Browse files
committed
fix(board): correct container gap
chore(board): simplify style organization
1 parent 1684f03 commit 8ba7b11

File tree

5 files changed

+48
-90
lines changed

5 files changed

+48
-90
lines changed

packages/board/src/Taskboard.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
overflow-x: auto;
4747

4848
margin-top: 0;
49+
padding: 0 var(--container-gap);
4950
gap: var(--container-gap);
5051
}
5152

@@ -57,13 +58,13 @@
5758
border-radius: .25rem;
5859
background: #ebecf0;
5960

60-
--container-gap: .7rem;
61-
6261
&.collapsed {
6362
min-width: 3rem;
6463

6564
flex: 0;
6665
}
66+
67+
margin-bottom: var(--container-gap);
6768
}
6869

6970
.taskboard-column-items {
@@ -143,6 +144,10 @@
143144
padding: 0 .25em;
144145
}
145146

146-
.card-container + .card-container {
147-
margin-top: var(--container-gap);
147+
.card-container {
148+
margin: var(--container-gap);
149+
}
150+
151+
.card-container:first-child {
152+
margin-top: 0;
148153
}

packages/board/src/components/HintList.svelte

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,27 @@
6464
max-height: 200px;
6565
overflow-y: auto;
6666
padding: 0;
67+
margin: 0;
6768
}
6869
6970
.hint-list:not(:first-child) {
7071
margin-top: 0;
7172
}
7273
7374
.hint-list li {
74-
margin: 0;
75+
margin: 0 var(--container-gap);
76+
}
77+
78+
.hint-list li:first-child {
79+
margin-top: var(--container-gap);
80+
}
81+
82+
.hint-list li:last-child {
83+
margin-bottom: var(--container-gap);
7584
}
7685
7786
.hint-list li a {
78-
padding: .25rem .35rem;
87+
padding: calc(var(--container-gap) / 2) var(--container-gap);
7988
width: 100%;
8089
display: block;
8190
border-radius: 5px;

packages/board/src/style/_style.scss

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,4 @@
4343
// @import "bootstrap/scss/utilities/_screenreaders";
4444
// @import "bootstrap/scss/utilities/_sizing";
4545
@import "bootstrap/scss/utilities/_spacing";
46-
// @import "bootstrap/scss/print";
47-
48-
49-
// theme customizations
50-
51-
html {
52-
font-size: .9rem;
53-
}
54-
55-
56-
.avatar img {
57-
vertical-align: unset;
58-
}
46+
// @import "bootstrap/scss/print";
Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,39 @@
11
@import "./variables";
2-
@import "./_bootstrap";
3-
4-
@import "./_style";
2+
@import "./bootstrap";
53

64
@import "@bpmn-io/draggle/dist/dragula";
75

8-
/* Fix drag container scrolling */
6+
html,
7+
body {
8+
position: relative;
9+
width: 100%;
10+
height: 100%;
11+
}
12+
13+
// fix drag container scrolling
914
.gu-mirror {
1015
pointer-events: none;
1116
}
1217

18+
// theme customizations
19+
1320
.navbar-brand {
1421
padding: 0;
1522
margin: 0;
23+
}
24+
25+
html {
26+
font-size: .9rem;
27+
}
28+
29+
.avatar img {
30+
vertical-align: unset;
31+
}
32+
33+
.scroll-container-h,
34+
.scroll-container-v {
35+
--container-gap: 0.5rem;
36+
37+
scrollbar-width: thin;
38+
scrollbar-color: rgba(0, 0, 0, .25) transparent;
1639
}

0 commit comments

Comments
 (0)