Skip to content

Commit 4e3cd69

Browse files
author
Jonathan Feinberg
committed
fix the most egregious of the current style problems
1 parent 0114485 commit 4e3cd69

2 files changed

Lines changed: 36 additions & 103 deletions

File tree

‎content/css/style.css‎

Lines changed: 28 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,6 @@ x Last Modified: 2013.10.16 09:28AM
1313

1414

1515

16-
@font-face {
17-
font-family: 'theSerifItalic';
18-
src: url(fonts/TheSerif_B4_Italic.eot),
19-
url(fonts/TheSerif_B4_Italic.woff) format("woff");
20-
font-weight: 400;
21-
font-style: normal;
22-
}
23-
24-
@font-face {
25-
font-family: 'theSerif';
26-
src: url(fonts/TheSerif_B4_Plain_.eot),
27-
url(fonts/TheSerif_B4_Plain_.woff) format("woff");
28-
font-weight: 400;
29-
font-style: normal;
30-
}
31-
32-
@font-face {
33-
font-family: 'theSerif';
34-
src: url(fonts/TheSerif_B4_Bold_.eot),
35-
url(fonts/TheSerif_B4_Bold_.woff) format("woff");
36-
font-weight: 800;
37-
font-style: normal;
38-
}
39-
4016
@font-face {
4117
font-family: 'Enriqueta';
4218
src: url(fonts/Enriqueta-Regular-webfont.eot),
@@ -64,15 +40,13 @@ body {
6440

6541
background-color : #ddd; /* #FFFFFF; */ /* #333322 */
6642

67-
font-family : 'theSerif', 'Enriqueta', georgia, times, serif;
43+
font-family : 'Enriqueta', georgia, times, serif;
6844

6945
-webkit-font-smoothing: antialiased;
7046
-webkit-text-size-adjust: none;
7147

7248
font-size : 100%;
73-
/* font-size : 0.79em;*/
7449
font-weight : normal;
75-
line-height : 1.5em;
7650
color : #252525;
7751
}
7852

@@ -149,7 +123,7 @@ a.large-link:before {
149123

150124
#header .processing-logo {
151125
display: block;
152-
width: 231px;
126+
width: 255px;
153127
height: 36px;
154128
margin: 20px 0 0 30px;
155129
background: transparent url(../img/processing-logo.png) center center no-repeat;
@@ -165,7 +139,7 @@ a.large-link:before {
165139
content: '\2039';
166140
}
167141
#header a {
168-
font-family: 'theSerif', 'Enriqueta', georgia, times, sans-serif;
142+
font-family: 'Enriqueta', georgia, times, sans-serif;
169143
text-decoration: none;
170144
border: none;
171145
color: white;
@@ -190,7 +164,7 @@ a.large-link:before {
190164
outline: none;
191165
height: 18px;
192166
background: #fff;
193-
font-family: 'theSerif', 'Enriqueta', georgia, times, serif;
167+
font-family: 'Enriqueta', georgia, times, serif;
194168
font-size: 1em;
195169
color: #959595;
196170
}
@@ -237,8 +211,8 @@ a.large-link:before {
237211
.content {
238212
width: 680px;
239213
float: left;
240-
/*overflow: hidden;*/
241214
position: relative;
215+
line-height: 130%;
242216
}
243217

244218
/* ================ FOOTER ================== */
@@ -268,7 +242,7 @@ h1, h2, h3, h4, h5, h6
268242
{
269243
/*margin-bottom : 5px;*/
270244
color : #5A5A5A;
271-
font-family : 'theSerif', 'Enriqueta', georgia, times, serif;
245+
font-family : 'Enriqueta', georgia, times, serif;
272246
font-weight : 400;
273247
line-height : 1.6em;
274248
}
@@ -283,12 +257,12 @@ h4, h5, h6
283257
/*font-weight : bold;*/
284258
}
285259
.large-link {
286-
font-family: 'theSerif', 'Enriqueta', georgia, times, serif;
260+
font-family: 'Enriqueta', georgia, times, serif;
287261
}
288262
a.code { color: #2c7bb5; }
289263
/* dirty italic fix */
290264
i, em, .italic {
291-
font-family: 'theSerifItalic', 'Enriqueta' !important;
265+
font-family: 'Enriqueta' !important;
292266
font-style: normal !important;
293267
}
294268

@@ -304,18 +278,15 @@ h6 { font-size : 1em; }
304278
p { font-size : 0.79em; }
305279

306280
pre {
307-
font-family : monaco, "Courier New", Courier, monospace;
308-
line-height : normal; color: #000000;
281+
color: #000000;
309282
}
310283

311284
tt {
312-
font-family : monaco, "Courier New", Courier, monospace;
313-
line-height : normal; color: #000000;
285+
color: #000000;
314286
}
315287

316288
code, .code, kbd {
317-
font-family : monaco, "Courier New", Courier, monospace;
318-
line-height : normal; color: #000000;
289+
color: #000000;
319290
}
320291

321292
li {margin-bottom: 1em; }
@@ -371,7 +342,7 @@ li {margin-bottom: 1em; }
371342

372343
dl { margin: 0; }
373344
dt { /*font-style: italic;*/
374-
font-family : 'theSerifItalic', 'Enriqueta'; }
345+
font-family : 'Enriqueta'; }
375346
dd { margin: 0 0 1em 0; }
376347

377348
.happenings { margin-bottom: 30px; }
@@ -389,7 +360,7 @@ td img { margin: 0; display: block; }
389360
#Cover .mailing-list,
390361
#Cover .contact { margin-top: 3em; }
391362
#Cover .video .video-caption { /*font-style: italic;*/
392-
font-family: 'theSerifItalic', 'Enriqueta'; }
363+
font-family: 'Enriqueta'; }
393364
#Cover .video .video-caption:first-child { display: inline-block; margin-bottom: 1.5em; }
394365

