From f6926b59840cf01673b518b67a2c147a0632a7a1 Mon Sep 17 00:00:00 2001 From: VitaliyTr Date: Tue, 7 Feb 2017 00:23:25 +0700 Subject: [PATCH] added font in graphic page --- graphics/index.html | 4 ++-- src/scss/_junk-drawer.scss | 10 ++++++++-- src/scss/global/_typography.scss | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/graphics/index.html b/graphics/index.html index 679ba62..55e7c66 100755 --- a/graphics/index.html +++ b/graphics/index.html @@ -104,11 +104,11 @@ description: pages.graphics.description

Gunship Bold Italic

- ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890?!% + ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890?!%

Montserrat Light

- ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890?!% + ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890?!%
diff --git a/src/scss/_junk-drawer.scss b/src/scss/_junk-drawer.scss index 9d88c0b..4bcc93d 100755 --- a/src/scss/_junk-drawer.scss +++ b/src/scss/_junk-drawer.scss @@ -263,7 +263,7 @@ a.blog_link { } } img{ - max-width: 200px; + max-width: 200px; } } &__select { @@ -464,4 +464,10 @@ a.blog_link { .ctabox__image { background-color: #fff; } - +.graphic-exmaple-light{ + font-weight: $font-weight-xlight; +} +.graphic-exmaple-brand{ + font-family: $font-family-brand; + font-weight: $font-weight-bold; +} diff --git a/src/scss/global/_typography.scss b/src/scss/global/_typography.scss index e717ca7..4237511 100644 --- a/src/scss/global/_typography.scss +++ b/src/scss/global/_typography.scss @@ -2,14 +2,17 @@ @import "../fonts/montserrat/light"; @import "../fonts/montserrat/regular"; @import "../fonts/montserrat/medium"; +@import "../fonts/gunshipital/regular"; $font-family-body: 'Montserrat', Helvetica, Arial, "Microsoft Yahei","微软雅黑", STXihei, "华文细黑", sans-serif; $font-family-heading: $font-family-body; +$font-family-brand: 'Gunship Italic', sans-serif; $font-weight-xlight: 200; $font-weight-light: 300; $font-weight-regular: 400; $font-weight-medium: 500; +$font-weight-bold: 700; $font-size-base: $font-size-base; // This is stored in the _variables.scss because it is required earlier $font-size-base-plus: 19px;