From 850440dc77a63bbcc791e0b8df58735b57131ca2 Mon Sep 17 00:00:00 2001 From: Nuno Sempere Date: Sun, 24 May 2020 17:50:11 +0200 Subject: [PATCH] Better fonts II --- assets/css/style.scss | 50 ++++++++++++++++++ .../fonts}/Computer Modern Bright.zip | Bin .../fonts}/ComputerModernBright/OFL-FAQ.txt | 0 .../fonts}/ComputerModernBright/OFL.txt | 0 .../fonts}/ComputerModernBright/README.txt | 0 .../ComputerModernBright/cmun-bright.css | 0 .../fonts}/ComputerModernBright/cmunbbx.eot | Bin .../fonts}/ComputerModernBright/cmunbbx.ttf | Bin .../fonts}/ComputerModernBright/cmunbbx.woff | Bin .../fonts}/ComputerModernBright/cmunbmo.eot | Bin .../fonts}/ComputerModernBright/cmunbmo.ttf | Bin .../fonts}/ComputerModernBright/cmunbmo.woff | Bin .../fonts}/ComputerModernBright/cmunbmr.eot | Bin .../fonts}/ComputerModernBright/cmunbmr.ttf | Bin .../fonts}/ComputerModernBright/cmunbmr.woff | Bin .../fonts}/ComputerModernBright/cmunbxo.eot | Bin .../fonts}/ComputerModernBright/cmunbxo.ttf | Bin .../fonts}/ComputerModernBright/cmunbxo.woff | Bin {fonts => assets/fonts}/cmun-bright.css | 0 style.css | 45 ---------------- 20 files changed, 50 insertions(+), 45 deletions(-) create mode 100644 assets/css/style.scss rename {fonts => assets/fonts}/Computer Modern Bright.zip (100%) rename {fonts => assets/fonts}/ComputerModernBright/OFL-FAQ.txt (100%) rename {fonts => assets/fonts}/ComputerModernBright/OFL.txt (100%) rename {fonts => assets/fonts}/ComputerModernBright/README.txt (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmun-bright.css (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbbx.eot (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbbx.ttf (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbbx.woff (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbmo.eot (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbmo.ttf (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbmo.woff (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbmr.eot (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbmr.ttf (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbmr.woff (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbxo.eot (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbxo.ttf (100%) rename {fonts => assets/fonts}/ComputerModernBright/cmunbxo.woff (100%) rename {fonts => assets/fonts}/cmun-bright.css (100%) delete mode 100644 style.css diff --git a/assets/css/style.scss b/assets/css/style.scss new file mode 100644 index 0000000..a52615c --- /dev/null +++ b/assets/css/style.scss @@ -0,0 +1,50 @@ +--- +--- + +@import "{{ site.theme }}"; + +@font-face { + font-family: 'Computer Modern Bright'; + src: url('../fonts/ComputerModernBright/cmunbmr.eot'); + src: url('../fonts/ComputerModernBright/cmunbmr.eot?#iefix') format('embedded-opentype'), + url('../fonts/ComputerModernBright/cmunbmr.woff') format('woff'), + url('../fonts/ComputerModernBright/cmunbmr.ttf') format('truetype'), + url('../fonts/ComputerModernBright/cmunbmr.svg#cmunbmr') format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Computer Modern Bright'; + src: url('../fonts/ComputerModernBright/cmunbbx.eot'); + src: url('../fonts/ComputerModernBright/cmunbbx.eot?#iefix') format('embedded-opentype'), + url('../fonts/ComputerModernBright/cmunbbx.woff') format('woff'), + url('../fonts/ComputerModernBright/cmunbbx.ttf') format('truetype'), + url('../fonts/ComputerModernBright/cmunbbx.svg#cmunbbx') format('svg'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'Computer Modern Bright'; + src: url('../fonts/ComputerModernBright/cmunbmo.eot'); + src: url('../fonts/ComputerModernBright/cmunbmo.eot?#iefix') format('embedded-opentype'), + url('../fonts/ComputerModernBright/cmunbmo.woff') format('woff'), + url('../fonts/ComputerModernBright/cmunbmo.ttf') format('truetype'), + url('../fonts/ComputerModernBright/cmunbmo.svg#cmunbmo') format('svg'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Computer Modern Bright'; + src: url('../fonts/ComputerModernBright/cmunbxo.eot'); + src: url('../fonts/ComputerModernBright/cmunbxo.eot?#iefix') format('embedded-opentype'), + url('../fonts/ComputerModernBright/cmunbxo.woff') format('woff'), + url('../fonts/ComputerModernBright/cmunbxo.ttf') format('truetype'), + url('../fonts/ComputerModernBright/cmunbxo.svg#cmunbxo') format('svg'); + font-weight: bold; + font-style: italic; +} + + diff --git a/fonts/Computer Modern Bright.zip b/assets/fonts/Computer Modern Bright.zip similarity index 100% rename from fonts/Computer Modern Bright.zip rename to assets/fonts/Computer Modern Bright.zip diff --git a/fonts/ComputerModernBright/OFL-FAQ.txt b/assets/fonts/ComputerModernBright/OFL-FAQ.txt similarity index 100% rename from fonts/ComputerModernBright/OFL-FAQ.txt rename to assets/fonts/ComputerModernBright/OFL-FAQ.txt diff --git a/fonts/ComputerModernBright/OFL.txt b/assets/fonts/ComputerModernBright/OFL.txt similarity index 100% rename from fonts/ComputerModernBright/OFL.txt rename to assets/fonts/ComputerModernBright/OFL.txt diff --git a/fonts/ComputerModernBright/README.txt b/assets/fonts/ComputerModernBright/README.txt similarity index 100% rename from fonts/ComputerModernBright/README.txt rename to assets/fonts/ComputerModernBright/README.txt diff --git a/fonts/ComputerModernBright/cmun-bright.css b/assets/fonts/ComputerModernBright/cmun-bright.css similarity index 100% rename from fonts/ComputerModernBright/cmun-bright.css rename to assets/fonts/ComputerModernBright/cmun-bright.css diff --git a/fonts/ComputerModernBright/cmunbbx.eot b/assets/fonts/ComputerModernBright/cmunbbx.eot similarity index 100% rename from fonts/ComputerModernBright/cmunbbx.eot rename to assets/fonts/ComputerModernBright/cmunbbx.eot diff --git a/fonts/ComputerModernBright/cmunbbx.ttf b/assets/fonts/ComputerModernBright/cmunbbx.ttf similarity index 100% rename from fonts/ComputerModernBright/cmunbbx.ttf rename to assets/fonts/ComputerModernBright/cmunbbx.ttf diff --git a/fonts/ComputerModernBright/cmunbbx.woff b/assets/fonts/ComputerModernBright/cmunbbx.woff similarity index 100% rename from fonts/ComputerModernBright/cmunbbx.woff rename to assets/fonts/ComputerModernBright/cmunbbx.woff diff --git a/fonts/ComputerModernBright/cmunbmo.eot b/assets/fonts/ComputerModernBright/cmunbmo.eot similarity index 100% rename from fonts/ComputerModernBright/cmunbmo.eot rename to assets/fonts/ComputerModernBright/cmunbmo.eot diff --git a/fonts/ComputerModernBright/cmunbmo.ttf b/assets/fonts/ComputerModernBright/cmunbmo.ttf similarity index 100% rename from fonts/ComputerModernBright/cmunbmo.ttf rename to assets/fonts/ComputerModernBright/cmunbmo.ttf diff --git a/fonts/ComputerModernBright/cmunbmo.woff b/assets/fonts/ComputerModernBright/cmunbmo.woff similarity index 100% rename from fonts/ComputerModernBright/cmunbmo.woff rename to assets/fonts/ComputerModernBright/cmunbmo.woff diff --git a/fonts/ComputerModernBright/cmunbmr.eot b/assets/fonts/ComputerModernBright/cmunbmr.eot similarity index 100% rename from fonts/ComputerModernBright/cmunbmr.eot rename to assets/fonts/ComputerModernBright/cmunbmr.eot diff --git a/fonts/ComputerModernBright/cmunbmr.ttf b/assets/fonts/ComputerModernBright/cmunbmr.ttf similarity index 100% rename from fonts/ComputerModernBright/cmunbmr.ttf rename to assets/fonts/ComputerModernBright/cmunbmr.ttf diff --git a/fonts/ComputerModernBright/cmunbmr.woff b/assets/fonts/ComputerModernBright/cmunbmr.woff similarity index 100% rename from fonts/ComputerModernBright/cmunbmr.woff rename to assets/fonts/ComputerModernBright/cmunbmr.woff diff --git a/fonts/ComputerModernBright/cmunbxo.eot b/assets/fonts/ComputerModernBright/cmunbxo.eot similarity index 100% rename from fonts/ComputerModernBright/cmunbxo.eot rename to assets/fonts/ComputerModernBright/cmunbxo.eot diff --git a/fonts/ComputerModernBright/cmunbxo.ttf b/assets/fonts/ComputerModernBright/cmunbxo.ttf similarity index 100% rename from fonts/ComputerModernBright/cmunbxo.ttf rename to assets/fonts/ComputerModernBright/cmunbxo.ttf diff --git a/fonts/ComputerModernBright/cmunbxo.woff b/assets/fonts/ComputerModernBright/cmunbxo.woff similarity index 100% rename from fonts/ComputerModernBright/cmunbxo.woff rename to assets/fonts/ComputerModernBright/cmunbxo.woff diff --git a/fonts/cmun-bright.css b/assets/fonts/cmun-bright.css similarity index 100% rename from fonts/cmun-bright.css rename to assets/fonts/cmun-bright.css diff --git a/style.css b/style.css deleted file mode 100644 index 1be0439..0000000 --- a/style.css +++ /dev/null @@ -1,45 +0,0 @@ -@font-face { - font-family: 'Computer Modern Bright'; - src: url('fonts/ComputerModernBright/cmunbmr.eot'); - src: url('fonts/ComputerModernBright/cmunbmr.eot?#iefix') format('embedded-opentype'), - url('fonts/ComputerModernBright/cmunbmr.woff') format('woff'), - url('fonts/ComputerModernBright/cmunbmr.ttf') format('truetype'), - url('fonts/ComputerModernBright/cmunbmr.svg#cmunbmr') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Computer Modern Bright'; - src: url('fonts/ComputerModernBright/cmunbbx.eot'); - src: url('fonts/ComputerModernBright/cmunbbx.eot?#iefix') format('embedded-opentype'), - url('fonts/ComputerModernBright/cmunbbx.woff') format('woff'), - url('fonts/ComputerModernBright/cmunbbx.ttf') format('truetype'), - url('fonts/ComputerModernBright/cmunbbx.svg#cmunbbx') format('svg'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'Computer Modern Bright'; - src: url('fonts/ComputerModernBright/cmunbmo.eot'); - src: url('fonts/ComputerModernBright/cmunbmo.eot?#iefix') format('embedded-opentype'), - url('fonts/ComputerModernBright/cmunbmo.woff') format('woff'), - url('fonts/ComputerModernBright/cmunbmo.ttf') format('truetype'), - url('fonts/ComputerModernBright/cmunbmo.svg#cmunbmo') format('svg'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'Computer Modern Bright'; - src: url('fonts/ComputerModernBright/cmunbxo.eot'); - src: url('fonts/ComputerModernBright/cmunbxo.eot?#iefix') format('embedded-opentype'), - url('fonts/ComputerModernBright/cmunbxo.woff') format('woff'), - url('fonts/ComputerModernBright/cmunbxo.ttf') format('truetype'), - url('fonts/ComputerModernBright/cmunbxo.svg#cmunbxo') format('svg'); - font-weight: bold; - font-style: italic; -} - -