Skip to content

Commit 2b1f54c

Browse files
committed
Changed uk.code.org to use locally-hosted Gotham.
1 parent bb1f805 commit 2b1f54c

9 files changed

+142
-33
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

pegasus/sites.v3/uk.code.org/styles/010-gotham-font.css

Lines changed: 78 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pegasus/sites.v3/uk.code.org/styles/040-page.css

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
h1 {
66
color: #7665a0;
77
font-size: 32px;
8-
font-weight: bold;
8+
font-family: 'Gotham 7r', sans-serif;
99
margin-top: 50px;
1010
margin-bottom: 30px;
1111
line-height: 1.2em;
@@ -14,7 +14,7 @@ h1 {
1414
h2 {
1515
color: #00adbc;
1616
font-size: 22px;
17-
font-weight: 500;
17+
font-family: 'Gotham 5r', sans-serif;
1818
margin-top:45px;
1919
margin-bottom:25px;
2020
line-height: 1.2em;
@@ -23,7 +23,7 @@ h2 {
2323
h3 {
2424
color: #5b6770;
2525
font-size: 14px;
26-
font-weight: 500;
26+
font-family: 'Gotham 5r', sans-serif;
2727
margin-top:25px;
2828
margin-bottom:12px;
2929
line-height: 1.2em;
@@ -32,16 +32,16 @@ h3 {
3232
h4 {
3333
color: #5b6770;
3434
font-size: 14px;
35-
font-weight: 500;
35+
font-family: 'Gotham 5r', sans-serif;
3636
line-height: 1.2em;
3737
}
3838

3939
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
40-
font-family: 'Gotham A','Gotham B',sans-serif;
40+
font-weight: normal;
4141
}
4242

4343
a {
44-
font-weight: bold;
44+
font-family: 'Gotham 7r', sans-serif;
4545
}
4646

4747
a:link {
@@ -73,12 +73,26 @@ blockquote p {
7373
line-height: 1.8;
7474
}
7575

76+
strong {
77+
font-family: 'Gotham 7r', sans-serif;
78+
font-weight: normal;
79+
}
80+
81+
em {
82+
font-family: 'Gotham 4i', sans-serif;
83+
font-style: normal;
84+
}
85+
86+
strong em,
87+
em strong {
88+
font-family: 'Gotham 7i', sans-serif;
89+
}
7690

7791
body {
78-
font-family: 'Gotham A','Gotham B',sans-serif;
92+
font-family: 'Gotham 4r', sans-serif;
7993
font-size: 14px;
8094
line-height: 22px;
81-
font-weight: 400;
95+
font-weight: normal;
8296
color: dimgray;
8397
margin: 0;
8498
}
@@ -127,6 +141,10 @@ td {
127141
padding: 15px;
128142
}
129143

144+
th a:link, th a:visited, th a:hover, th a:active {
145+
color: white;
146+
}
147+
130148
.narrow_hr {
131149
margin-top: 10px;
132150
margin-bottom: 10px;
@@ -156,6 +174,19 @@ td {
156174
border-top-right-radius: 4px;
157175
}
158176

177+
#petition_form a {
178+
font-family: 'Gotham 4r', sans-serif;
179+
}
180+
181+
#petition_form a:link, #petition_form a:visited {
182+
color: #dcdcdc;
183+
text-decoration: none;
184+
}
185+
#petition_form a:hover, #petition_form a:active {
186+
color: #fff;
187+
text-decoration: underline;
188+
}
189+
159190
#index #gap {
160191
height: 20px
161192
}
@@ -173,14 +204,16 @@ td {
173204
}
174205

175206
#index .count {
176-
color: white
207+
color: white;
208+
line-height: 1em;
177209
}
178210

179211
#index .beyond {
180212
color: white;
181213
}
182214

183215
#index .count h1 {
216+
font-family: 'Gotham 5r', sans-serif;
184217
color: white; font-size: 56px; line-height: 56px; font-weight: 500; margin: 0px;
185218
}
186219

@@ -192,12 +225,15 @@ td {
192225
}
193226

194227
#index .count h2 {
228+
font-family: 'Gotham 5r', sans-serif;
195229
color: white; font-size: 36px; line-height: 36px; font-weight: 600; margin-top:5px; margin-bottom: 0px;
196230
}
197231
#index .count h3 {
232+
font-family: 'Gotham 5r', sans-serif;
198233
color: white; font-size: 32px; line-height: 32px; font-weight: 400; margin-top:5px; margin-bottom:0px;
199234
}
200235
#index .count h4 {
236+
font-family: 'Gotham 5r', sans-serif;
201237
color: white; font-size: 26px; line-height: 26px; font-weight: 400; margin-top:15px;
202238
}
203239

@@ -221,7 +257,8 @@ td {
221257
}
222258

