Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Migrate SASS warnings #672

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Migrate SASS warnings #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions client/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:color";
/**
* CSS Variables
*/
Expand All @@ -9,31 +10,31 @@ $borders: #dadada;
$borders-forms: #ced4da;
$tabs: #bbb;
$text: #1f3038;
$text-light: change-color($text, $alpha: .7);
$text-lighter: change-color($text, $alpha: .5);
$text-lightest: change-color($text, $alpha: .3);
$text-light: color.change($text, $alpha: .7);
$text-lighter: color.change($text, $alpha: .5);
$text-lightest: color.change($text, $alpha: .3);
$text-alt: #d90023;
$text-alt-light: #ec3955;

$white-lighter: change-color(white, $alpha: .9);
$white-lighter: color.change(white, $alpha: .9);

$main: #00abd6;
$main-light: change-color($main, $lightness: 46%);
$main-lighter: change-color($main, $lightness: 85%);
$main-dark: change-color($main, $lightness: 32%);
$main-transparent: change-color($main, $alpha: .1);
$main-light: color.change($main, $lightness: 46%);
$main-lighter: color.change($main, $lightness: 85%);
$main-dark: color.change($main, $lightness: 32%);
$main-transparent: color.change($main, $alpha: .1);

$alt: #f2536d;
$alt-light: #f47171;
$alt-lighter: change-color($alt, $alpha: .25);
$alt-lighter: color.change($alt, $alpha: .25);
$alt-lightest: #ffded6;
$alt-dark: change-color($alt, $lightness: 42%);
$alt-transparent: change-color($alt, $alpha: .1);
$alt-dark: color.change($alt, $lightness: 42%);
$alt-transparent: color.change($alt, $alpha: .1);

$neutral: #999;
$neutral-dark: change-color($neutral, $lightness: 40%);
$neutral-light: change-color($neutral, $alpha: .7);
$neutral-lighter: change-color($neutral, $alpha: .25);
$neutral-dark: color.change($neutral, $lightness: 40%);
$neutral-light: color.change($neutral, $alpha: .7);
$neutral-lighter: color.change($neutral, $alpha: .25);
$neutral-lightest: #e6e6e6;

$danger: #dc3545;
Expand All @@ -44,7 +45,7 @@ $moderation: $neutral;
$moderation-light: $neutral-lighter;
$moderation-lightest: $neutral-lightest;
$moderation-dark: $neutral-light;
$moderation-text: change-color(white, $alpha: .9);
$moderation-text: color.change(white, $alpha: .9);

/* Shared sizes */

Expand Down
20 changes: 10 additions & 10 deletions client/scss/bootstrap-custom.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "_variables";
@use "_variables";

$theme-colors: (
"primary": $main,
"primary": variables.$main,
);

.container {
Expand All @@ -10,11 +10,11 @@ $theme-colors: (

.list-group {
& > a {
color: $text;
color: variables.$text;

&:hover {
color: $text;
background-color: $neutral-lightest;
color: variables.$text;
background-color: variables.$neutral-lightest;
}
}

Expand All @@ -30,17 +30,17 @@ $theme-colors: (
@media (min-width: 768px) {
.nav.nav-tabs {
width: 100%;
border-bottom: 1px solid $tabs;
border-bottom: 1px solid variables.$tabs;

& .nav-link {
border: 0 solid $tabs;
color: $neutral-dark;
border: 0 solid variables.$tabs;
color: variables.$neutral-dark;

&.active {
background-color: transparent !important;
border-width: 1px;
border-color: $tabs;
border-bottom-color: $bg;
border-color: variables.$tabs;
border-bottom-color: variables.$bg;
}
}
}
Expand Down
31 changes: 31 additions & 0 deletions client/scss/breakpoints.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
@mixin media-breakpoint-up($breakpoint) {
@if $breakpoint == md {
@media (min-width: 768px) {
@content;
}
} @else if $breakpoint == lg {
@media (min-width: 992px) {
@content;
}
} @else if $breakpoint == xl {
@media (min-width: 1200px) {
@content;
}
}
}

@mixin media-breakpoint-down($breakpoint) {
@if $breakpoint == md {
@media (max-width: 767.98px) {
@content;
}
} @else if $breakpoint == lg {
@media (max-width: 991.98px) {
@content;
}
} @else if $breakpoint == xl {
@media (max-width: 1199.98px) {
@content;
}
}
}
Loading