Skip to content

Commit 92f19aa

Browse files
ajpianoajpiano
committed
All sites: Replace usage of Proxima Nova and Journal with Klavika
1 parent 4efd03f commit 92f19aa

File tree

3 files changed

+47
-74
lines changed

3 files changed

+47
-74
lines changed

‎themes/jquery.org/style.css

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ a,
6262
margin-top: -30px;
6363
height: auto;
6464
color: #007d88;
65-
font: 20px/40px Proxima-Nova;
66-
letter-spacing: -1px;
65+
font: bold 20px/40px "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
6766
}
6867

6968
#content > div.row {
@@ -128,22 +127,19 @@ ul.flex-direction-nav {
128127
}
129128

130129
.big-message {
131-
font: bold 50px/50px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
132-
letter-spacing: -1px;
130+
font: bold 50px/50px "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
133131
color: #ffffff !important;
134132
margin-top: 20px;
135133
}
136134

137135
#content .dark-callout-box h3 {
138-
font: bold 30px/50px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
139-
letter-spacing: -1px;
136+
font: bold 30px/50px "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
140137
color: #fff;
141138
}
142139

143140

144141
#content .dark-callout-box p {
145-
ont: bold 30px/50px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
146-
letter-spacing: 0px;
142+
ont: bold 30px/50px "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
147143
color: #dddcdc;
148144
}
149145

@@ -154,8 +150,7 @@ ul.flex-direction-nav {
154150
}
155151

156152
#content .project h4 {
157-
font: bold 24px/50px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
158-
letter-spacing: -1px;
153+
font: bold 24px/50px "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
159154
margin-bottom: 0;
160155
color: #464646;
161156

@@ -268,12 +263,12 @@ a.icon-search::before {
268263
padding-right: 15px;
269264
background: none;
270265
color: #f3f3f3;
271-
font-family: proxima-nova;
266+
font: bold "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;;
272267
}
273268

274269
.member-level p {
275270
color: #f3f3f3;
276-
font-family: proxima-nova;
271+
font: bold "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
277272
float: left;
278273
display: inline;
279274
padding-left: 15px;
@@ -305,8 +300,7 @@ a.icon-search::before {
305300
}
306301

307302
.choose-gifts h4 {
308-
font: bold 18px/20px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
309-
letter-spacing: -1px;
303+
font: bold 18px/20px "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
310304
margin-bottom: 10px;
311305
color: #ffffff;
312306
}
@@ -531,8 +525,7 @@ nav#main ul {
531525
text-align: center;
532526
height: auto;
533527
color: #007d88;
534-
font: 20px/26px Proxima-Nova;
535-
letter-spacing: -1px;
528+
font: 20px/26px "klavika-web";
536529
margin: -30px -40px 0;
537530
padding: 2% 10% 0.5%;
538531
}
@@ -614,23 +607,20 @@ nav#main ul {
614607
}
615608

616609
#content .dark-callout-box h3 {
617-
font: bold 28px/32px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
618-
letter-spacing: -1px;
610+
font: bold 28px/32px "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
619611
color: #fff;
620612
}
621613

622614

623615
#content .dark-callout-box p {
624616

625-
letter-spacing: 0px;
626617
color: #dddcdc;
627618
font-size: 14px;
628619
line-height: 18px;
629620
}
630621

631622
.big-message {
632-
font: bold 30px/30px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif !important;
633-
letter-spacing: -1px;
623+
font: bold 30px/30px "klavika-web", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif !important;
634624
color: #ffffff !important;
635625
margin-top: 20px;
636626
}

‎themes/jquery/css/base.css

Lines changed: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,6 @@ body {
104104
padding: 0.2em 0;
105105
}
106106

107-
@font-face {
108-
font-family: 'JournalRegular';
109-
src: url('fonts/journal-webfont.eot');
110-
src: url('fonts/journal-webfont.eot?#iefix') format('embedded-opentype'),
111-
url('fonts/journal-webfont.woff') format('woff'),
112-
url('fonts/journal-webfont.ttf') format('truetype'),
113-
url('fonts/journal-webfont.svg#JournalRegular') format('svg');
114-
font-weight: normal;
115-
font-style: normal;
116-
}
117-
118107
@font-face {
119108
font-family: "FontAwesome";
120109
src: url('fonts/fontawesome-webfont.eot');
@@ -184,6 +173,10 @@ h6 {
184173
margin: 0 0 2.33em;
185174
}
186175

176+
h1, h2, h3, h4, h5, h6 {
177+
font-weight: 700;
178+
font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif !important;
179+
}
187180
/*
188181
* Addresses styling not present in IE 7/8/9, Safari 5, and Chrome.
189182
*/
@@ -1069,7 +1062,7 @@ iframe {
10691062
}
10701063

10711064
#global-nav nav ul li {
1072-
font: bold 13px/17px sans-serif;
1065+
font: bold 13px/17px "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
10731066
display: inline-block;
10741067
float: left;
10751068
position: relative;
@@ -1364,7 +1357,8 @@ nav#main li {
13641357
display: inline;
13651358
text-transform: uppercase;
13661359
float: left;
1367-
font: normal normal 13px "Proxima-Nova", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1360+
font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
1361+
font-weight: 700;
13681362
margin-right: 10px;
13691363
}
13701364

@@ -1543,7 +1537,7 @@ pre b {
15431537
}
15441538

