Skip to content
This repository has been archived by the owner on Nov 10, 2020. It is now read-only.

Commit

Permalink
Merge pull request #676 from 18F/hound-syntax-edits
Browse files Browse the repository at this point in the history
hound syntax edits
  • Loading branch information
meiqimichelle committed Oct 28, 2015
2 parents 4c79cfa + 5cb881e commit 12efc8d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
27 changes: 12 additions & 15 deletions _sass/mixins/_type-mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,61 +13,58 @@
@if $level == h1 {
// bold 30/40
font-size: 1.875rem; // 30px
line-height: 2.5rem; // 40px
font-weight: $weight-bold;
@include respond-to(medium-up) {

}
line-height: 2.5rem; // 40px
}

@if $level == h2 {
// light 32/40
font-size: 2rem; // 32px
line-height: 2.5rem; // 40px
font-weight: $weight-light;
line-height: 2.5rem; // 40px
}

@if $level == h3 {
// bold 22/32
font-size: 1.375rem; // 22px
line-height: 2rem; // 32px
font-weight: $weight-bold;
line-height: 2rem; // 32px
}

@if $level == h4 {
// light 24/34
font-size: 1.5rem; // 24px
line-height: 2.125rem; // 34px
font-size: 1.5rem; // 24px
font-weight: $weight-light;
line-height: 2.125rem; // 34px
}

@if $level == h5 {
// bold 18/27
font-size: 1.125rem; // 18px
line-height: 1.6875rem; // 27px
font-weight: $weight-bold;
line-height: 1.6875rem; // 27px
}

@if $level == 'para-lg' {
// light 18/27 (10px bottom margin)
font-size: 1.125rem; // 18px
line-height: 1.6875rem; // 27px
font-weight: $weight-light;
margin-bottom: .625rem; // 10px
line-height: 1.6875rem; // 27px
margin-bottom: 0.625rem; // 10px
}
@if $level == 'para-md' {
font-size: $base-font-size; // 16px
line-height: $base-line-height; // 22px
font-weight: $weight-light; // light
margin-bottom: .625rem; // 10px
line-height: $base-line-height; // 22px
margin-bottom: 0.625rem; // 10px
// light 16/22 (10px bottom margin)
}
@if $level == 'para-sm' {
// light 13/19 (10px bottom margin)
font-size: 0.8125rem; // 13px
line-height: 1.1875rem; // 29px
font-weight: $weight-light;
margin-bottom: .625rem; // 10px
line-height: 1.1875rem; // 29px
margin-bottom: 0.625rem; // 10px
}
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"scripts": {
"test": "mocha",
"watch": "watchy -w '_sass' -- npm run build-styleguide",
"build-styleguide": "rm -rf styleguide && kss-node --config kss-config.json && cd eiti-template/ && npm run less",
"build-styleguide": "rm -rf styleguide && kss-node --config kss-config.json",
"init-styleguide": "npm-exec kss-node --config kss-config.json"
},
"repository": {
Expand Down

0 comments on commit 12efc8d

Please sign in to comment.