395366
#Cover .mailing-list input[type="email"],
@@ -399,7 +370,7 @@ font-family: 'theSerifItalic', 'Enriqueta'; }
399370
outline: none;
400371
height: 20px;
401372
padding-left: 4px;
402-
font-family: 'theSerif', 'Enriqueta', georgia, times, serif;
373+
font-family: 'Enriqueta', georgia, times, serif;
403374
font-size: 1em;
404375
color: #252525;
405376
}
@@ -508,6 +479,8 @@ p.exhibition-nav { margin-top: 20px; margin-bottom: 10px; }
508479
#reference-nav { position: relative; width: 300px; height: 2em; padding-top: .5em; }
509480
#reference-nav p { position: absolute; right: 10px; top: 0; margin: 0; }
510481

482+
.refchunk>td { padding-bottom: 1em; }
483+
.refchunk td { line-height: 130%; }
511484
.ref-top {
512485
display:none;
513486
margin-top: 20px;
@@ -517,9 +490,15 @@ p.exhibition-nav { margin-top: 20px; margin-bottom: 10px; }
517490
.ref-notice { margin: 0 0 2.5em 0; color: #FF3399; clear: both; margin-right: 40px;}
518491

519492
.ref-item { margin-bottom: 60px; }
520-
.ref-item th { width: 100px; font-weight: bold; text-align: left; vertical-align: top; }
521-
.ref-item td { vertical-align: top; padding-bottom: 2em; }
522-
.ref-item td p {
493+
.ref-item > th {
494+
width: 100px;
495+
}
496+
.ref-item th {
497+
font-weight: bold; text-align: left; vertical-align: top;
498+
padding-right: 2em;
499+
}
500+
.ref-item > td { vertical-align: top; padding-bottom: 2em; max-width: 600px;}
501+
.ref-item > td p {
523502
max-width: 520px;
524503
}
525504

@@ -569,14 +548,11 @@ p.exhibition-nav { margin-top: 20px; margin-bottom: 10px; }
569548
.ref-item td h3 { margin: -11px 0 0 0; }
570549
.ref-item td b {
571550
font-weight: normal;
572-
font-family : monaco, "Courier New", Courier, monospace;
573-
font-size : 11px;
574-
line-height : normal;
551+
font-family : monospace;
575552
}
576553
pre {
577554
margin-bottom : 30px;
578555
margin-top : 0;
579-
font-size : .79em;
580556
}
581557
tr.name-row { height: 60px; }
582558
td p { margin-top: 0; }
@@ -821,7 +797,7 @@ div.ref-col {
821797
}
822798
#Download #selectForm .select-amount label.last { margin-right: 2px; }
823799
#Download .donate-box input[type="submit"]{
824-
font-family: 'theSerif', 'Enriqueta', georgia, times, serif;
800+
font-family: 'Enriqueta', georgia, times, serif;
825801
-webkit-font-smoothing: antialiased;
826802
font-size: 1.7em;
827803
color: #2c7bb5;
@@ -871,7 +847,7 @@ div.ref-col {
871847
#donateForm .payType .or {
872848
display: inline-block;
873849
/*font-style: italic;*/
874-
font-family : 'theSerifItalic', 'Enriqueta';
850+
font-family : 'Enriqueta';
875851
margin: 0 30px 0 20px;
876852
}
877853
#donateForm .ccInfo {
@@ -1203,49 +1179,6 @@ div.examples-nav {
12031179
div.examples-nav img { position: relative; top: 11px; }
12041180

12051181

1206-
/**************************************************************** updates, courses, happenings ***/
1207-
/*
1208-
#Courses .content, #Updates .content, #Happenings .content {
1209-
width: 595px;
1210-
}
1211-
#Updates h2 { margin-top: 0 0 20px 0; }
1212-
1213-
1214-
.course-desc p { margin: 0; }
1215-
.course-desc p.date { margin: 0; }
1216-
.course-desc h3 { margin: 0; font-size: 1em; font-weight: bold; line-height: 1em; }
1217-
.course-desc { margin-bottom: 2em; }
1218-
*/
1219-
1220-
/************************************************************** comparison ***/
1221-
/*
1222-
1223-
#Compare h1 { margin-top: 2em; }
1224-
#Compare h2 { margin-bottom: 0; }
1225-
#Compare .threecol { float: left; width: 210px; margin-right: 20px; }
1226-
#Compare .threecol p { margin-top: 0; }
1227-
1228-
1229-
#Compare .content {
1230-
margin-left : 55px;
1231-
margin-right : 0px;
1232-
position: relative;
1233-
}
1234-
*/
1235-
1236-
/************************************************************** troubleshooting ***/
1237-
/*
1238-
#Troubleshooting h1 { margin-top: 2em; }
1239-
#Troubleshooting h5 a { float: left; margin-left: -30px; }
1240-
ul.nostyle { margin: 0; padding: 0; list-style: none outside; }
1241-
#Troubleshooting td { padding-bottom: 1em; }
1242-
*/
1243-
1244-
/************************************************************** FAQ ***/
1245-
1246-
/*
1247-
#FAQ h5 a { float: left; margin-left: -30px; }
1248-
*/
12491182

12501183
.navBar a.bug { color: red; }
12511184

‎template/reference_item_template.jinja‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,47 +26,47 @@
2626
</tr>
2727
{% endif %}
2828

29-
<tr class="">
29+
<tr class="refchunk">
3030
<th scope="row">Description</th>
3131
<td>
3232
{{ convert_hypertext(item.description) }}
3333
</td>
3434
</tr>
3535

3636
{% if item.syntax is not none %} {# To keep lxml from yelling at us about unstable APIs #}
37-
<tr class=""><th scope="row">Syntax</th><td><pre>{{ convert_hypertext(item.syntax) }}</pre></td></tr>
37+
<tr class="refchunk"><th scope="row">Syntax</th><td><pre>{{ convert_hypertext(item.syntax) }}</pre></td></tr>
3838
{% endif %}
3939

4040
{% if item.parameters %}
41-
<tr class=""><th scope="row">Parameters</th><td><table cellpadding="0" cellspacing="0" border="0">
41+
<tr class="refchunk"><th scope="row">Parameters</th><td><table cellpadding="0" cellspacing="0" border="0">
4242
{% for param in item.parameters %}
4343
<tr class=""><th scope="row" class="code">{{ param.label }}</th><td>{{ convert_hypertext(param.description) }}</td></tr>
4444
{% endfor %}
4545
</table></tr>
4646
{% endif %}
4747

4848
{% if item.returns %}
49-
<tr class=""><th scope="row">Returns</th><td class="code">{{ item.returns }}</td></tr>
49+
<tr class="refchunk"><th scope="row">Returns</th><td class="code">{{ item.returns }}</td></tr>
5050
{% endif %}
5151

5252
{% if item.constructors %}
53-
<tr><th scope="row">Constructors</th><td class="code">
53+
<tr class="refchunk"><th scope="row">Constructors</th><td class="code">
5454
{% for constructor in item.constructors %}
5555
{{ constructor }} <br />
5656
{% endfor %}
5757
</td></tr>
5858
{% endif %}
5959

6060
{% if item.methods %}
61-
<tr><th scope="row">Methods</th><td><table cellpadding="0" cellspacing="0" border="0">
61+
<tr class="refchunk"><th scope="row">Methods</th><td><table cellpadding="0" cellspacing="0" border="0">
6262
{% for method in item.methods %}
6363
<tr><th scope="row" class="code"><a href="{{ method.ref }}">{{ method.label }}</a></th><td>{{ convert_hypertext(method.description) }}</td></tr>
6464
{% endfor %}
6565
</table></tr>
6666
{% endif %}
6767

68-
{% if item.relateds %}{# Who needs grammar? #}
69-
<tr><th scope="row">Related</th><td class="code">
68+
{% if item.relateds %}
69+
<tr class="refchunk"><th scope="row">Related</th><td class="code">
7070
{% for related in item.relateds %}
7171
<a class="code" href="{{ create_ref_link(related) }}">{{ items_dict[related].name }}</a><br />
7272
{% endfor %}

0 commit comments

Comments
 (0)