diff --git a/source/assets/css/_imports.scss b/source/assets/css/_imports.scss index 19df2aa..44426e5 100644 --- a/source/assets/css/_imports.scss +++ b/source/assets/css/_imports.scss @@ -5,16 +5,6 @@ /* Fonts */ -@font-face { - font-family: 'lato_regular'; - src: url('/assets/fonts/lato-regular.eot'); - src: url('/assets/fonts/lato-regular.eot?#iefix') format('embedded-opentype'), - url('/assets/fonts/lato-regular.woff') format('woff'), - url('/assets/fonts/lato-regular.ttf') format('truetype'), - url('/assets/fonts/lato-regular.svg#LatoRegular') format('svg'); - font-weight: normal; - font-style: normal; -} @font-face { font-family: 'lato_bold'; @@ -28,13 +18,25 @@ } @font-face { - font-family: 'avantgardelt-extralight'; - src: url('/assets/fonts/avantgardelt-extralight.eot'); - src: url('/assets/fonts/avantgardelt-extralight.eot?#iefix') format('embedded-opentype'), - url('/assets/fonts/avantgardelt-extralight.woff') format('woff'), - url('/assets/fonts/avantgardelt-extralight.ttf') format('truetype'), - url('/assets/fonts/avantgardelt-extralight.svg#avantgardelt-extralight') format('svg'); + font-family: 'bosun03'; + src: url('/assets/fonts/bosun03-webfont.eot'); + src: url('/assets/fonts/bosun03-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/bosun03-webfont.woff2') format('woff2'), + url('/assets/fonts/bosun03-webfont.woff') format('woff'), + url('/assets/fonts/bosun03-webfont.ttf') format('truetype'), + url('/assets/fonts/bosun03-webfont.svg#bosun03') format('svg'); font-weight: normal; font-style: normal; } +@font-face { + font-family: 'inconsolatamedium'; + src: url('/assets/fonts/inconsolata-webfont.eot'); + src: url('/assets/fonts/inconsolata-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/inconsolata-webfont.woff2') format('woff2'), + url('/assets/fonts/inconsolata-webfont.woff') format('woff'), + url('/assets/fonts/inconsolata-webfont.ttf') format('truetype'), + url('/assets/fonts/inconsolata-webfont.svg#inconsolatamedium') format('svg'); + font-weight: normal; + font-style: normal; +} diff --git a/source/assets/css/_settings.scss b/source/assets/css/_settings.scss index 9da960a..28909b2 100644 --- a/source/assets/css/_settings.scss +++ b/source/assets/css/_settings.scss @@ -18,5 +18,6 @@ $offwhite: #F7F7F7; $accent_color: #FF9A00; -$main_font: "lato-regular", arial; -$accent_font: "lato-regular", arial; +$main_font: "lato-bold", arial; +$accent_font: "bosun03", arial; +$code_font: "inconsolatamedium", Courier; diff --git a/source/assets/css/all.scss b/source/assets/css/all.scss index 96c4074..026f17e 100644 --- a/source/assets/css/all.scss +++ b/source/assets/css/all.scss @@ -68,6 +68,7 @@ header a:hover { .side-links { + font-family: $accent_font; text-align: right; font-size: .85em; } diff --git a/source/assets/fonts/avantgardelt-extralight.eot b/source/assets/fonts/avantgardelt-extralight.eot deleted file mode 100644 index 641722c..0000000 Binary files a/source/assets/fonts/avantgardelt-extralight.eot and /dev/null differ diff --git a/source/assets/fonts/avantgardelt-extralight.svg b/source/assets/fonts/avantgardelt-extralight.svg deleted file mode 100644 index 10a9b85..0000000 --- a/source/assets/fonts/avantgardelt-extralight.svg +++ /dev/null @@ -1,465 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/assets/fonts/avantgardelt-extralight.ttf b/source/assets/fonts/avantgardelt-extralight.ttf deleted file mode 100644 index 70cb5b5..0000000 Binary files a/source/assets/fonts/avantgardelt-extralight.ttf and /dev/null differ diff --git a/source/assets/fonts/avantgardelt-extralight.woff b/source/assets/fonts/avantgardelt-extralight.woff deleted file mode 100644 index 2f25627..0000000 Binary files a/source/assets/fonts/avantgardelt-extralight.woff and /dev/null differ diff --git a/source/assets/fonts/bosun03-webfont.eot b/source/assets/fonts/bosun03-webfont.eot new file mode 100755 index 0000000..800728e Binary files /dev/null and b/source/assets/fonts/bosun03-webfont.eot differ diff --git a/source/assets/fonts/bosun03-webfont.svg b/source/assets/fonts/bosun03-webfont.svg new file mode 100755 index 0000000..c2026a4 --- /dev/null +++ b/source/assets/fonts/bosun03-webfont.svg @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/assets/fonts/bosun03-webfont.ttf b/source/assets/fonts/bosun03-webfont.ttf new file mode 100755 index 0000000..5197e03 Binary files /dev/null and b/source/assets/fonts/bosun03-webfont.ttf differ diff --git a/source/assets/fonts/bosun03-webfont.woff b/source/assets/fonts/bosun03-webfont.woff new file mode 100755 index 0000000..7f83001 Binary files /dev/null and b/source/assets/fonts/bosun03-webfont.woff differ diff --git a/source/assets/fonts/bosun03-webfont.woff2 b/source/assets/fonts/bosun03-webfont.woff2 new file mode 100755 index 0000000..b3821ff Binary files /dev/null and b/source/assets/fonts/bosun03-webfont.woff2 differ diff --git a/source/assets/fonts/inconsolata-webfont.eot b/source/assets/fonts/inconsolata-webfont.eot new file mode 100755 index 0000000..da5fc79 Binary files /dev/null and b/source/assets/fonts/inconsolata-webfont.eot differ diff --git a/source/assets/fonts/inconsolata-webfont.svg b/source/assets/fonts/inconsolata-webfont.svg new file mode 100755 index 0000000..742ec33 --- /dev/null +++ b/source/assets/fonts/inconsolata-webfont.svg @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/assets/fonts/inconsolata-webfont.ttf b/source/assets/fonts/inconsolata-webfont.ttf new file mode 100755 index 0000000..8492965 Binary files /dev/null and b/source/assets/fonts/inconsolata-webfont.ttf differ diff --git a/source/assets/fonts/inconsolata-webfont.woff b/source/assets/fonts/inconsolata-webfont.woff new file mode 100755 index 0000000..95a6fd4 Binary files /dev/null and b/source/assets/fonts/inconsolata-webfont.woff differ diff --git a/source/assets/fonts/inconsolata-webfont.woff2 b/source/assets/fonts/inconsolata-webfont.woff2 new file mode 100755 index 0000000..cdc8174 Binary files /dev/null and b/source/assets/fonts/inconsolata-webfont.woff2 differ diff --git a/source/assets/fonts/lato-regular.eot b/source/assets/fonts/lato-regular.eot deleted file mode 100644 index 582e2eb..0000000 Binary files a/source/assets/fonts/lato-regular.eot and /dev/null differ diff --git a/source/assets/fonts/lato-regular.ttf b/source/assets/fonts/lato-regular.ttf deleted file mode 100644 index c751deb..0000000 Binary files a/source/assets/fonts/lato-regular.ttf and /dev/null differ diff --git a/source/assets/fonts/lato-regular.woff b/source/assets/fonts/lato-regular.woff deleted file mode 100644 index f8b6d3e..0000000 Binary files a/source/assets/fonts/lato-regular.woff and /dev/null differ