223259
#index #twentyhour #heading {
224-
font-size: 21px; font-weight:500; padding-bottom: 14px
260+
font-family: 'Gotham 5r', sans-serif;
261+
font-size: 21px; font-weight:normal; padding-bottom: 14px
225262
}
226263

227264
#index #twentyhour #text {
@@ -242,12 +279,12 @@ td {
242279

243280
.about_list_item_selected {
244281
color: #ff8a00;
245-
font-weight: bold;
282+
font-family: 'Gotham 7r', sans-serif;
246283
}
247284

248285
a.about_list_item {
249286
color: #999c9f;
250-
font-weight: 500;
287+
font-family: 'Gotham 5r', sans-serif;
251288
}
252289

253290
/* for learn.. */
@@ -381,7 +418,7 @@ button {
381418
color: rgb(255, 255, 255);
382419
cursor: pointer;
383420
display: inline-block;
384-
font-family: 'Gotham A', 'Gotham B', sans-serif;
421+
font-family: 'Gotham 4r', sans-serif;
385422
font-size: 14px;
386423
font-weight: normal;
387424
height: 34px;
@@ -448,7 +485,7 @@ button {
448485
a.lines_of_code_link {
449486
color:white;
450487
text-decoration:none;
451-
font-weight:400;
488+
font-family: 'Gotham 4r', sans-serif;
452489
}
453490

454491
#sitemap #box {
@@ -467,6 +504,6 @@ a.lines_of_code_link {
467504

468505
#sitemap #box a {
469506
color:white;
470-
font-weight:400;
507+
font-family: 'Gotham 4r', sans-serif;
471508
}
472509

pegasus/sites.v3/uk.code.org/styles/050-theme.css

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,18 @@ body {
5757
}
5858

5959

60-
.headerlink:link{
61-
color: white;
62-
font-size: 18px;
63-
font-weight: 300;
64-
margin-left: 40px;
65-
}
66-
60+
.headerlink:link,
6761
.headerlink:visited {
6862
color: white;
6963
font-size: 18px;
70-
font-weight: 300;
7164
margin-left: 40px;
65+
font-family: 'Gotham 4r', sans-serif;
7266
}
7367

7468
.headerlink:hover {
7569
color: white;
7670
font-size: 18px;
77-
font-weight: 300;
71+
font-family: 'Gotham 4r', sans-serif;
7872
text-decoration: none;
7973
border-bottom: solid 4px rgb(255, 138, 0);
8074
margin-left: 40px;
@@ -105,27 +99,27 @@ body {
10599
.whitefooterlink:link {
106100
color: white;
107101
font-size: 14px;
108-
font-weight: normal;
102+
font-family: 'Gotham 4r', sans-serif;
109103
}
110104

111105
.whitefooterlink:hover {
112106
color: white;
113107
font-size: 14px;
114-
font-weight: normal;
108+
font-family: 'Gotham 4r', sans-serif;
115109
}
116110

117111
.whitefooterlink:visited {
118112
color: white;
119113
font-size: 14px;
120-
font-weight: normal;
114+
font-family: 'Gotham 4r', sans-serif;
121115
}
122116

123117

124118
/* styling for the embedded dashboard components... */
125119

126120
a.user-menu-link {
127121
color:white;
128-
font-weight:400;
122+
font-family: 'Gotham 4r', sans-serif;
129123
padding-left:10px;
130124
}
131125

@@ -140,7 +134,7 @@ a.user-menu-link {
140134
margin-top:10px;
141135
margin-bottom:5px;
142136
font-size: 18px;
143-
font-weight: 500;
137+
font-family: 'Gotham 5r', sans-serif;
144138
}
145139

146140
#user_hero #continue_button {
@@ -152,19 +146,19 @@ a.user-menu-link {
152146
}
153147

154148
#user_hero #student_progress {
155-
font-weight: 500;
149+
font-family: 'Gotham 5r', sans-serif;
156150
width: 175px;
157151
display: inline-block;
158152
}
159153

160154
#user_hero #left_off {
161-
font-weight: 500;
155+
font-family: 'Gotham 5r', sans-serif;
162156
width: 175px;
163157
display: inline-block;
164158
}
165159

166160
#user_hero #classroom {
167-
font-weight: 500;
161+
font-family: 'Gotham 5r', sans-serif;
168162
font-size:16px;
169163
margin-top:10px;
170164
}
@@ -199,7 +193,7 @@ a.user-menu-link {
199193
color: rgb(255, 255, 255);
200194
cursor: pointer;
201195
display: inline-block;
202-
font-family: 'Gotham A', 'Gotham B', sans-serif;
196+
font-family: 'Gotham 4r', sans-serif;
203197
font-size: 14px;
204198
font-weight: normal;
205199
height: 35px;

0 commit comments

Comments
 (0)