Skip to content

Commit 6d9867f

Browse files
author
Kristan Kenney
committed
Change font to Exo and update path for Inconsolata
1 parent abe9301 commit 6d9867f

File tree

57 files changed

+62
-134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+62
-134
lines changed

web/css/styles.min.css

Lines changed: 62 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -141,185 +141,113 @@
141141
*/
142142

143143
/* ==========================================================================
144-
Define Exo 2 font family
144+
Define Exo font family
145145
========================================================================== */
146-
/* exo-2-100 - latin */
146+
/* exo-300 - latin-ext_latin */
147147
@font-face {
148-
font-family: 'Exo 2';
149-
font-style: normal;
150-
font-weight: 100;
151-
src: local('Exo 2 Thin'), local('Exo2-Thin'),
152-
url('../webfonts/exo-2-v5-latin-100.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
153-
url('../webfonts/exo-2-v5-latin-100.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
154-
}
155-
/* exo-2-100italic - latin */
156-
@font-face {
157-
font-family: 'Exo 2';
158-
font-style: italic;
159-
font-weight: 100;
160-
src: local('Exo 2 Thin Italic'), local('Exo2-ThinItalic'),
161-
url('../webfonts/exo-2-v5-latin-100italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
162-
url('../webfonts/exo-2-v5-latin-100italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
163-
}
164-
/* exo-2-200 - latin */
165-
@font-face {
166-
font-family: 'Exo 2';
167-
font-style: normal;
168-
font-weight: 200;
169-
src: local('Exo 2 Extra Light'), local('Exo2-ExtraLight'),
170-
url('../webfonts/exo-2-v5-latin-200.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
171-
url('../webfonts/exo-2-v5-latin-200.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
172-
}
173-
/* exo-2-200italic - latin */
174-
@font-face {
175-
font-family: 'Exo 2';
176-
font-style: italic;
177-
font-weight: 200;
178-
src: local('Exo 2 Extra Light Italic'), local('Exo2-ExtraLightItalic'),
179-
url('../webfonts/exo-2-v5-latin-200italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
180-
url('../webfonts/exo-2-v5-latin-200italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
181-
}
182-
/* exo-2-300 - latin */
183-
@font-face {
184-
font-family: 'Exo 2';
148+
font-family: 'Exo';
185149
font-style: normal;
186150
font-weight: 300;
187-
src: local('Exo 2 Light'), local('Exo2-Light'),
188-
url('../webfonts/exo-2-v5-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
189-
url('../webfonts/exo-2-v5-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
151+
src: local('Exo Light'), local('Exo-Light'),
152+
url('../webfonts/exo-v8-latin-ext_latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
153+
url('../webfonts/exo-v8-latin-ext_latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
190154
}
191-
/* exo-2-300italic - latin */
155+
/* exo-300italic - latin-ext_latin */
192156
@font-face {
193-
font-family: 'Exo 2';
157+
font-family: 'Exo';
194158
font-style: italic;
195159
font-weight: 300;
196-
src: local('Exo 2 Light Italic'), local('Exo2-LightItalic'),
197-
url('../webfonts/exo-2-v5-latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
198-
url('../webfonts/exo-2-v5-latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
160+
src: local('Exo Light Italic'), local('Exo-LightItalic'),
161+
url('../webfonts/exo-v8-latin-ext_latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
162+
url('../webfonts/exo-v8-latin-ext_latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
199163
}
200-
/* exo-2-regular - latin */
164+
/* exo-regular - latin-ext_latin */
201165
@font-face {
202-
font-family: 'Exo 2';
166+
font-family: 'Exo';
203167
font-style: normal;
204168
font-weight: 400;
205-
src: local('Exo 2'), local('Exo2-Regular'),
206-
url('../webfonts/exo-2-v5-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
207-
url('../webfonts/exo-2-v5-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
169+
src: local('Exo Regular'), local('Exo-Regular'),
170+
url('../webfonts/exo-v8-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
171+
url('../webfonts/exo-v8-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
208172
}
209-
/* exo-2-italic - latin */
173+
/* exo-italic - latin-ext_latin */
210174
@font-face {
211-
font-family: 'Exo 2';
175+
font-family: 'Exo';
212176
font-style: italic;
213177
font-weight: 400;
214-
src: local('Exo 2 Italic'), local('Exo2-Italic'),
215-
url('../webfonts/exo-2-v5-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
216-
url('../webfonts/exo-2-v5-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
178+
src: local('Exo Italic'), local('Exo-Italic'),
179+
url('../webfonts/exo-v8-latin-ext_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
180+
url('../webfonts/exo-v8-latin-ext_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
217181
}
218-
/* exo-2-500 - latin */
182+
/* exo-500 - latin-ext_latin */
219183
@font-face {
220-
font-family: 'Exo 2';
184+
font-family: 'Exo';
221185
font-style: normal;
222186
font-weight: 500;
223-
src: local('Exo 2 Medium'), local('Exo2-Medium'),
224-
url('../webfonts/exo-2-v5-latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
225-
url('../webfonts/exo-2-v5-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
187+
src: local('Exo Medium'), local('Exo-Medium'),
188+
url('../webfonts/exo-v8-latin-ext_latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
189+
url('../webfonts/exo-v8-latin-ext_latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
226190
}
227-
/* exo-2-500italic - latin */
191+
/* exo-500italic - latin-ext_latin */
228192
@font-face {
229-
font-family: 'Exo 2';
193+
font-family: 'Exo';
230194
font-style: italic;
231195
font-weight: 500;
232-
src: local('Exo 2 Medium Italic'), local('Exo2-MediumItalic'),
233-
url('../webfonts/exo-2-v5-latin-500italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
234-
url('../webfonts/exo-2-v5-latin-500italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
196+
src: local('Exo Medium Italic'), local('Exo-MediumItalic'),
197+
url('../webfonts/exo-v8-latin-ext_latin-500italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
198+
url('../webfonts/exo-v8-latin-ext_latin-500italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
235199
}
236-
/* exo-2-600 - latin */
200+
/* exo-600 - latin-ext_latin */
237201
@font-face {
238-
font-family: 'Exo 2';
202+
font-family: 'Exo';
239203
font-style: normal;
240204
font-weight: 600;
241-
src: local('Exo 2 Semi Bold'), local('Exo2-SemiBold'),
242-
url('../webfonts/exo-2-v5-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
243-
url('../webfonts/exo-2-v5-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
205+
src: local('Exo SemiBold'), local('Exo-SemiBold'),
206+
url('../webfonts/exo-v8-latin-ext_latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
207+
url('../webfonts/exo-v8-latin-ext_latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
244208
}
245-
/* exo-2-600italic - latin */
209+
/* exo-600italic - latin-ext_latin */
246210
@font-face {
247-
font-family: 'Exo 2';
211+
font-family: 'Exo';
248212
font-style: italic;
249213
font-weight: 600;
250-
src: local('Exo 2 Semi Bold Italic'), local('Exo2-SemiBoldItalic'),
251-
url('../webfonts/exo-2-v5-latin-600italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
252-
url('../webfonts/exo-2-v5-latin-600italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
214+
src: local('Exo SemiBold Italic'), local('Exo-SemiBoldItalic'),
215+
url('../webfonts/exo-v8-latin-ext_latin-600italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
216+
url('../webfonts/exo-v8-latin-ext_latin-600italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
253217
}
254-
/* exo-2-700 - latin */
218+
/* exo-700 - latin-ext_latin */
255219
@font-face {
256-
font-family: 'Exo 2';
220+
font-family: 'Exo';
257221
font-style: normal;
258222
font-weight: 700;
259-
src: local('Exo 2 Bold'), local('Exo2-Bold'),
260-
url('../webfonts/exo-2-v5-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
261-
url('../webfonts/exo-2-v5-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
223+
src: local('Exo Bold'), local('Exo-Bold'),
224+
url('../webfonts/exo-v8-latin-ext_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
225+
url('../webfonts/exo-v8-latin-ext_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
262226
}
263-
/* exo-2-700italic - latin */
227+
/* exo-700italic - latin-ext_latin */
264228
@font-face {
265-
font-family: 'Exo 2';
229+
font-family: 'Exo';
266230
font-style: italic;
267231
font-weight: 700;
268-
src: local('Exo 2 Bold Italic'), local('Exo2-BoldItalic'),
269-
url('../webfonts/exo-2-v5-latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
270-
url('../webfonts/exo-2-v5-latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
271-
}
272-
/* exo-2-800 - latin */
273-
@font-face {
274-
font-family: 'Exo 2';
275-
font-style: normal;
276-
font-weight: 800;
277-
src: local('Exo 2 Extra Bold'), local('Exo2-ExtraBold'),
278-
url('../webfonts/exo-2-v5-latin-800.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
279-
url('../webfonts/exo-2-v5-latin-800.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
280-
}
281-
/* exo-2-800italic - latin */
282-
@font-face {
283-
font-family: 'Exo 2';
284-
font-style: italic;
285-
font-weight: 800;
286-
src: local('Exo 2 Extra Bold Italic'), local('Exo2-ExtraBoldItalic'),
287-
url('../webfonts/exo-2-v5-latin-800italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
288-
url('../webfonts/exo-2-v5-latin-800italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
289-
}
290-
/* exo-2-900 - latin */
291-
@font-face {
292-
font-family: 'Exo 2';
293-
font-style: normal;
294-
font-weight: 900;
295-
src: local('Exo 2 Black'), local('Exo2-Black'),
296-
url('../webfonts/exo-2-v5-latin-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
297-
url('../webfonts/exo-2-v5-latin-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
298-
}
299-
/* exo-2-900italic - latin */
300-
@font-face {
301-
font-family: 'Exo 2';
302-
font-style: italic;
303-
font-weight: 900;
304-
src: local('Exo 2 Black Italic'), local('Exo2-BlackItalic'),
305-
url('../webfonts/exo-2-v5-latin-900italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
306-
url('../webfonts/exo-2-v5-latin-900italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
232+
src: local('Exo Bold Italic'), local('Exo-BoldItalic'),
233+
url('../webfonts/exo-v8-latin-ext_latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
234+
url('../webfonts/exo-v8-latin-ext_latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
307235
}
308236
/* inconsolata-bold - latin */
309237
@font-face {
310238
font-family: 'Inconsolata';
311239
src: local('Inconsolata Bold'), local('Inconsolata-Bold'),
312-
url('hinted-Inconsolata-Bold.woff2') format('woff2'),
313-
url('hinted-Inconsolata-Bold.woff') format('woff');
240+
url('../webfonts/hinted-Inconsolata-Bold.woff2') format('woff2'),
241+
url('../webfonts/hinted-Inconsolata-Bold.woff') format('woff');
314242
font-weight: bold;
315243
font-style: normal;
316244
}
317245
/* inconsolata - latin */
318246
@font-face {
319247
font-family: 'Inconsolata';
320248
src: local('Inconsolata Regular'), local('Inconsolata-Regular'),
321-
url('hinted-Inconsolata-Regular.woff2') format('woff2'),
322-
url('hinted-Inconsolata-Regular.woff') format('woff');
249+
url('../webfonts/hinted-Inconsolata-Regular.woff2') format('woff2'),
250+
url('../webfonts/hinted-Inconsolata-Regular.woff') format('woff');
323251
font-weight: normal;
324252
font-style: normal;
325253
}
@@ -758,7 +686,7 @@ html {
758686
}
759687

760688
body {
761-
font-family: 'Exo 2', Arial;
689+
font-family: 'Exo', Arial;
762690
overflow-x: hidden;
763691
font-size: 0.9rem;
764692
height: 100%;
@@ -2419,7 +2347,7 @@ label:hover {
24192347
border: 1px solid #cfcfcf;
24202348
border-radius: 4px;
24212349
color: #4e4e4e;
2422-
font-family: 'Exo 2', Arial, Arial, Helvetica, sans-serif;
2350+
font-family: 'Exo', Arial, Arial, Helvetica, sans-serif;
24232351
font-size: 0.8rem;
24242352
height: 20px;
24252353
margin: 2px 6px 0 0;
@@ -2459,7 +2387,7 @@ label:hover {
24592387
border: 1px solid #ccc;
24602388
border-radius: 4px;
24612389
color: #4e4e4e;
2462-
font-family: 'Exo 2', Arial, Helvetica,sans-serif;
2390+
font-family: 'Exo', Arial, Helvetica,sans-serif;
24632391
font-size: 0.8rem;
24642392
font-weight: normal;
24652393
height: 36px;
@@ -2551,7 +2479,7 @@ a.vst-text:active b{
25512479
padding: 5px;
25522480
width: 560px;
25532481
height: 60px;
2554-
font-family: 'Exo 2', Arial, Helvetica, sans-serif;
2482+
font-family: 'Exo', Arial, Helvetica, sans-serif;
25552483
padding: 7px 1px 3px 14px;
25562484
font-weight: normal;
25572485
box-shadow: 0px 1px 4px rgba(0,0,0,0.15);
@@ -2952,7 +2880,7 @@ a.button.cancel {
29522880
.login {
29532881
background-color: #fff;
29542882
box-shadow: 0px 8px 30px rgba(49,98,153, 0.75);
2955-
font-family: 'Exo 2', Tahoma, Arial, Helvetica, sans-serif;
2883+
font-family: 'Exo', Tahoma, Arial, Helvetica, sans-serif;
29562884
margin: 0;
29572885
padding: 0;
29582886
text-align: left;
@@ -3525,7 +3453,7 @@ form#vstobjects.suspended {
35253453
}
35263454

35273455
.ui-dialog {
3528-
font-family: 'Exo 2', Arial, Helvetica, sans-serif !important;
3456+
font-family: 'Exo', Arial, Helvetica, sans-serif !important;
35293457
font-weight: 500 !important;
35303458
background-color: rgba(245,245,245,0.87) !important;
35313459
box-shadow: 0 8px 50px 0 rgba(0, 0, 0, 0.55) !important;
@@ -3583,7 +3511,7 @@ form#vstobjects.suspended {
35833511
.cron-helper-tabs {
35843512
/* margin-top: 30px;*/
35853513
border: none !important;
3586-
font-family: 'Exo 2', Arial, Helvetica, sans-serif !important;
3514+
font-family: 'Exo', Arial, Helvetica, sans-serif !important;
35873515
}
35883516

35893517
.cron-helper-tabs a {
-22.4 KB
Binary file not shown.
-18.1 KB
Binary file not shown.
-23.5 KB
Binary file not shown.
-19.5 KB
Binary file not shown.
-23.7 KB
Binary file not shown.
-19.5 KB
Binary file not shown.
-24.4 KB
Binary file not shown.
-20.4 KB
Binary file not shown.
-23.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)