From 4d34013cab91eb50f4c3b34b0530ff9f14b927d2 Mon Sep 17 00:00:00 2001 From: Andres Troiano Date: Tue, 31 May 2016 08:38:21 -0300 Subject: [PATCH] [Andres Troiano] - updated variables and colors --- sass/partials/_colors.scss | 11 +++++++++++ sass/partials/_variables.scss | 14 ++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sass/partials/_colors.scss b/sass/partials/_colors.scss index 64f9a43..01c2efe 100644 --- a/sass/partials/_colors.scss +++ b/sass/partials/_colors.scss @@ -1,3 +1,4 @@ +// EFFECTS PERCENTAGES $lighter-percentage: 80%; $light-percentage: 20%; $dark-percentage: 17%; @@ -5,19 +6,29 @@ $darker-percentage: 38%; // GENERIC COLORS $primary-aquamarine: #000000; +$secondary-aquamarine: #000000; $primary-blue: #000000; +$secondary-blue: #000000; $primary-purple: #000000; +$secondary-purple: #000000; $primary-gray: #000000; $secondary-gray: #000000; $tertiary-gray: #000000; $quaternary-gray: #000000; $primary-green: #000000; +$secondary-green: #000000; $primary-red: #000000; +$secondary-red: #000000; $primary-white: #000000; $secondary-white: #000000; $tertiary-white: #000000; +$quaternary-white: #000000; $primary-black: #000000; +$secondary-black: #000000; +$tertiary-black: #000000; +$quaternary-black: #000000; $primary-yellow: #000000; +$secondary-yellow: #000000; // PALETTE COLORS $primary: $primary-green; diff --git a/sass/partials/_variables.scss b/sass/partials/_variables.scss index b2b63c2..6f94a62 100644 --- a/sass/partials/_variables.scss +++ b/sass/partials/_variables.scss @@ -16,28 +16,18 @@ $grid-columns: 12 !default; // COLUMNS PADDING $grid-gutter-width: 30px !default; -// Navbar collapse -//** Point at which the navbar becomes uncollapsed. $grid-float-breakpoint: $screen-sm-min !default; -//** Point at which the navbar begins collapsing. $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default; - -// Small screen / tablet +// CONTAINER SIZES $container-tablet: (720px + $grid-gutter-width) !default; -//** For `$screen-sm-min` and up. $container-sm: $container-tablet !default; - -// Medium screen / desktop $container-desktop: (940px + $grid-gutter-width) !default; -//** For `$screen-md-min` and up. $container-md: $container-desktop !default; - -// Large screen / wide desktop $container-large-desktop: (1140px + $grid-gutter-width) !default; -//** For `$screen-lg-min` and up. $container-lg: $container-large-desktop !default; +// SHADOWS $shadow-depth-0: 0 2px 0 rgba(0,0,0,0.15); $shadow-depth-1: 0 2px 2px rgba(0,0,0,0.25); $shadow-depth-2: 0 3px 5px rgba(0,0,0,0.25);