Skip to content

Commit f3fdd08

Browse files
committed
Revert "Improve typography"
This reverts commit 36e4471. Given that most people who commented on #652 disliked the change in one way or another, I am reverting this commit. This, however, does not mean that fonts do not have to be changed, or that some of the changes in this commit are not good. As all of the changes are in one rather big commit, it is a bit hard to cherry-pick what is actually needed, especially given that there is no final consensus on each particular thing. In other words, this revert does not solve #652, but it gives us a good start for working on the issues. Further discussion in #652 is welcome. This also reverts 540a340. It is a followup to the typography changes, which may or may not make sense when applied alone. The commit message says “reduce line-height” but in reality it increases it compared to the versions before “Improve typography” commit. It also conflicts with the revert anyway.
1 parent 367324f commit f3fdd08

File tree

3 files changed

+18
-90
lines changed

3 files changed

+18
-90
lines changed

assets/sass/style.scss

Lines changed: 8 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
$font-regular: 'Open Sans', sans-serif;
2-
$font-condensed: 'Open Sans Condensed', sans-serif;
3-
$font-mono: 'Roboto Mono', monospace;
4-
51
html, body {
62
margin: 0;
73
background: #EFEFEF!important;
8-
font-family: $font-regular!important; /*override font from perl.css
4+
font-family: sans-serif !important; /*override font from perl.css
95
stylesheet, until we can get rid of it*/
106
}
117

@@ -22,26 +18,6 @@ body {
2218
width: auto;
2319
}
2420

