diff --git a/_config.yml b/_config.yml index dd2e3e6..d656c95 100644 --- a/_config.yml +++ b/_config.yml @@ -17,7 +17,6 @@ exclude_from_localizations: ["assets"] sass: style: compressed cache: false - relative_assets: true gems: - jekyll-paginate diff --git a/_sass/_typography.scss b/_sass/_typography.scss index 4a6d81d..8d94ef0 100644 --- a/_sass/_typography.scss +++ b/_sass/_typography.scss @@ -1,7 +1,10 @@ -@import "../fonts/worksans/font.css"; // imports are relative to /assets/css/style.scss +@import "fonts/worksans/bold"; +@import "fonts/worksans/semibold"; +@import "fonts/open-sans/regular"; +@import "fonts/open-sans/italic"; body { - font-family: 'Work Sans', Helvetica, Arial, sans-serif; + font-family: 'Open Sans', Helvetica, Arial, sans-serif; line-height: 1.5; } @@ -17,6 +20,10 @@ p { } } +h1, h2, h3 { + font-family: 'Work Sans', Helvetica, Arial, sans-serif; +} + h1 { font-size: 36px; line-height: 40px; diff --git a/_sass/fonts/gunshipital/_regular.scss b/_sass/fonts/gunshipital/_regular.scss new file mode 100755 index 0000000..3af83b4 --- /dev/null +++ b/_sass/fonts/gunshipital/_regular.scss @@ -0,0 +1,10 @@ +/* Generated by Font Squirrel (https://www.fontsquirrel.com) on May 14, 2016 */ + +@font-face { + font-family: 'Gunship Italic'; + src: url('../fonts/gunshipital/gunshipital-webfont.woff2') format('woff2'), + url('../fonts/gunshipital/gunshipital-webfont.woff') format('woff'); + font-weight: normal; + font-style: normal; +} + diff --git a/_sass/fonts/open-sans/_bold.scss b/_sass/fonts/open-sans/_bold.scss new file mode 100644 index 0000000..dde560a --- /dev/null +++ b/_sass/fonts/open-sans/_bold.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Bold-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Bold-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Bold-webfont.ttf') format('truetype'); + font-weight: bold; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_bolditalic.scss b/_sass/fonts/open-sans/_bolditalic.scss new file mode 100644 index 0000000..c8dcbbd --- /dev/null +++ b/_sass/fonts/open-sans/_bolditalic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-BoldItalic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-BoldItalic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-BoldItalic-webfont.ttf') format('truetype'); + font-weight: bold; + font-style: italic; + +} + diff --git a/_sass/fonts/open-sans/_extrabold.scss b/_sass/fonts/open-sans/_extrabold.scss new file mode 100644 index 0000000..d032627 --- /dev/null +++ b/_sass/fonts/open-sans/_extrabold.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-ExtraBold-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-ExtraBold-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-ExtraBold-webfont.ttf') format('truetype'); + font-weight: 900; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_extrabolditalic.scss b/_sass/fonts/open-sans/_extrabolditalic.scss new file mode 100644 index 0000000..61e53f8 --- /dev/null +++ b/_sass/fonts/open-sans/_extrabolditalic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'); + font-weight: 900; + font-style: italic; + +} + diff --git a/_sass/fonts/open-sans/_italic.scss b/_sass/fonts/open-sans/_italic.scss new file mode 100644 index 0000000..f64bb27 --- /dev/null +++ b/_sass/fonts/open-sans/_italic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Italic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Italic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Italic-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + +} + diff --git a/_sass/fonts/open-sans/_light.scss b/_sass/fonts/open-sans/_light.scss new file mode 100644 index 0000000..a22d78a --- /dev/null +++ b/_sass/fonts/open-sans/_light.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Light-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Light-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Light-webfont.ttf') format('truetype'); + font-weight: 200; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_lightitalic.scss b/_sass/fonts/open-sans/_lightitalic.scss new file mode 100644 index 0000000..bc6a556 --- /dev/null +++ b/_sass/fonts/open-sans/_lightitalic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-LightItalic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-LightItalic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-LightItalic-webfont.ttf') format('truetype'); + font-weight: 200; + font-style: italic; + +} + diff --git a/_sass/fonts/open-sans/_regular.scss b/_sass/fonts/open-sans/_regular.scss new file mode 100644 index 0000000..354fd86 --- /dev/null +++ b/_sass/fonts/open-sans/_regular.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Regular-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Regular-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Regular-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_semibold.scss b/_sass/fonts/open-sans/_semibold.scss new file mode 100644 index 0000000..fdb384c --- /dev/null +++ b/_sass/fonts/open-sans/_semibold.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Semibold-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Semibold-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Semibold-webfont.ttf') format('truetype'); + font-weight: 600; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_semibolditalic.scss b/_sass/fonts/open-sans/_semibolditalic.scss new file mode 100644 index 0000000..2197d98 --- /dev/null +++ b/_sass/fonts/open-sans/_semibolditalic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'open_sanssemibold_italic'; + src: url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'); + font-weight: 600; + font-style: italic; + +} + diff --git a/_sass/fonts/worksans/_bold.scss b/_sass/fonts/worksans/_bold.scss new file mode 100644 index 0000000..7388b32 --- /dev/null +++ b/_sass/fonts/worksans/_bold.scss @@ -0,0 +1,13 @@ +/* Generated by Font Squirrel (https://www.fontsquirrel.com) on July 27, 2016 */ + +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-bold-webfont.eot'); + src: url('../fonts/worksans/worksans-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-bold-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-bold-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-bold-webfont.ttf') format('truetype'); + font-weight: bold; + font-style: normal; +} + diff --git a/_sass/fonts/worksans/_regular.scss b/_sass/fonts/worksans/_regular.scss new file mode 100644 index 0000000..4e6adbe --- /dev/null +++ b/_sass/fonts/worksans/_regular.scss @@ -0,0 +1,12 @@ +/* Generated by Font Squirrel (https://www.fontsquirrel.com) on July 27, 2016 */ + +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-regular-webfont.eot'); + src: url('../fonts/worksans/worksans-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-regular-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-regular-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-regular-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} diff --git a/_sass/fonts/worksans/_semibold.scss b/_sass/fonts/worksans/_semibold.scss new file mode 100644 index 0000000..a51906d --- /dev/null +++ b/_sass/fonts/worksans/_semibold.scss @@ -0,0 +1,13 @@ +/* Generated by Font Squirrel (https://www.fontsquirrel.com) on July 27, 2016 */ + +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-semibold-webfont.eot'); + src: url('../fonts/worksans/worksans-semibold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-semibold-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-semibold-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-semibold-webfont.ttf') format('truetype'); + font-weight: 600; + font-style: normal; +} + diff --git a/assets/fonts/generator_config.txt b/assets/fonts/gunshipital/generator_config.txt similarity index 100% rename from assets/fonts/generator_config.txt rename to assets/fonts/gunshipital/generator_config.txt diff --git a/assets/fonts/gunshipital-demo.html b/assets/fonts/gunshipital/gunshipital-demo.html similarity index 98% rename from assets/fonts/gunshipital-demo.html rename to assets/fonts/gunshipital/gunshipital-demo.html index 3b9c468..a1fed5a 100755 --- a/assets/fonts/gunshipital-demo.html +++ b/assets/fonts/gunshipital/gunshipital-demo.html @@ -16,8 +16,8 @@