joshua/dash-website
1
0
Fork 0
mirror of https://github.com/seigler/dash-website synced 2025-07-27 07:16:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'dashpay/master'

Browse source
This commit is contained in:
tungfa 2017-02-07 13:15:24 +08:00
commit 98800b0fae
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
graphics/index.html
View file

@ -104,11 +104,11 @@ description: pages.graphics.description
<div class="row">
<div class="col-xs-6">
<p>Gunship Bold Italic</p>
<span class="text-word-wrap">ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890?!%</span>
<span class="text-word-wrap graphic-exmaple-brand">ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890?!%</span>
</div>
<div class="col-xs-6">
<p>Montserrat Light</p>
<span class="text-word-wrap">ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890?!%</span>
<span class="text-word-wrap graphic-exmaple-light">ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890?!%</span>
</div>
</div>
</div>

10
src/scss/_junk-drawer.scss
View file

@ -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;
}

3
src/scss/global/_typography.scss
View file

@ -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;