From 77b2f049baa54b8ebd8934f47ba5e7223982f315 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 21 Jul 2013 22:51:01 -0700 Subject: [PATCH] Now using Foundation Typography and inline lists. --- _assets/stylesheets/_style.sass | 8 +++----- _assets/stylesheets/_vars.sass | 3 +-- _assets/stylesheets/app.sass | 7 +++---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/_assets/stylesheets/_style.sass b/_assets/stylesheets/_style.sass index c263e28..b4b31d1 100644 --- a/_assets/stylesheets/_style.sass +++ b/_assets/stylesheets/_style.sass @@ -12,14 +12,13 @@ a width: 100% height: $banner_height margin: 0.2 * $banner_height auto - margin-bottom: 1em - padding-top: 0.5 * $banner_height + margin-bottom: 0.2em + padding-top: 0.3 * $banner_height background-color: $clr_blue_green #title color: $site_title_clr font-family: $site_title_font - font-size: $site_title_font_size font-weight: normal text-transform: lowercase &:before @@ -36,9 +35,8 @@ a #external display: inline-block - margin-top: emCalc( 10px ) ul - +horizontal-list + +inline-list #email_modal text-align: center diff --git a/_assets/stylesheets/_vars.sass b/_assets/stylesheets/_vars.sass index 1ec4691..0475aff 100644 --- a/_assets/stylesheets/_vars.sass +++ b/_assets/stylesheets/_vars.sass @@ -1,6 +1,5 @@ -$banner_height: emCalc( 100px ) +$banner_height: 100px $site_title_font: "CMUBright-Roman", sans-serf $site_title_clr: white -$site_title_font_size: 2em $site_title_font_weight: normal diff --git a/_assets/stylesheets/app.sass b/_assets/stylesheets/app.sass index a1c646c..2de6736 100644 --- a/_assets/stylesheets/app.sass +++ b/_assets/stylesheets/app.sass @@ -4,7 +4,7 @@ @import "compass/reset" // Assets, e.g. fonts, colors, images -@import "compass/css3" +@import "compass/css3/font-face" @import assets // Global Foundation Settings @@ -23,7 +23,7 @@ @import "foundation/components/grid" // @import "foundation/components/visibility" // @import "foundation/components/block-grid" -// @import "foundation/components/type" +@import "foundation/components/type" // @import "foundation/components/buttons" // @import "foundation/components/forms" // @import "foundation/components/custom-forms" @@ -41,7 +41,7 @@ // @import "foundation/components/breadcrumbs" // @import "foundation/components/keystrokes" // @import "foundation/components/labels" -// @import "foundation/components/inline-lists" +@import "foundation/components/inline-lists" // @import "foundation/components/pagination" // @import "foundation/components/panels" // @import "foundation/components/pricing-tables" @@ -55,6 +55,5 @@ // @import "foundation/components/tooltips" // @import "foundation/components/dropdown" -@import "compass/typography/lists/horizontal-list" @import "vars" @import "style"