Skip to content

Commit 532e42c

Browse files
kamilszewczyk0kamilszewczyk0
authored
Merge pull request #30 from szymon-rd/style-fixes
styles corections according to designer specification
2 parents d3c9e8e + 9d90892 commit 532e42c

File tree

8 files changed

+65
-55
lines changed

8 files changed

+65
-55
lines changed

‎docs/_assets/css/frontpage.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ h1#main {
2828
/* navigation */
2929
header {
3030
font-size: 24px;
31+
margin-block-end: calc(2* var(--base-spacing));
3132
}
3233

3334
header .nav-item i {

‎scaladoc/resources/dotty_res/styles/scalastyle.css

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,19 @@ input {
3333
min-height: 100%;
3434
}
3535
#leftColumn {
36-
position: fixed;
37-
width: var(--side-width);
38-
height: 100%;
39-
border-right: none;
40-
background: var(--body-bg);
41-
display: flex;
42-
flex-direction: column;
43-
z-index: 5;
44-
border-right: solid 1px var(--leftbar-border);
36+
display: flex;
37+
flex-direction: column;
38+
align-items: center;
39+
position: absolute;
40+
width: calc(39 * var(--base-spacing));
41+
height: calc(100% - (8 * var(--base-spacing)) - (6 * var(--base-spacing)));
42+
left: 0px;
43+
top: calc(8 * var(--base-spacing));
44+
background: var(--background-default);
45+
border: 1px solid var(--border-default);
46+
border-top: none;
47+
border-left: none;
48+
transition: left 0.2s linear;
4549
}
4650
#main-content {
4751
min-height: calc(100vh - var(--footer-height) - 24px);

‎scaladoc/resources/dotty_res/styles/theme/components/attributes.css

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
.attributes {
2+
display: grid;
3+
grid-template-columns: 184px 1fr;
24
width: 100%;
35
overflow: hidden;
46
padding: 0;
57
margin: 0;
6-
margin-bottom: calc(6 * var(--base-spacing));
78
}
89

910
.attributes .attributes {
@@ -15,22 +16,19 @@
1516
}
1617

1718
.attributes > dt {
18-
float: left;
19-
width: 20%;
20-
padding: 20px 0;
19+
padding: calc(2.5 * var(--base-spacing)) calc(6 * var(--base-spacing)) calc(2.5 * var(--base-spacing)) calc(2 * var(--base-spacing));
2120
border-top: 1px solid var(--border-default);
2221
text-align: right;
2322
color: var(--text-secondary);
23+
overflow: hidden;
2424
}
2525

2626
.attributes > dd {
27-
float: left;
28-
width: 70%;
2927
padding-left: 10%;
3028
margin: 0;
3129
border-top: 1px solid var(--border-default);
32-
padding-top: calc(2.5 * var(--base-spacing));
33-
padding-bottom: calc(2.5 * var(--base-spacing));
30+
overflow: hidden;
31+
padding: calc(2 * var(--base-spacing)) 0;
3432
}
3533

3634
.attributes > dt:first-child,

‎scaladoc/resources/dotty_res/styles/theme/components/code-snippet.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ dd .snippet {
5353
}
5454

5555
.snippet > pre > code > span::before {
56-
content: attr(line-number);
56+
margin-left: 0;
57+
/* content: attr(line-number);
5758
color: var(--code-syntax-highlighting-line-number);
5859
margin-right: calc(2 * var(--base-spacing));
59-
margin-left: calc(var(--base-spacing));
6060
display: inline-block;
6161
text-align: right;
62-
min-width: calc(3 * var(--base-spacing));
62+
min-width: calc(3 * var(--base-spacing)); */
6363
}
6464

6565
.snippet-showhide-container {

‎scaladoc/resources/dotty_res/styles/theme/components/navigation-item.css

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,57 +33,57 @@
3333
}
3434

3535
.n0 > .nh > .ar {
36-
left: calc(1.5 * var(--base-spacing));
36+
left: calc(1 * var(--base-spacing));
3737
}
3838

3939
.n0 > .nh > a {
40-
left: calc(4.5 * var(--base-spacing));
40+
left: calc(3.5 * var(--base-spacing));
4141
max-width: calc(31 * var(--base-spacing));
4242
}
4343

4444
.n1 > .nh > .ar {
45-
left: calc(4.5 * var(--base-spacing));
45+
left: calc(3.5 * var(--base-spacing));
4646
}
4747

4848
.n1 > .nh > a {
49-
left: calc(7.5 * var(--base-spacing));
50-
max-width: calc(28 * var(--base-spacing));
49+
left: calc(6 * var(--base-spacing));
50+
max-width: calc(28.5 * var(--base-spacing));
5151
}
5252