25-
h1, h2, h3, h4, h5, h6, dt {
26-
font-family: $font-condensed;
27-
}
28-
29-
dt {
30-
font-size: 140%;
31-
}
32-
33-
// TOC
34-
#content nav.indexgroup {
35-
> ol > li > a {
36-
font-family: $font-condensed;
37-
font-size: 120%;
38-
}
39-
40-
.indexItem {
41-
line-height: 1.2em;
42-
}
43-
}
44-
4521
.title {
4622
margin-top: 0;
4723
text-align: center;
@@ -65,10 +41,6 @@ code {
6541
color: #666;
6642
}
6743

68-
pre, code {
69-
font-family: $font-mono;
70-
}
71-
7244
pre {
7345
a {
7446
text-decoration: underline;
@@ -139,6 +111,8 @@ td {
139111
}
140112

141113
#header {
114+
font-family: sans-serif;
115+
font-weight: bold;
142116
border-radius: 0 0 4em 4em;
143117
margin: -2em auto 0; /*extra top padding and negative margin preserves bleed-off illusion for shadow*/
144118
padding: 3em 0em 0em 0em;
@@ -148,7 +122,6 @@ td {
148122
}
149123

150124
#header > a {
151-
font-family: $font-condensed;
152125
color: #000000;
153126
text-decoration: none;
154127
font-size: 2em;
@@ -239,22 +212,18 @@ td {
239212
}
240213

241214
.ui-autocomplete-category {
242-
font-family: $font-condensed;
243-
font-size: 110%;
215+
font-weight: bold;
216+
font-style: italic;
244217
background-color: #8BC313;
245218
padding: 2px 5px;
246219
line-height: 1.5;
247220
}
248221
.ui-state-focus {
249-
font-weight: normal!important;
222+
font-weight: normal !important; /* override css/custom-theme/jquery-ui.css */
223+
font-style: italic;
250224
}
251225
.ui-menu .ui-menu-item {
252-
padding-left: 1em!important;
253-
}
254-
255-
.ui-widget input,
256-
.ui-widget {
257-
font-family: $font-regular;
226+
padding-left: 1em !important; /* override css/custom-theme/jquery-ui.css */
258227
}
259228

260229
.menu {
@@ -319,22 +288,6 @@ td {
319288
background-repeat: no-repeat;
320289
background-position: right 2em top 2em;
321290

322-
p, li, dt, dd {
323-
line-height: 1.75em;
324-
}
325-
326-
pre {
327-
line-height: 1.35em;
328-
}
329-
330-
p {
331-
margin-top: 25px;
332-
}
333-
334-
table p {
335-
margin-top: 0;
336-
}
337-
338291
dt {
339292
font-weight: bold;
340293
margin-bottom: 0.2em;

html/css/style.css

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
html, body {
22
margin: 0;
33
background: #EFEFEF !important;
4-
font-family: "Open Sans", sans-serif !important;
4+
font-family: sans-serif !important;
55
/*override font from perl.css
66
stylesheet, until we can get rid of it*/ }
77

@@ -16,19 +16,6 @@ body {
1616
margin: -1px 0 0;
1717
width: auto; }
1818

19-
h1, h2, h3, h4, h5, h6, dt {
20-
font-family: "Open Sans Condensed", sans-serif; }
21-
22-
dt {
23-
font-size: 140%; }
24-
25-
#content nav.indexgroup > ol > li > a {
26-
font-family: "Open Sans Condensed", sans-serif;
27-
font-size: 120%; }
28-
29-
#content nav.indexgroup .indexItem {
30-
line-height: 1.2em; }
31-
3219
.title {
3320
margin-top: 0;
3421
text-align: center; }
@@ -49,9 +36,6 @@ pre {
4936
code {
5037
color: #666; }
5138

52-
pre, code {
53-
font-family: "Roboto Mono", monospace; }
54-
5539
pre a {
5640
text-decoration: underline;
5741
color: black; }
@@ -106,6 +90,8 @@ td {
10690
background-color: #F5EF7B; }
10791

10892
#header {
93+
font-family: sans-serif;
94+
font-weight: bold;
10995
border-radius: 0 0 4em 4em;
11096
margin: -2em auto 0;
11197
/*extra top padding and negative margin preserves bleed-off illusion for shadow*/
@@ -115,7 +101,6 @@ td {
115101
border-top: none; }
116102

117103
#header > a {
118-
font-family: "Open Sans Condensed", sans-serif;
119104
color: #000000;
120105
text-decoration: none;
121106
font-size: 2em;
@@ -190,21 +175,20 @@ td {
190175
color: #000000; }
191176

192177
.ui-autocomplete-category {
193-
font-family: "Open Sans Condensed", sans-serif;
194-
font-size: 110%;
178+
font-weight: bold;
179+
font-style: italic;
195180
background-color: #8BC313;
196181
padding: 2px 5px;
197182
line-height: 1.5; }
198183

199184
.ui-state-focus {
200-
font-weight: normal !important; }
185+
font-weight: normal !important;
186+
/* override css/custom-theme/jquery-ui.css */
187+
font-style: italic; }
201188

202189
.ui-menu .ui-menu-item {
203-
padding-left: 1em !important; }
204-
205-
.ui-widget input,
206-
.ui-widget {
207-
font-family: "Open Sans", sans-serif; }
190+
padding-left: 1em !important;
191+
/* override css/custom-theme/jquery-ui.css */ }
208192

209193
.menu {
210194
border: none;
@@ -259,14 +243,6 @@ td {
259243
background-image: url(/images/camelia-faded.png);
260244
background-repeat: no-repeat;
261245
background-position: right 2em top 2em; }
262-
#content p, #content li, #content dt, #content dd {
263-
line-height: 1.75em; }
264-
#content pre {
265-
line-height: 1.35em; }
266-
#content p {
267-
margin-top: 25px; }
268-
#content table p {
269-
margin-top: 0; }
270246
#content dt {
271247
font-weight: bold;
272248
margin-bottom: 0.2em; }

template/head.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
<link type="text/css" href="/css/custom-theme/jquery-ui.css" rel="stylesheet" />
55
<link type="text/css" href="/css/pygments.css" rel="stylesheet" />
66
<noscript> <style> #search { visibility: hidden; } </style> </noscript>
7-
<link href="https://fonts.googleapis.com/css?family=Open+Sans|Open+Sans+Condensed:700|Roboto+Mono" rel="stylesheet">

0 commit comments

Comments
 (0)