Skip to content

Commit 17df68b

Browse files
lmccartlmccart
committed
replacing avenir with montserrat
1 parent f548b75 commit 17df68b

File tree

12 files changed

+48
-2098
lines changed

12 files changed

+48
-2098
lines changed

‎src/assets/css/fonts/AvenirNextLTW01-Medium.eot

-39 KB
Binary file not shown.

‎src/assets/css/fonts/AvenirNextLTW01-Medium.svg

Lines changed: 0 additions & 2017 deletions
This file was deleted.

‎src/assets/css/fonts/AvenirNextLTW01-Medium.ttf

-96.5 KB
Binary file not shown.

‎src/assets/css/fonts/AvenirNextLTW01-Medium.woff

-43.2 KB
Binary file not shown.

‎src/assets/css/main.css

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
pointer-events: all !important;
2929
}
3030

31+
#home .button_box a {
32+
color: #ED225D !important;
33+
}
34+
35+
36+
#home .button_box a:hover {
37+
color: #FFFFFF !important;
38+
}
39+
40+
3141
#lockup>a {
3242
position: relative;
3343
display: block;
@@ -43,7 +53,7 @@
4353
#menu.top_menu,
4454
#menu {
4555
list-style: none;
46-
font-family: "AvenirNextLTW01-Medium";
56+
font-family: "Montserrat", sans-serif;
4757
width: 100%;
4858
margin: 0 0 1em 0;
4959
padding: 0;
@@ -80,7 +90,7 @@
8090
left: 0;
8191
z-index: 2;
8292
padding: 1em;
83-
font-size: 0.75em;
93+
font-size: 0.7em;
8494
}
8595

8696
.focus {
@@ -111,7 +121,7 @@
111121
padding: 0.4em 0.6em;
112122
margin: 0.5em 0;
113123
color: #333 !important;
114-
font-family: AvenirNextLTW01-Medium;
124+
font-family: "Montserrat", sans-serif;
115125
display: inline-block;
116126
}
117127

@@ -156,7 +166,7 @@
156166
border-bottom: 0.09em dashed;
157167
border-bottom-color: #ED225D;
158168
line-height: 1.2;
159-
font-family: AvenirNextLTW01-Medium;
169+
font-family: "Montserrat", sans-serif;
160170
display: block;
161171
}
162172

@@ -292,7 +302,7 @@
292302

293303
.reference-group h3 {
294304
font-size: 1em;
295-
font-family: "AvenirNextLTW01-Medium";
305+
font-family: "Montserrat", sans-serif;
296306
margin-top: 0.5em;
297307
}
298308

@@ -425,7 +435,7 @@ pre.norender {
425435
}
426436

