From d462f34e75399eca6a5608127e476bb0a9fe47de Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 9 May 2014 16:42:31 +1000 Subject: [PATCH] Refactor friday - tidying up and commenting css --- app/assets/stylesheets/darkswarm/producers.css.sass | 1 - app/assets/stylesheets/darkswarm/typography.css.sass | 2 +- app/assets/stylesheets/darkswarm/ui.css.sass | 10 +++++++--- app/assets/stylesheets/darkswarm/variables.css.sass | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/producers.css.sass b/app/assets/stylesheets/darkswarm/producers.css.sass index 1b915e129c..96a42a3a6b 100644 --- a/app/assets/stylesheets/darkswarm/producers.css.sass +++ b/app/assets/stylesheets/darkswarm/producers.css.sass @@ -1,6 +1,5 @@ @import branding @import mixins - .producers @include fullwidthbg diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass index 3ab8acc810..abbfdca7cd 100644 --- a/app/assets/stylesheets/darkswarm/typography.css.sass +++ b/app/assets/stylesheets/darkswarm/typography.css.sass @@ -18,7 +18,7 @@ src: url("/AvenirLTStd-Medium.otf") format("opentype") body - font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif + font-family: 'Open Sans', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif a color: $clr-brick diff --git a/app/assets/stylesheets/darkswarm/ui.css.sass b/app/assets/stylesheets/darkswarm/ui.css.sass index d05bf0f8c4..38b0442d09 100644 --- a/app/assets/stylesheets/darkswarm/ui.css.sass +++ b/app/assets/stylesheets/darkswarm/ui.css.sass @@ -2,6 +2,8 @@ @import branding @import mixins +// Button class extensions + .neutral-btn @include button font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif @@ -39,10 +41,10 @@ background-color: rgba(0, 0, 0, 0.1) text-shadow: 0 1px 0 #fff -//rewrite default primary style +// Rewrite foundation's .primary button style .button.primary, button.primary - font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif + font-family: 'Open Sans', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif background: $clr-brick color: white @@ -53,4 +55,6 @@ // Responsive @media screen and (min-width: 768px) [role="main"] - padding: 0 \ No newline at end of file + padding: 0 + + diff --git a/app/assets/stylesheets/darkswarm/variables.css.sass b/app/assets/stylesheets/darkswarm/variables.css.sass index e69de29bb2..1020f7cbaa 100644 --- a/app/assets/stylesheets/darkswarm/variables.css.sass +++ b/app/assets/stylesheets/darkswarm/variables.css.sass @@ -0,0 +1 @@ +// necessary; user to overwrite Foundation variables css \ No newline at end of file