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

Fix deprecation warnings for dart sass #1254

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

Fix deprecation warnings for dart sass #1254

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
4 changes: 3 additions & 1 deletion assets/stylesheets/bootstrap/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:color";

@use "sass:math";
//
// Forms
Expand Down Expand Up @@ -445,7 +447,7 @@ textarea.form-control {
display: block; // account for any element using help-block
margin-top: 5px;
margin-bottom: 10px;
color: lighten($text-color, 25%); // lighten the text some for contrast
color: color.adjust($text-color, $lightness: 25%, $space: hsl); // lighten the text some for contrast
}


Expand Down
4 changes: 3 additions & 1 deletion assets/stylesheets/bootstrap/_jumbotron.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:color";

@use "sass:math";
//
// Jumbotron
Expand All @@ -23,7 +25,7 @@
}

> hr {
border-top-color: darken($jumbotron-bg, 10%);
border-top-color: color.adjust($jumbotron-bg, $lightness: -10%, $space: hsl);
}

.container &,
Expand Down
19 changes: 11 additions & 8 deletions assets/stylesheets/bootstrap/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:color";

@use "sass:math";
//
// Navbars
Expand Down Expand Up @@ -90,6 +92,12 @@

.navbar-fixed-top,
.navbar-fixed-bottom {
// Fix the top/bottom navbars when screen real estate supports it
position: fixed;
right: 0;
left: 0;
z-index: $zindex-navbar-fixed;

.navbar-collapse {
max-height: $navbar-collapse-max-height;

Expand All @@ -98,12 +106,6 @@
}
}

// Fix the top/bottom navbars when screen real estate supports it
position: fixed;
right: 0;
left: 0;
z-index: $zindex-navbar-fixed;