427437
.edit_space button {
428-
font-family: "AvenirNextLTW01-Medium";
438+
font-family: "Montserrat", sans-serif;
429439
font-size: 1em;
430440
color: #ccc;
431441
border: 1px solid rgba(200, 200, 200, .15);
@@ -453,7 +463,7 @@ pre.norender {
453463

454464
.display_button {
455465
margin-bottom: 2em;
456-
font-family: "AvenirNextLTW01-Medium";
466+
font-family: "Montserrat", sans-serif;
457467
font-size: 1em;
458468
color: #2D7BB6;
459469
border: 1px solid rgba(45, 123, 182, .25);
@@ -480,7 +490,7 @@ form {
480490
#search input[type="text"],
481491
#search input[type="search"] {
482492
border: 1px solid rgba(200, 200, 200, .5);
483-
font-family: "AvenirNextLTW01-Medium";
493+
font-family: "Montserrat", sans-serif;
484494
font-size: 2.25em;
485495
width: 9.75em;
486496
}
@@ -696,7 +706,7 @@ textarea {
696706
*/
697707

698708
.contribute-form {
699-
font-family: "AvenirNextLTW01-Medium";
709+
font-family: "Montserrat", sans-serif;
700710
}
701711

702712
.contribute-form input,
@@ -1077,21 +1087,6 @@ img.gallery-img {
10771087
========================================================================== */
10781088

10791089

1080-
/*
1081-
font-family:'AvenirNextLTW01-Medium';
1082-
*/
1083-
1084-
1085-
/* while local dev */
1086-
1087-
@font-face {
1088-
font-family: "AvenirNextLTW01-Medium";
1089-
src: url("fonts/AvenirNextLTW01-Medium.eot?#iefix");
1090-
src: url("fonts/AvenirNextLTW01-Medium.eot?#iefix") format("eot"), url("fonts/AvenirNextLTW01-Medium.woff") format("woff"), url("fonts/AvenirNextLTW01-Medium.ttf") format("truetype"), url("fonts/AvenirNextLTW01-Medium.svg#a89d6ad1-a04f-4a8f-b140-e55478dbea80") format("svg");
1091-
font-weight: normal;
1092-
font-style: normal;
1093-
}
1094-
10951090

10961091
/* always */
10971092

@@ -1116,13 +1111,12 @@ img.gallery-img {
11161111

11171112
html {
11181113
font-size: 1.25em;
1119-
/* 1.25em ~ 20px if times, 1.0em if body text is avenir */
11201114
}
11211115

11221116
body {
11231117
margin: 0;
11241118
background-color: #fff;
1125-
font-family: times;
1119+
font-family: "Times";
11261120
font-weight: 400;
11271121
line-height: 1.45;
11281122
color: #333;
@@ -1210,7 +1204,7 @@ h5 {
12101204
margin: 1.414em 0 0.5em 0;
12111205
font-weight: inherit;
12121206
line-height: 1.2;
1213-
font-family: "AvenirNextLTW01-Medium";
1207+
font-family: "Montserrat", sans-serif;
12141208
}
12151209

12161210
h1 {
@@ -1231,7 +1225,7 @@ h2 {
12311225

12321226
#backlink {
12331227
margin: 1.2em 0.444em 0 0;
1234-
font: 1em AvenirNextLTW01-Medium;
1228+
font-family: "Montserrat", sans-serif;
12351229
float: right;
12361230
}
12371231

@@ -1312,7 +1306,7 @@ h2 {
13121306
margin: 0;
13131307
color: #333;
13141308
border: 1px solid #3796D1;
1315-
font-family: times !important;
1309+
font-family: "Roboto" !important;
13161310
font-weight: 400;
13171311
font-size: 1em;
13181312
transition: width 100ms;
@@ -1443,7 +1437,8 @@ p+img {
14431437

14441438
#lockup p {
14451439
color: #ED225D;
1446-
font: 0.75em "AvenirNextLTW01-Medium";
1440+
font-size: 0.7em;
1441+
font-family: "Montserrat", sans-serif;
14471442
margin: 0.5em 0 0 8.5em;
14481443
}
14491444

@@ -1460,7 +1455,8 @@ p+img {
14601455
.caption span,
14611456
.caption p {
14621457
text-align: right;
1463-
font: 0.75em "AvenirNextLTW01-Medium";
1458+
font-size: 0.7em;
1459+
font-family: "Montserrat", sans-serif;
14641460
padding-top: 0.25em;
14651461
}
14661462

@@ -1654,7 +1650,7 @@ footer {
16541650
.small,
16551651
footer,
16561652
#family {
1657-
font-size: 0.75em;
1653+
font-size: 0.7em;
16581654
}
16591655
footer {
16601656
clear: both;
@@ -1666,11 +1662,11 @@ footer {
16661662
right: 1em;
16671663
}
16681664
#i18n-btn a {
1669-
font-family: "AvenirNextLTW01-Medium";
1665+
font-family: "Montserrat", sans-serif;
16701666
}
16711667
#menu {
16721668
list-style: none;
1673-
font-family: "AvenirNextLTW01-Medium";
1669+
font-family: "Montserrat", sans-serif;
16741670
margin: 0 0.75em 0 -1.85em;
16751671
/* margin-right: 0.75em; */
16761672
width: 7.3em;
@@ -1679,7 +1675,7 @@ footer {
16791675
border-top: transparent;
16801676
border-bottom: transparent;
16811677
padding: 0;
1682-
font-size: 0.92em;
1678+
font-size: 0.83em;
16831679
z-index: 100;
16841680
position: relative;
16851681
top: 0;
@@ -1723,7 +1719,7 @@ footer {
17231719
margin-bottom: 0.25em;
17241720
}
17251721
.book {
1726-
font-size: 0.75em;
1722+
font-size: 0.7em;
17271723
}
17281724
.column_0,
17291725
.column_1,
@@ -1742,7 +1738,7 @@ footer {
17421738
}
17431739

17441740
#collection-list-categories {
1745-
font-family: "AvenirNextLTW01-Medium";
1741+
font-family: "Montserrat", sans-serif;
17461742
display: flex;
17471743
flex-direction: row;
17481744
margin: 1em 0 1.5em 0;
@@ -1790,7 +1786,7 @@ footer {
17901786
#i18n-btn {
17911787
position: absolute;
17921788
top: 0.5em;
1793-
right: 0.75em;
1789+
right: 0.7em;
17941790
}
17951791

17961792
#search {
@@ -1938,7 +1934,7 @@ iframe {
19381934
border: none !important;
19391935
outline: none !important;
19401936
background: none !important;
1941-
font-size: 0.75em;
1937+
font-size: 0.7em;
19421938
color: #ABABAB;
19431939
cursor: pointer !important;
19441940
z-index: 5;

‎src/assets/learn/performance/code/p5/p5.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20508,7 +20508,7 @@ p5._getDecrementPreload = function () {
2050820508
* <div><code>
2050920509
* var myFont;
2051020510
* function preload() {
20511-
* myFont = loadFont('assets/AvenirNextLTPro-Demi.otf');
20511+
* myFont = loadFont('assets/inconsolata.otf');
2051220512
* }
2051320513
*
2051420514
* function setup() {
@@ -20524,7 +20524,7 @@ p5._getDecrementPreload = function () {
2052420524
*
2052520525
* <div><code>
2052620526
* function setup() {
20527-
* loadFont('assets/AvenirNextLTPro-Demi.otf', drawText);
20527+
* loadFont('assets/inconsolata.otf', drawText);
2052820528
* }
2052920529
*
2053020530
* function drawText(font) {

‎src/assets/p5_featured/LeslieRuckman_RainbowPixelGrow/libraries/p5.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20631,7 +20631,7 @@ _dereq_('../core/error_helpers');
2063120631
* <div><code>
2063220632
* var myFont;
2063320633
* function preload() {
20634-
* myFont = loadFont('assets/AvenirNextLTPro-Demi.otf');
20634+
* myFont = loadFont('assets/inconsolata.otf');
2063520635
* }
2063620636
*
2063720637
* function setup() {
@@ -20647,7 +20647,7 @@ _dereq_('../core/error_helpers');
2064720647
*
2064820648
* <div><code>
2064920649
* function setup() {
20650-
* loadFont('assets/AvenirNextLTPro-Demi.otf', drawText);
20650+
* loadFont('assets/inconsolata.otf', drawText);
2065120651
* }
2065220652
*
2065320653
* function drawText(font) {

‎src/assets/p5_featured/fengyizhu_points/p5.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21106,7 +21106,7 @@ p5._getDecrementPreload = function() {
2110621106
* <div><code>
2110721107
* var myFont;
2110821108
* function preload() {
21109-
* myFont = loadFont('assets/AvenirNextLTPro-Demi.otf');
21109+
* myFont = loadFont('assets/inconsolata.otf');
2111021110
* }
2111121111
*
2111221112
* function setup() {
@@ -21122,7 +21122,7 @@ p5._getDecrementPreload = function() {
2112221122
*
2112321123
* <div><code>
2112421124
* function setup() {
21125-
* loadFont('assets/AvenirNextLTPro-Demi.otf', drawText);
21125+
* loadFont('assets/inconsolata.otf', drawText);
2112621126
* }
2112721127
*
2112821128
* function drawText(font) {

‎src/assets/p5_featured/kevin_3d/p5.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20957,7 +20957,7 @@ _dereq_('../core/error_helpers');
2095720957
* <div><code>
2095820958
* var myFont;
2095920959
* function preload() {
20960-
* myFont = loadFont('assets/AvenirNextLTPro-Demi.otf');
20960+
* myFont = loadFont('assets/inconsolata.otf');
2096120961
* }
2096220962
*
2096320963
* function setup() {
@@ -20973,7 +20973,7 @@ _dereq_('../core/error_helpers');
2097320973
*
2097420974
* <div><code>
2097520975
* function setup() {
20976-
* loadFont('assets/AvenirNextLTPro-Demi.otf', drawText);
20976+
* loadFont('assets/inconsolata.otf', drawText);
2097720977
* }
2097820978
*
2097920979
* function drawText(font) {

‎src/assets/p5_featured/naomichan/libraries/p5.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19924,7 +19924,7 @@ p5._getDecrementPreload = function () {
1992419924
* <div><code>
1992519925
* var myFont;
1992619926
* function preload() {
19927-
* myFont = loadFont('assets/AvenirNextLTPro-Demi.otf');
19927+
* myFont = loadFont('assets/inconsolata.otf');
1992819928
* }
1992919929
*
1993019930
* function setup() {
@@ -19940,7 +19940,7 @@ p5._getDecrementPreload = function () {
1994019940
*
1994119941
* <div><code>
1994219942
* function setup() {
19943-
* loadFont('assets/AvenirNextLTPro-Demi.otf', drawText);
19943+
* loadFont('assets/inconsolata.otf', drawText);
1994419944
* }
1994519945
*
1994619946
* function drawText(font) {

0 commit comments

Comments
 (0)