From 10a2412e20669307a1050fe19d3a710fc838359d Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 19 May 2016 16:25:10 +0200 Subject: [PATCH] Removes unused scss --- app/assets/stylesheets/_settings.scss | 54 ++++---------- .../stylesheets/annotator_overrides.scss | 4 +- app/assets/stylesheets/layout.scss | 70 ++++-------------- app/assets/stylesheets/mixins.scss | 72 ++----------------- app/assets/stylesheets/participation.scss | 9 +-- 5 files changed, 37 insertions(+), 172 deletions(-) diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index 6525e7381..f1fcfd851 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -59,11 +59,11 @@ $foundation-palette: ( $light-gray: #e6e6e6; $medium-gray: #cacaca; $dark-gray: #8a8a8a; -$black: #0a0a0a; +$black: #222222; $white: #fefefe; -$body-background: $white; +$body-background: white; $body-font-color: $black; -$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; +$body-font-family: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif !important; $body-antialiased: true; $global-margin: 1rem; $global-padding: 1rem; @@ -107,20 +107,20 @@ $header-font-style: normal; $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; $header-sizes: ( small: ( - 'h1': 24, - 'h2': 20, - 'h3': 19, + 'h1': 34, + 'h2': 24, + 'h3': 20, 'h4': 18, - 'h5': 17, - 'h6': 16, + 'h5': 16, + 'h6': 14, ), medium: ( - 'h1': 48, - 'h2': 40, - 'h3': 31, - 'h4': 25, - 'h5': 20, - 'h6': 16, + 'h1': 44, + 'h2': 34, + 'h3': 24, + 'h4': 19, + 'h5': 16, + 'h6': 13, ), ); $header-color: inherit; @@ -567,35 +567,9 @@ $topbar-unstack-breakpoint: medium; // 37. Custom variables // -------------------- -$font-logo: 'Lato' !important; -$font-sans: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif !important; - -$font-normal: 400; -$font-bold: 700; - $base-font-size: rem-calc(17); $base-line-height: rem-calc(26); - -$h1-font-size: rem-calc(44); -$h1-line-height: rem-calc(57); - -$h2-font-size: rem-calc(34); -$h2-line-height: rem-calc(44); - -$h3-font-size: rem-calc(24); -$h3-line-height: rem-calc(31); - -$h4-font-size: rem-calc(19); -$h4-line-height: rem-calc(25); - -$h5-font-size: rem-calc(16); -$h5-line-height: rem-calc(21); - -$h6-font-size: rem-calc(13); -$h6-line-height: rem-calc(17); - $small-font-size: rem-calc(14); -$tiny-font-size: rem-calc(10); $line-height: rem-calc(24); $brand: #004A83; diff --git a/app/assets/stylesheets/annotator_overrides.scss b/app/assets/stylesheets/annotator_overrides.scss index 0a8dd92bb..962cdefd7 100644 --- a/app/assets/stylesheets/annotator_overrides.scss +++ b/app/assets/stylesheets/annotator_overrides.scss @@ -24,7 +24,7 @@ border-radius: 0; bottom: $line-height; box-shadow: 0 0 5px rgba(0,0,0,0.05); - font-family: $font-sans; + font-family: $body-font-family; font-size: $base-font-size; line-height: $line-height; min-width: $line-height*13; @@ -57,7 +57,7 @@ border: none; box-shadow: none; color: $link; - font-family: $font-sans; + font-family: $body-font-family; font-size: $base-font-size; font-weight: normal; text-shadow: none; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 6197cf0e4..c7e2e9443 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -6,7 +6,7 @@ // 04. Tags // 05. Auth pages // 06. Forms -// 07. Alerts +// 07. Callout // 08. User account // 09. Search // 10. Official levels @@ -22,56 +22,18 @@ // 01. Global styles // ----------------- -*, html { - margin: 0; - padding: 0; -} - -html, body { - height: 100%; -} - body { - background: white; - color: $text; - font-family: $font-sans; font-size: $base-font-size; } h1, h2, h3, h4, h5, h6 { clear: both; - font-family: $font-sans; - font-weight: $font-bold; -} - -h1 { - @include h1(); -} - -h2 { - @include h2(); -} - -h3 { - @include h3(); -} - -h4 { - @include h4(); -} - -h5 { - @include h5(); -} - -h6 { - @include h6(); - font-weight: $font-normal; + font-weight: 700; } p { font-size: $base-font-size; - font-weight: $font-normal; + font-weight: 400; line-height: $base-line-height; } @@ -200,7 +162,7 @@ a { width: 100%; a.close { - font-size: $h2-font-size; + font-size: rem-calc(34); top: 20%; } } @@ -251,7 +213,9 @@ a { } .back, .icon-angle-left { - @include back; + clear: both; + color: $text-medium; + float: left; } // 02. Header @@ -488,7 +452,7 @@ footer { color: $footer-color; .logo a { - font-family: $font-logo; + font-family: 'Lato' !important; text-decoration: none; &:hover { @@ -519,8 +483,8 @@ footer { h2 a { border-bottom: 1px solid $footer-border; display: block; - font-size: $h3-font-size; - line-height: $h3-line-height; + font-size: rem-calc(24); + line-height: rem-calc(31); padding-bottom: $line-height/4; text-decoration: none; } @@ -657,7 +621,6 @@ form.locale-form { } form { - font-family: $font-sans; label { font-size: $base-font-size; @@ -744,11 +707,10 @@ form { } } -// 07. Alerts -// ---------- +// 07. Callout +// ----------- .callout { - font-family: $font-sans; font-size: $small-font-size; &.success, &.notice { @@ -901,13 +863,13 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar { } [class^="icon-"] { - font-size: $h4-font-size; + font-size: rem-calc(19); vertical-align: middle; } .icon-circle { color: #ecf00b; - font-size: $tiny-font-size; + font-size: rem-calc(10); position: absolute; right: 8px; top: 6px; @@ -1206,7 +1168,7 @@ table { .social { a { - font-size: $h3-font-size; + font-size: rem-calc(24); margin: 0 $line-height/2; text-decoration: none; @@ -1521,7 +1483,6 @@ table { .comment-votes { color: $text-medium; - font-family: $font-sans; font-size: $small-font-size; line-height: $line-height; @@ -1612,7 +1573,6 @@ table { .comment-info { color: $text-medium; - font-family: $font-sans; font-size: $small-font-size; margin-top: $line-height/4; vertical-align: middle; diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index 384185af9..b1947768b 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -1,21 +1,15 @@ // Table of Contents // -// 01. Mixins +// 01. Logo // -// 01. Mixins -// - - - - - - - - - - - - - - - - - - - - - - - - - - -@mixin back { - clear: both; - color: $text-medium; - float: left; -} +// 01. Logo +// -------- @mixin logo { color: white; - font-family: $font-logo; - font-size: $h3-font-size; + font-family: 'Lato' !important; + font-size: rem-calc(24); font-weight: lighter; @include breakpoint(small) { @@ -35,59 +29,3 @@ } } } - -@mixin h1 { - font-size: $h2-font-size; - line-height: $h2-line-height; - - @include breakpoint(small) { - font-size: $h1-font-size; - line-height: $h1-line-height; - } -} - -@mixin h2 { - font-size: $h3-font-size; - line-height: $h3-line-height; - - @include breakpoint(small) { - font-size: $h2-font-size; - line-height: $h2-line-height; - } -} - -@mixin h3 { - font-size: $h4-font-size; - line-height: $h4-line-height; - - @include breakpoint(small) { - font-size: $h3-font-size; - line-height: $h3-line-height; - } -} - -@mixin h4 { - font-size: $h5-font-size; - line-height: $h5-line-height; - - @include breakpoint(small) { - font-size: $h4-font-size; - line-height: $h4-line-height; - } -} - -@mixin h5 { - font-size: $h6-font-size; - line-height: $h6-line-height; - - @include breakpoint(small) { - font-size: $h5-font-size; - line-height: $h5-line-height; - } -} - -@mixin h6 { - font-size: $h6-font-size; - line-height: $h6-line-height; - text-transform: uppercase; -} \ No newline at end of file diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 848b3e5c4..502fe62aa 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -13,7 +13,6 @@ @mixin votes { background: $votes-bg; border-top: 1px solid $votes-border; - font-family: $font-sans; margin: 0 rem-calc(-12); padding: rem-calc(14) rem-calc(12); position: relative; @@ -157,7 +156,6 @@ @mixin supports { background: $proposals; border-top: 1px solid $proposals-border; - font-family: $font-sans; margin: 0 rem-calc(-12); padding: rem-calc(14) rem-calc(12); position: relative; @@ -278,10 +276,6 @@ .proposal-new, .proposal-edit, .spending-proposal-new, .spending-proposal-edit { - .back { - @include back; - } - .icon-debates { color: $debates; font-size: rem-calc(60); @@ -589,7 +583,6 @@ background: none; clear: both; display: block; - font-family: $font-sans; font-size: rem-calc(12); font-weight: bold; line-height: $line-height; @@ -945,7 +938,7 @@ a { color: $text; - font-size: $h3-font-size; + font-size: rem-calc(24); } }