// Undo the rounded corners
@media (min-width: $grid-float-breakpoint) {
border-radius: 0;
Expand Down Expand Up @@ -194,12 +196,13 @@
float: right;
padding: 9px 10px;
margin-right: $navbar-padding-horizontal;
@include navbar-vertical-align(34px);
background-color: transparent;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid transparent;
border-radius: $border-radius-base;

@include navbar-vertical-align(34px);

// We remove the `outline` here, but later compensate by attaching `:hover`
// styles to `:focus`.
&:focus {
Expand Down Expand Up @@ -630,7 +633,7 @@

.navbar-collapse,
.navbar-form {
border-color: darken($navbar-inverse-bg, 7%);
border-color: color.adjust($navbar-inverse-bg, $lightness: -7%, $space: hsl);
}

.navbar-link {
Expand Down
4 changes: 3 additions & 1 deletion assets/stylesheets/bootstrap/_popovers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:color";

//
// Popovers
// --------------------------------------------------
Expand Down Expand Up @@ -117,7 +119,7 @@
margin: 0; // reset heading margin
font-size: $font-size-base;
background-color: $popover-title-bg;
border-bottom: 1px solid darken($popover-title-bg, 5%);
border-bottom: 1px solid color.adjust($popover-title-bg, $lightness: -5%, $space: hsl);
border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
}

Expand Down
52 changes: 27 additions & 25 deletions assets/stylesheets/bootstrap/_theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:color";

/*!
* Bootstrap v3.4.1 (https://getbootstrap.com/)
* Copyright 2011-2019 Twitter, Inc.
Expand Down Expand Up @@ -46,21 +48,21 @@

// Mixin for generating new styles
@mixin btn-styles($btn-color: #555) {
@include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
@include gradient-vertical($start-color: $btn-color, $end-color: color.adjust($btn-color, $lightness: -12%, $space: hsl));
@include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners; see https://github.com/twbs/bootstrap/issues/10620
background-repeat: repeat-x;
border-color: darken($btn-color, 14%);
border-color: color.adjust($btn-color, $lightness: -14%, $space: hsl);

&:hover,
&:focus {
background-color: darken($btn-color, 12%);
background-color: color.adjust($btn-color, $lightness: -12%, $space: hsl);
background-position: 0 -15px;
}

&:active,
&.active {
background-color: darken($btn-color, 12%);
border-color: darken($btn-color, 14%);
background-color: color.adjust($btn-color, $lightness: -12%, $space: hsl);
border-color: color.adjust($btn-color, $lightness: -14%, $space: hsl);
}

&.disabled,
Expand All @@ -72,7 +74,7 @@
&.focus,
&:active,
&.active {
background-color: darken($btn-color, 12%);
background-color: color.adjust($btn-color, $lightness: -12%, $space: hsl);
background-image: none;
}
}
Expand Down Expand Up @@ -116,14 +118,14 @@

.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
@include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%));
background-color: darken($dropdown-link-hover-bg, 5%);
@include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: color.adjust($dropdown-link-hover-bg, $lightness: -5%, $space: hsl));
background-color: color.adjust($dropdown-link-hover-bg, $lightness: -5%, $space: hsl);
}
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
@include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
background-color: darken($dropdown-link-active-bg, 5%);
@include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: color.adjust($dropdown-link-active-bg, $lightness: -5%, $space: hsl));
background-color: color.adjust($dropdown-link-active-bg, $lightness: -5%, $space: hsl);
}


Expand All @@ -133,15 +135,15 @@

// Default navbar
.navbar-default {
@include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
@include gradient-vertical($start-color: color.adjust($navbar-default-bg, $lightness: 10%, $space: hsl), $end-color: $navbar-default-bg);
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
border-radius: $navbar-border-radius;
$shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
@include box-shadow($shadow);

.navbar-nav > .open > a,
.navbar-nav > .active > a {
@include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%));
@include gradient-vertical($start-color: color.adjust($navbar-default-link-active-bg, $lightness: -5%, $space: hsl), $end-color: color.adjust($navbar-default-link-active-bg, $lightness: -2%, $space: hsl));
@include box-shadow(inset 0 3px 9px rgba(0, 0, 0, .075));
}
}
Expand All @@ -152,12 +154,12 @@

// Inverted navbar
.navbar-inverse {
@include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
@include gradient-vertical($start-color: color.adjust($navbar-inverse-bg, $lightness: 10%, $space: hsl), $end-color: $navbar-inverse-bg);
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
border-radius: $navbar-border-radius;
.navbar-nav > .open > a,
.navbar-nav > .active > a {
@include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
@include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: color.adjust($navbar-inverse-link-active-bg, $lightness: 2.5%, $space: hsl));
@include box-shadow(inset 0 3px 9px rgba(0, 0, 0, .25));
}

Expand All @@ -181,7 +183,7 @@
&:hover,
&:focus {
color: #fff;
@include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
@include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: color.adjust($dropdown-link-active-bg, $lightness: -5%, $space: hsl));
}
}
}
Expand All @@ -200,8 +202,8 @@

// Mixin for generating new styles
@mixin alert-styles($color) {
@include gradient-vertical($start-color: $color, $end-color: darken($color, 7.5%));
border-color: darken($color, 15%);
@include gradient-vertical($start-color: $color, $end-color: color.adjust($color, $lightness: -7.5%, $space: hsl));
border-color: color.adjust($color, $lightness: -15%, $space: hsl);
}

// Apply the mixin to the alerts
Expand All @@ -217,12 +219,12 @@

// Give the progress background some depth
.progress {
@include gradient-vertical($start-color: darken($progress-bg, 4%), $end-color: $progress-bg)
@include gradient-vertical($start-color: color.adjust($progress-bg, $lightness: -4%, $space: hsl), $end-color: $progress-bg)
}

// Mixin for generating new styles
@mixin progress-bar-styles($color) {
@include gradient-vertical($start-color: $color, $end-color: darken($color, 10%));
@include gradient-vertical($start-color: $color, $end-color: color.adjust($color, $lightness: -10%, $space: hsl));
}

// Apply the mixin to the progress bars
Expand Down Expand Up @@ -250,9 +252,9 @@
.list-group-item.active,
.list-group-item.active:hover,
.list-group-item.active:focus {
text-shadow: 0 -1px 0 darken($list-group-active-bg, 10%);
@include gradient-vertical($start-color: $list-group-active-bg, $end-color: darken($list-group-active-bg, 7.5%));
border-color: darken($list-group-active-border, 7.5%);
text-shadow: 0 -1px 0 color.adjust($list-group-active-bg, $lightness: -10%, $space: hsl);
@include gradient-vertical($start-color: $list-group-active-bg, $end-color: color.adjust($list-group-active-bg, $lightness: -7.5%, $space: hsl));
border-color: color.adjust($list-group-active-border, $lightness: -7.5%, $space: hsl);

.badge {
text-shadow: none;
Expand All @@ -271,7 +273,7 @@

// Mixin for generating new styles
@mixin panel-heading-styles($color) {
@include gradient-vertical($start-color: $color, $end-color: darken($color, 5%));
@include gradient-vertical($start-color: $color, $end-color: color.adjust($color, $lightness: -5%, $space: hsl));
}

// Apply the mixin to the panel headings only
Expand All @@ -288,8 +290,8 @@
// --------------------------------------------------

.well {
@include gradient-vertical($start-color: darken($well-bg, 5%), $end-color: $well-bg);
border-color: darken($well-bg, 10%);
@include gradient-vertical($start-color: color.adjust($well-bg, $lightness: -5%, $space: hsl), $end-color: $well-bg);
border-color: color.adjust($well-bg, $lightness: -10%, $space: hsl);
$shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
@include box-shadow($shadow);
}
Loading