From a3b9fe6171ed4cee2c7af8265d4d5dfa9312a443 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 27 May 2016 09:50:46 +0100 Subject: [PATCH] More cleanup of scss --- theme/static/src/scss/homepage.scss | 4 ---- theme/static/src/scss/index.scss | 11 +++++------ theme/static/src/scss/library-overrides.scss | 17 ++++++----------- theme/static/src/scss/variables.scss | 7 +++---- 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/theme/static/src/scss/homepage.scss b/theme/static/src/scss/homepage.scss index ba9ab0d..0ad82c8 100644 --- a/theme/static/src/scss/homepage.scss +++ b/theme/static/src/scss/homepage.scss @@ -1,7 +1,3 @@ -/* - Homepage specific styles -*/ - .portfolio-box { background-color: $brand-grey-dark; max-width: initial; diff --git a/theme/static/src/scss/index.scss b/theme/static/src/scss/index.scss index 947209f..c76d8a4 100644 --- a/theme/static/src/scss/index.scss +++ b/theme/static/src/scss/index.scss @@ -1,32 +1,27 @@ @import "variables"; // Import variables before anything else -/* @group Fonts */ +/* @group Fonts */ @import url("https://fonts.googleapis.com/css?family=Roboto:400,700,300,300italic,400italic,700italic"); @import url("http://fonts.googleapis.com/css?family=Open+Sans:400,700,300,300italic,400italic,700italic"); - /* @end Fonts */ /* @group Libraries */ - @import "node_modules/bootstrap-sass/assets/stylesheets/_bootstrap"; @import "node_modules/animate.css/animate"; $fa-font-path: "../fonts"; @import "node_modules/font-awesome/scss/font-awesome"; - /* @end Libraries */ /* @group Other Imports */ - @import "creative/creative"; @import "pygment"; @import "homepage"; @import "footer"; @import "library-overrides"; - /* @end Other Imports */ @@ -39,3 +34,7 @@ p a { text-decoration: underline; color: inherit; } + +.btn i { + margin: 0 3px; +} diff --git a/theme/static/src/scss/library-overrides.scss b/theme/static/src/scss/library-overrides.scss index 7fadc55..8264fbd 100644 --- a/theme/static/src/scss/library-overrides.scss +++ b/theme/static/src/scss/library-overrides.scss @@ -1,38 +1,34 @@ /* @group Bootstrap Panels */ - .panel-green { @include panel-variant(#139F5B, $white, #139F5B, #139F5B); } - .panel-blue { @include panel-variant(#337AB7, $white, #337AB7, #337AB7); } - - /* @end Bootstrap Panels */ -/* @group groupname */ - +/* @group Bootstrap buttons */ .btn { border-radius: 0; } -/* @end groupname */ +.btn.btn-github { + @include button-variant(#333, #F5F5F5, #D8D8D8); +} +/* @end Bootstrap buttons */ /* @group Pygments */ - .highlight > pre { background-color: transparent; font-size: $font-size-base; } - /* @end Pygments */ -/* @group backgrounds */ +/* @group backgrounds */ .btn-primary-dark { @include button-variant($white, $brand-orange-dark, $brand-orange-dark); } @@ -42,5 +38,4 @@ color: $brand-grey-dark; } } - /* @end backgrounds */ diff --git a/theme/static/src/scss/variables.scss b/theme/static/src/scss/variables.scss index be452cc..7734011 100644 --- a/theme/static/src/scss/variables.scss +++ b/theme/static/src/scss/variables.scss @@ -3,18 +3,17 @@ $brand-orange: #F05F40; $brand-orange-dark: darken($brand-orange, 10%); $brand-grey-dark: #333; + /* @group General Colours */ - $white: #FFF; - /* @end General Colours */ + $footer-height: 175px; $font-family-heading: "Open Sans", "Helvetica Neue", Arial, sans-serif; -/* @group Bootstrap Overrides */ +/* @group Bootstrap Overrides */ $font-family-base: "Roboto", "Helvetica Neue", Arial, sans-serif; $brand-primary: $brand-orange; - /* @end Bootstrap Overrides */