diff --git a/www/css/core.css b/www/css/core.css index 51dac454..ea7733a5 100644 --- a/www/css/core.css +++ b/www/css/core.css @@ -17,32 +17,32 @@ @font-face{ /* Note: Don't use local() as a source, because our version fixes the font's strange default line-height */ - font-family: "Crimson Text"; - src: url('/fonts/crimson-text.woff2') format('woff2'), url('/fonts/crimson-text.woff') format('woff'); + font-family: "Crimson Pro"; + src: url('/fonts/crimson-pro.woff2') format('woff2'), url('/fonts/crimson-pro.woff') format('woff'); font-weight: normal; font-style: normal; } @font-face{ /* Note: Don't use local() as a source, because our version fixes the font's strange default line-height */ - font-family: "Crimson Text"; - src: url('/fonts/crimson-text-bold.woff2') format('woff2'), url('/fonts/crimson-text-bold.woff') format('woff'); + font-family: "Crimson Pro"; + src: url('/fonts/crimson-pro-bold.woff2') format('woff2'), url('/fonts/crimson-pro-bold.woff') format('woff'); font-weight: bold; font-style: normal; } @font-face{ /* Note: Don't use local() as a source, because our version fixes the font's strange default line-height */ - font-family: "Crimson Text"; - src: url('/fonts/crimson-text-italic.woff2') format('woff2'), url('/fonts/crimson-text-italic.woff') format('woff'); + font-family: "Crimson Pro"; + src: url('/fonts/crimson-pro-italic.woff2') format('woff2'), url('/fonts/crimson-pro-italic.woff') format('woff'); font-weight: normal; font-style: italic; } @font-face{ /* Note: Don't use local() as a source, because our version fixes the font's strange default line-height */ - font-family: "Crimson Text"; - src: url('/fonts/crimson-text-bold-italic.woff2') format('woff2'), url('/fonts/crimson-text-bold-italic.woff') format('woff'); + font-family: "Crimson Pro"; + src: url('/fonts/crimson-pro-bold-italic.woff2') format('woff2'), url('/fonts/crimson-pro-bold-italic.woff') format('woff'); font-weight: bold; font-style: italic; } @@ -77,11 +77,11 @@ html{ color: #222; - font-family: "Crimson Text", Georgia, serif; + font-family: "Crimson Pro", Georgia, serif; -webkit-hyphens: auto; hyphens: auto; - font-size: 20px; - line-height: 1.6; + font-size: 22px; + line-height: 1.5; background: url('/images/paper.png') #fcf5dd; /* #faf5e3; */ } @@ -389,7 +389,7 @@ main.front-page > section{ } main.front-page > section > h2{ - font-family: "Crimson Text", Georgia, serif; + font-family: "Crimson Pro", Georgia, serif; font-style: italic; font-size: 2.2rem; text-align: center; @@ -1360,7 +1360,7 @@ input[type="search"]{ width: 100%; background: none; border: none; - font-family: 'Crimson Text'; + font-family: 'Crimson Pro'; } /* remove some styles from Chromium */ @@ -1407,7 +1407,7 @@ label.search::before{ line-height: 1; margin-right: 1rem; color: #222; - margin-top: -3px; /* Adjust for crimson text line-height */ + margin-top: -3px; /* Adjust for Crimson Pro line-height */ text-shadow: 1px 1px 0 rgba(255, 255, 255, .5); } diff --git a/www/fonts/crimson-pro-bold-italic.woff b/www/fonts/crimson-pro-bold-italic.woff new file mode 100644 index 00000000..a6cafa2e Binary files /dev/null and b/www/fonts/crimson-pro-bold-italic.woff differ diff --git a/www/fonts/crimson-pro-bold-italic.woff2 b/www/fonts/crimson-pro-bold-italic.woff2 new file mode 100644 index 00000000..dccd2cd5 Binary files /dev/null and b/www/fonts/crimson-pro-bold-italic.woff2 differ diff --git a/www/fonts/crimson-pro-bold.woff b/www/fonts/crimson-pro-bold.woff new file mode 100644 index 00000000..27c58fb6 Binary files /dev/null and b/www/fonts/crimson-pro-bold.woff differ diff --git a/www/fonts/crimson-pro-bold.woff2 b/www/fonts/crimson-pro-bold.woff2 new file mode 100644 index 00000000..9174f661 Binary files /dev/null and b/www/fonts/crimson-pro-bold.woff2 differ diff --git a/www/fonts/crimson-pro-italic.woff b/www/fonts/crimson-pro-italic.woff new file mode 100644 index 00000000..13d7c287 Binary files /dev/null and b/www/fonts/crimson-pro-italic.woff differ diff --git a/www/fonts/crimson-pro-italic.woff2 b/www/fonts/crimson-pro-italic.woff2 new file mode 100644 index 00000000..4e9cf132 Binary files /dev/null and b/www/fonts/crimson-pro-italic.woff2 differ diff --git a/www/fonts/crimson-pro.woff b/www/fonts/crimson-pro.woff new file mode 100644 index 00000000..fd51e223 Binary files /dev/null and b/www/fonts/crimson-pro.woff differ diff --git a/www/fonts/crimson-pro.woff2 b/www/fonts/crimson-pro.woff2 new file mode 100644 index 00000000..5ce4eeee Binary files /dev/null and b/www/fonts/crimson-pro.woff2 differ diff --git a/www/fonts/crimson-text-bold-italic.woff b/www/fonts/crimson-text-bold-italic.woff deleted file mode 100644 index 3f447699..00000000 Binary files a/www/fonts/crimson-text-bold-italic.woff and /dev/null differ diff --git a/www/fonts/crimson-text-bold-italic.woff2 b/www/fonts/crimson-text-bold-italic.woff2 deleted file mode 100644 index b2b56a4b..00000000 Binary files a/www/fonts/crimson-text-bold-italic.woff2 and /dev/null differ diff --git a/www/fonts/crimson-text-bold.woff b/www/fonts/crimson-text-bold.woff deleted file mode 100644 index dad785a3..00000000 Binary files a/www/fonts/crimson-text-bold.woff and /dev/null differ diff --git a/www/fonts/crimson-text-bold.woff2 b/www/fonts/crimson-text-bold.woff2 deleted file mode 100644 index 43175f12..00000000 Binary files a/www/fonts/crimson-text-bold.woff2 and /dev/null differ diff --git a/www/fonts/crimson-text-italic.woff b/www/fonts/crimson-text-italic.woff deleted file mode 100644 index cd8e878f..00000000 Binary files a/www/fonts/crimson-text-italic.woff and /dev/null differ diff --git a/www/fonts/crimson-text-italic.woff2 b/www/fonts/crimson-text-italic.woff2 deleted file mode 100644 index 6ef17786..00000000 Binary files a/www/fonts/crimson-text-italic.woff2 and /dev/null differ diff --git a/www/fonts/crimson-text.woff b/www/fonts/crimson-text.woff deleted file mode 100644 index 14fc4684..00000000 Binary files a/www/fonts/crimson-text.woff and /dev/null differ diff --git a/www/fonts/crimson-text.woff2 b/www/fonts/crimson-text.woff2 deleted file mode 100644 index 8bf4c3d7..00000000 Binary files a/www/fonts/crimson-text.woff2 and /dev/null differ