diff --git a/themes/jquery/css/base.css b/themes/jquery/css/base.css
index f8631a97..045b6e5c 100644
--- a/themes/jquery/css/base.css
+++ b/themes/jquery/css/base.css
@@ -1,7 +1,7 @@
/*! Copyright jQuery Foundation and other contributors
* Includes:
* - normalize.css v1.0.1 | MIT License | git.io/normalize
- * - Font Awesome - http://fortawesome.github.com/Font-Awesome - CC BY 3.0
+ * - Font Awesome - https://fortawesome.github.com/Font-Awesome - CC BY 3.0
*/
/* ==========================================================================
@@ -111,12 +111,16 @@ body {
padding: 0.2em 0;
}
+/* ==========================================================================
+ FontAwesome (https://fortawesome.github.com/Font-Awesome)
+ .ttf and .woff files were included in the FontAwesome download.
+ .woff2 file created with https://github.com/nfroidure/ttf2woff2
+ ========================================================================== */
+
@font-face {
- font-family: 'FontAwesome';
- src: url('fonts/fontawesome-webfont.eot?v=3.0.2');
- src: url('fonts/fontawesome-webfont.eot?#iefix&v=3.0.2') format('embedded-opentype'),
- url('fonts/fontawesome-webfont.woff?v=3.0.2') format('woff'),
- url('fonts/fontawesome-webfont.ttf?v=3.0.2') format('truetype');
+ font-family: "FontAwesome";
+ src: url("fonts/FontAwesome/fontawesome-webfont.woff2") format("woff2"),
+ url("fonts/FontAwesome/fontawesome-webfont.woff") format("woff");
font-weight: normal;
font-style: normal;
}
@@ -184,7 +188,7 @@ h6 {
h1, h2, h3, h4, h5, h6 {
font-weight: 700;
- font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif !important;
+ font-family: Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif !important;
}
/*
* Addresses styling not present in IE 7/8/9, Safari 5, and Chrome.
@@ -676,7 +680,7 @@ table {
}
#content th {
- font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font-family: Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
}
#content th,
@@ -684,6 +688,27 @@ table {
padding: .5em;
}
+/* ==========================================================================
+ Cairo Font (https://github.com/Gue3bara/Cairo)
+ .ttf files downloaded from Google Fonts, but only used for conversion.
+ .woff files created with https://github.com/odemiral/woff2sfnt-sfnt2woff
+ .woff2 files created with https://github.com/nfroidure/ttf2woff2
+ ========================================================================== */
+
+@font-face {
+ font-family: Cairo;
+ src: url("fonts/Cairo/Cairo-Regular.woff2") format("woff2"),
+ url("fonts/Cairo/Cairo-Regular.woff") format("woff");
+ font-weight: normal;
+}
+
+@font-face {
+ font-family: Cairo;
+ src: url("fonts/Cairo/Cairo-Bold.woff2") format("woff2"),
+ url("fonts/Cairo/Cairo-Bold.woff") format("woff");
+ font-weight: 700;
+}
+
/* ==========================================================================
Font Awesome
========================================================================== */
@@ -1624,14 +1649,14 @@ nav#main ul {
nav#main li {
float: left;
- font: normal normal 16px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font: normal 700 16px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
margin-right: 2px;
}
nav#main li a {
color: #fff;
text-decoration: none;
- padding: 6px 10px;
+ padding: 2px 10px;
display: block;
border: 1px solid transparent;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.76);
@@ -1824,7 +1849,7 @@ pre b {
height: 19px;
width: 19px;
padding-top: 0;
- font: bold 11px/19px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font: bold 11px/19px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
border-radius: 12px;
}
@@ -1907,7 +1932,7 @@ pre b {
#content figcaption {
box-shadow: 0 0 5px 1px rgba(0, 0, 0, 0.20);
- font: italic 700 12px/20px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font: italic 700 12px/20px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
padding: 10px 5px;
color: #737272;
clear: both;
@@ -1979,7 +2004,7 @@ pre b {
p.author {
color: #ababab;
- font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font-family: Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
font-weight: 700;
margin-top: -20px;
}
@@ -1993,7 +2018,7 @@ p.author a {
padding-bottom: .5%;
margin-bottom: 20px;
font-weight: 700;
- font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font-family: Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
color: #666;
background: url(../images-foundation/gauze.png) #f0f0f0;
text-shadow: 0 1px 0 #ffffff;
@@ -2016,7 +2041,7 @@ p.author a {
}
#banner-large-image h1, #banner-large-image h2 {
- font: bold 60px/60px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font: bold 60px/60px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
margin-bottom: 0;
color: #fff;
text-shadow: 0 0 4px rgba(0, 0, 0, 0.85);
@@ -2024,7 +2049,7 @@ p.author a {
#banner-large-image p {
color: #cccccc;
- font: 700 normal 24px/36px "klavika-web", "Helvetica Neue", sans-serif;
+ font: 700 normal 24px/36px Cairo, "Helvetica Neue", sans-serif;
}
#banner-secondary {
@@ -2121,7 +2146,7 @@ input[type="submit"] {
color: #fff !important;
text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.35);
padding: 8px 15px;
- font: bold 16px/16px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font: bold 16px/16px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
transition: all 0.2s;
background-color: #d18f4f;
float: left;
@@ -2508,7 +2533,6 @@ footer .books li a cite {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5);
letter-spacing: 0;
border-radius: 5px 5px 0 0;
- font-weight: normal;
margin-bottom: 0;
overflow: hidden;
}
diff --git a/themes/jquery/css/fonts/Cairo/Cairo-Bold.ttf b/themes/jquery/css/fonts/Cairo/Cairo-Bold.ttf
new file mode 100644
index 00000000..098d2fb5
Binary files /dev/null and b/themes/jquery/css/fonts/Cairo/Cairo-Bold.ttf differ
diff --git a/themes/jquery/css/fonts/Cairo/Cairo-Bold.woff b/themes/jquery/css/fonts/Cairo/Cairo-Bold.woff
new file mode 100644
index 00000000..bb850af8
Binary files /dev/null and b/themes/jquery/css/fonts/Cairo/Cairo-Bold.woff differ
diff --git a/themes/jquery/css/fonts/Cairo/Cairo-Bold.woff2 b/themes/jquery/css/fonts/Cairo/Cairo-Bold.woff2
new file mode 100644
index 00000000..960a3871
Binary files /dev/null and b/themes/jquery/css/fonts/Cairo/Cairo-Bold.woff2 differ
diff --git a/themes/jquery/css/fonts/Cairo/Cairo-Regular.ttf b/themes/jquery/css/fonts/Cairo/Cairo-Regular.ttf
new file mode 100644
index 00000000..fb9e6cc6
Binary files /dev/null and b/themes/jquery/css/fonts/Cairo/Cairo-Regular.ttf differ
diff --git a/themes/jquery/css/fonts/Cairo/Cairo-Regular.woff b/themes/jquery/css/fonts/Cairo/Cairo-Regular.woff
new file mode 100644
index 00000000..6c55722b
Binary files /dev/null and b/themes/jquery/css/fonts/Cairo/Cairo-Regular.woff differ
diff --git a/themes/jquery/css/fonts/Cairo/Cairo-Regular.woff2 b/themes/jquery/css/fonts/Cairo/Cairo-Regular.woff2
new file mode 100644
index 00000000..2063cd59
Binary files /dev/null and b/themes/jquery/css/fonts/Cairo/Cairo-Regular.woff2 differ
diff --git a/themes/jquery/css/fonts/Cairo/OFL.txt b/themes/jquery/css/fonts/Cairo/OFL.txt
new file mode 100644
index 00000000..d9712a66
--- /dev/null
+++ b/themes/jquery/css/fonts/Cairo/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2009 The Cairo Project Authors (https://github.com/Gue3bara/Cairo)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/themes/jquery/css/fonts/FontAwesome.otf b/themes/jquery/css/fonts/FontAwesome.otf
deleted file mode 100755
index 64049bf2..00000000
Binary files a/themes/jquery/css/fonts/FontAwesome.otf and /dev/null differ
diff --git a/themes/jquery/css/fonts/fontawesome-webfont.ttf b/themes/jquery/css/fonts/FontAwesome/fontawesome-webfont.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from themes/jquery/css/fonts/fontawesome-webfont.ttf
rename to themes/jquery/css/fonts/FontAwesome/fontawesome-webfont.ttf
diff --git a/themes/jquery/css/fonts/fontawesome-webfont.woff b/themes/jquery/css/fonts/FontAwesome/fontawesome-webfont.woff
old mode 100755
new mode 100644
similarity index 100%
rename from themes/jquery/css/fonts/fontawesome-webfont.woff
rename to themes/jquery/css/fonts/FontAwesome/fontawesome-webfont.woff
diff --git a/themes/jquery/css/fonts/FontAwesome/fontawesome-webfont.woff2 b/themes/jquery/css/fonts/FontAwesome/fontawesome-webfont.woff2
new file mode 100644
index 00000000..3c2e02c5
Binary files /dev/null and b/themes/jquery/css/fonts/FontAwesome/fontawesome-webfont.woff2 differ
diff --git a/themes/jquery/css/fonts/fontawesome-webfont.eot b/themes/jquery/css/fonts/fontawesome-webfont.eot
deleted file mode 100755
index 7d81019e..00000000
Binary files a/themes/jquery/css/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/themes/jquery/css/fonts/fontawesome-webfont.svg b/themes/jquery/css/fonts/fontawesome-webfont.svg
deleted file mode 100755
index ba0afe5e..00000000
--- a/themes/jquery/css/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,284 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/themes/jquery/css/sri-modal.css b/themes/jquery/css/sri-modal.css
index 8f3231d6..ea862499 100644
--- a/themes/jquery/css/sri-modal.css
+++ b/themes/jquery/css/sri-modal.css
@@ -24,7 +24,7 @@
.sri-modal .ui-dialog-title {
text-align: center;
- font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font-family: Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
font-weight: 400;
width: 100%;
}
diff --git a/themes/jquery/header.php b/themes/jquery/header.php
index 13db210a..f9f1431a 100755
--- a/themes/jquery/header.php
+++ b/themes/jquery/header.php
@@ -25,8 +25,6 @@
-
-