diff options
| author | luxagraf <sng@luxagraf.net> | 2015-01-12 22:06:39 -0500 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2015-01-12 22:06:39 -0500 |
| commit | 48d18d26354708d33d173fb09cf326f799ec1d42 (patch) | |
| tree | 3fbb4bfefa874194e7732365d2f1e604d94e8880 /design/sass | |
| parent | 8be4b5e7d95b4b32967fb256d7ce9ef8f0dff1d0 (diff) | |
got rid of older flexbox syntax in favor of baked in version on compass 1.0
Diffstat (limited to 'design/sass')
| -rw-r--r-- | design/sass/_global.scss | 10 | ||||
| -rw-r--r-- | design/sass/screenv8.scss | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/design/sass/_global.scss b/design/sass/_global.scss index dcc1c29..5e746e1 100644 --- a/design/sass/_global.scss +++ b/design/sass/_global.scss @@ -47,6 +47,16 @@ time { } } +pre { + @include constrain_narrow(); + text-align: left; + @include breakpoint(alpha){ + @include fontsize(18); + line-height: 1.5; + margin-top: 2em; + margin-bottom: 2em; + } +} object, embed { max-width: 100%; height: auto; diff --git a/design/sass/screenv8.scss b/design/sass/screenv8.scss index 931f107..cda3c75 100644 --- a/design/sass/screenv8.scss +++ b/design/sass/screenv8.scss @@ -1,4 +1,5 @@ -@import 'flexbox'; //Flexbox relies on https://github.com/timhettler/compass-flexbox +//@import 'flexbox'; //Flexbox relies on https://github.com/timhettler/compass-flexbox +@import "compass/css3/flexbox"; @import "_normalize.scss"; @import "_fonts.scss"; @import "_mixins.scss"; |