added comments in the base module and fix conflicts in the code module

This commit is contained in:
CJ Patoilo 2016-01-06 03:49:32 -03:00
commit 9dbe987278
2 changed files with 5 additions and 4 deletions

View File

@ -8,16 +8,17 @@ html
box-sizing: border-box
font-size: 62.5%
// Default body styles
body
color: $color-secondary
font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif
font-family: 'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif
font-size: 1.6em // currently ems cause chrome bug misinterpreting rems on body element
font-weight: 300
letter-spacing: .01em
line-height: 1.6
// Box Sizing FTW
// Set box-sizing globally to handle padding and border widths
*,
*:after,
*:before
box-sizing: border-box
box-sizing: inherit

View File

@ -13,7 +13,7 @@ code
pre
background: $color-tertiary
border-left: .3rem solid $color-primary
font-family: Menlo, Consolas, 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', Monaco, monospace
font-family: 'Menlo', 'Consolas', 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', monospace
& > code
background: transparent