15451539
#content blockquote p {
1546-
font: italic normal 23px/26px "Proxima-Nova", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1540+
font: italic normal 23px/26px "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
15471541
color: #828282;
15481542
margin-left: 0;
15491543
margin-bottom: 0;
@@ -1604,7 +1598,7 @@ pre b {
16041598
height: 19px;
16051599
width: 19px;
16061600
padding-top: 0px;
1607-
font: bold 11px/19px "Proxima-Nova", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1601+
font: bold 11px/19px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
16081602
border-radius: 12px;
16091603
}
16101604

@@ -1688,7 +1682,7 @@ pre b {
16881682

16891683
#content figcaption {
16901684
box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.20);
1691-
font: italic 500 12px/20px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1685+
font: italic 700 12px/20px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
16921686
padding-left: 10px;
16931687
padding-right: 10px;
16941688
padding-top: 5px;
@@ -1734,22 +1728,21 @@ pre b {
17341728
}
17351729

17361730
#content h1 {
1737-
font: normal 36px/36px "Proxima-Nova", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1738-
letter-spacing: -1px;
1731+
font: 700 normal 36px/36px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
17391732
}
17401733

17411734
.content-full #content h1 {
17421735
text-align: center;
17431736
}
17441737

17451738
#content h2 {
1746-
font: normal 24px/24px "Proxima-Nova", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1739+
font: 700 24px/24px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
17471740
color: #333;
17481741
margin-bottom: 10px;
17491742
}
17501743

17511744
#content h3 {
1752-
font: normal normal 20px/20px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1745+
font: 700 normal 20px/20px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
17531746
color: #666;
17541747
margin-bottom: 10px;
17551748
margin-top: 12px;
@@ -1764,7 +1757,8 @@ pre b {
17641757

17651758
p.author {
17661759
color: #ababab;
1767-
font-family: Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1760+
font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
1761+
font-weight: 700;
17681762
margin-top: -20px;
17691763
}
17701764

@@ -1776,7 +1770,7 @@ p.author a {
17761770
padding: 2%;
17771771
padding-bottom: .5%;
17781772
margin-bottom: 20px;
1779-
font-family: Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1773+
font: 700 "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
17801774
color: #666;
17811775
background: url(../images-foundation/gauze.png) #f0f0f0;
17821776
text-shadow: 0 1px 0 #ffffff;
@@ -1799,21 +1793,15 @@ p.author a {
17991793
}
18001794

18011795
#banner-large-image h1, #banner-large-image h2 {
1802-
font: bold 60px/60px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1803-
letter-spacing: -1px;
1796+
font: bold 60px/60px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
18041797
margin-bottom: 0;
18051798
color: #fff;
18061799
text-shadow: 0 0 4px rgba(0, 0, 0, 0.85);
18071800
}
18081801

18091802
#banner-large-image p {
18101803
color: #CCCCCC;
1811-
font: 24px/36px Proxima-Nova;
1812-
letter-spacing: -1px;
1813-
}
1814-
1815-
#banner h3 {
1816-
font-family: "JournalRegular", Georgia, "Times New Roman", Times, serif;
1804+
font: 700 normal 24px/36px "klavika-web", "Helvetica Neue", sans-serif
18171805
}
18181806

18191807
#banner-secondary {
@@ -1827,17 +1815,15 @@ p.author a {
18271815

18281816
#banner-secondary h2,
18291817
#banner-secondary h1 {
1830-
font: bold 45px/50px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1831-
letter-spacing: -1px;
1818+
font: 45px/50px;
18321819
margin-bottom: 0;
18331820
color: #fff;
18341821
text-shadow: 0 0 4px rgba(0, 0, 0, 0.85);
18351822
}
18361823

18371824
#banner-secondary p {
18381825
color: #ccc;
1839-
font: 26px/26px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1840-
letter-spacing: -1px;
1826+
font: 22px/26px "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
18411827
padding-left: 15%;
18421828
padding-right: 15%;
18431829
}
@@ -1889,7 +1875,7 @@ input[type="submit"] {
18891875
color: #fff !important;
18901876
text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.35);
18911877
padding: 8px 15px;
1892-
font: bold 16px/16px "proxima-nova", "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1878+
font: bold 16px/16px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
18931879
-webkit-transition: all 0.2s;
18941880
transition: all 0.2s;
18951881
background-color: #d18f4f;
@@ -1929,7 +1915,7 @@ input[type="submit"].dark:hover {
19291915
========================================================================== */
19301916

19311917
#sidebar h3 {
1932-
font: normal normal 20px/18px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
1918+
font: 20px/18px;
19331919
background-image: -webkit-gradient(linear, left bottom, right bottom, from(#efefef), to(#f3f3f3));
19341920
background-image: -moz-linear-gradient(360deg, #efefef 0%, #f3f3f3 100%);
19351921
margin-left: -35px;
@@ -2024,7 +2010,7 @@ footer .cdn strong {
20242010
background-image: -webkit-linear-gradient(#7a7a7a, #5e5e5e); /* Chrome 10+, Saf6 */
20252011
background-image: linear-gradient(top, #7a7a7a, #5e5e5e);
20262012
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#7a7a7a', EndColorStr='#5e5e5e'); /* IE6–IE9 */
2027-
font-family: Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
2013+
font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
20282014
}
20292015

20302016
footer .cdn strong:after {
@@ -2155,7 +2141,7 @@ footer h3 {
21552141
text-align: center;
21562142
height: 10px;
21572143
margin-top: 20px;
2158-
font: normal 14px Proxima-Nova, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
2144+
font-size: 16px;
21592145
}
21602146

21612147
footer h3 span {

0 commit comments

Comments
 (0)