5353
.n2 > .nh > .ar {
54-
left: calc(7.5 * var(--base-spacing));
54+
left: calc(6 * var(--base-spacing));
5555
}
5656

5757
.n2 > .nh > a {
58-
left: calc(10.5 * var(--base-spacing));
59-
max-width: calc(25 * var(--base-spacing));
58+
left: calc(8.5 * var(--base-spacing));
59+
max-width: calc(26 * var(--base-spacing));
6060
}
6161

6262
.n3 > .nh > .ar {
63-
left: calc(10.5 * var(--base-spacing));
63+
left: calc(7.5 * var(--base-spacing));
6464
}
6565

6666
.n3 > .nh > a {
67-
left: calc(13.5 * var(--base-spacing));
68-
max-width: calc(22 * var(--base-spacing));
67+
left: calc(11 * var(--base-spacing));
68+
max-width: calc(23.5 * var(--base-spacing));
6969
}
7070

7171
.n4 > .nh > .ar {
72-
left: calc(13.5 * var(--base-spacing));
72+
left: calc(11 * var(--base-spacing));
7373
}
7474

7575
.n4 > .nh > a {
76-
left: calc(16.5 * var(--base-spacing));
77-
max-width: calc(19 * var(--base-spacing));
76+
left: calc(13.5 * var(--base-spacing));
77+
max-width: calc(21 * var(--base-spacing));
7878
}
7979

8080
.n5 > .nh > .ar {
81-
left: calc(16.5 * var(--base-spacing));
81+
left: calc(15.5 * var(--base-spacing));
8282
}
8383

8484
.n5 > .nh > a {
85-
left: calc(19.5 * var(--base-spacing));
86-
max-width: calc(16 * var(--base-spacing));
85+
left: calc(16 * var(--base-spacing));
86+
max-width: calc(18.5 * var(--base-spacing));
8787
}
8888

8989
.nh:hover {

‎scaladoc/resources/dotty_res/styles/theme/components/switcher.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
.switcher-container {
44
display: flex;
5-
flex-flow: row;
6-
width: 100%;
7-
height: calc(4.5 * var(--base-spacing));
8-
gap: 1px;
9-
margin-bottom: calc(3.75 * var(--base-spacing));
5+
flex-flow: row;
6+
width: 100%;
7+
height: calc(4.5 * var(--base-spacing));
8+
gap: 1px;
9+
padding: calc(3 * var(--base-spacing)) 0;
1010
}
1111

1212
.switcher {

‎scaladoc/resources/dotty_res/styles/theme/layout/content.css

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,23 @@
158158
line-height: normal;
159159
}
160160

161-
#content h1,
162-
#content h2 {
161+
#content h1 {
163162
color: var(--text-primary);
164163
margin-block-end: 0;
165164
margin-block-start: 0;
166165
}
167166

167+
#content h2 {
168+
color: var(--text-primary);
169+
margin-block-start: calc(6* var(--base-spacing));
170+
margin-block-end: calc(3* var(--base-spacing));
171+
}
172+
168173
/* content first paragraph */
174+
.first-p {
175+
margin-block-start: 0;
176+
}
177+
169178
#content .first-p {
170179
color: var(--text-secondary);
171180
}
@@ -208,12 +217,17 @@
208217

209218
/* content link */
210219
#content a {
211-
color: var(--text-primary);
212-
text-decoration: underline var(--grey8) solid 1px;
220+
color: var(--text-primary);
221+
text-decoration: underline solid 1px;
222+
text-underline-offset: 2px;
213223
}
214224

215225
#content a:hover {
216-
text-decoration: underline var(--text-secondary) solid 1px;
226+
text-decoration: underline solid 1.5px;
227+
}
228+
229+
#content .cover-header {
230+
margin-block-end: calc(2*var(--base-spacing));
217231
}
218232

219233
#content .cover-header a,
@@ -474,12 +488,6 @@
474488
display: block;
475489
}
476490

477-
478-
479-
#content section {
480-
margin-top: calc(6 * var(--base-spacing));
481-
}
482-
483491
#content section:last-child {
484492
margin-bottom: calc(6 * var(--base-spacing));
485493
}

‎scaladoc/resources/dotty_res/styles/theme/layout/sideMenu.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
overflow-x: hidden;
44
width: 100%;
55
height: calc(100% - calc(11 * var(--base-spacing)));
6-
padding-left: calc(1.5 * var(--base-spacing));
7-
padding-right: calc(1.5 * var(--base-spacing));
6+
padding: 0 calc(1.5 * var(--base-spacing)) calc(3 * var(--base-spacing)) calc(1.5 * var(--base-spacing));
87
box-sizing: border-box;
98
}
109

0 commit comments

Comments
 (0)