consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5752 from consuldemocracy/dependabot/bundler/sassc-embedded-1.80.1

Browse Source 
Bump sassc-embedded from 1.70.1 to 1.80.1
This commit is contained in:
Sebastia
2024-11-06 13:16:42 +01:00
committed by GitHub
parent 601873f16f 64bcedc8b2
commit 1c684c3daf
12 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -47,7 +47,7 @@ gem "redcarpet", "~> 3.6.0"
gem "responders", "~> 3.1.1" gem "responders", "~> 3.1.1"
gem "rinku", "~> 2.0.6", require: "rails_rinku" gem "rinku", "~> 2.0.6", require: "rails_rinku"
gem "ros-apartment", "~> 2.11.0", require: "apartment" # Remove ConnectionHandling monkey patch when upgrading gem "ros-apartment", "~> 2.11.0", require: "apartment" # Remove ConnectionHandling monkey patch when upgrading
gem "sassc-embedded", "~> 1.70.1" gem "sassc-embedded", "~> 1.80.1"
gem "sassc-rails", "~> 2.1.2" gem "sassc-rails", "~> 2.1.2"
gem "savon", "~> 2.15.1" gem "savon", "~> 2.15.1"
gem "sitemap_generator", "~> 6.3.0" gem "sitemap_generator", "~> 6.3.0"

14
Gemfile.lock
View File

@@ -249,7 +249,7 @@ GEM
request_store (~> 1.0) request_store (~> 1.0)
globalize-accessors (0.3.0) globalize-accessors (0.3.0)
globalize (>= 5.0.0) globalize (>= 5.0.0)
google-protobuf (4.27.5) google-protobuf (4.28.3)
bigdecimal bigdecimal
rake (>= 13) rake (>= 13)
graphiql-rails (1.8.0) graphiql-rails (1.8.0)
@@ -583,13 +583,13 @@ GEM
capistrano (~> 3.0) capistrano (~> 3.0)
sshkit (>= 1.2) sshkit (>= 1.2)
safely_block (0.4.1) safely_block (0.4.1)
sass-embedded (1.72.0) sass-embedded (1.80.4)
google-protobuf (>= 3.25, < 5.0) google-protobuf (~> 4.28)
rake (>= 13.0.0) rake (>= 13)
sassc (2.4.0) sassc (2.4.0)
ffi (~> 1.9) ffi (~> 1.9)
sassc-embedded (1.70.1) sassc-embedded (1.80.1)
sass-embedded (~> 1.70) sass-embedded (~> 1.80)
sassc-rails (2.1.2) sassc-rails (2.1.2)
railties (>= 4.0.0) railties (>= 4.0.0)
sassc (>= 2.0) sassc (>= 2.0)
@@ -781,7 +781,7 @@ DEPENDENCIES
rubocop-rspec (~> 3.1.0) rubocop-rspec (~> 3.1.0)
rubocop-rspec_rails (~> 2.30.0) rubocop-rspec_rails (~> 2.30.0)
rvm1-capistrano3 (~> 1.4.0) rvm1-capistrano3 (~> 1.4.0)
sassc-embedded (~> 1.70.1) sassc-embedded (~> 1.80.1)
sassc-rails (~> 2.1.2) sassc-rails (~> 2.1.2)
savon (~> 2.15.1) savon (~> 2.15.1)
selenium-webdriver (~> 4.25.0) selenium-webdriver (~> 4.25.0)

6
app/assets/stylesheets/_consul_settings.scss
View File

@@ -1,3 +1,5 @@
@use "sass:color";
// CONSUL DEMOCRACY Settings // CONSUL DEMOCRACY Settings
// ----------------------------- // -----------------------------
// //
@@ -63,7 +65,7 @@ $tiny-font-size: rem-calc(12) !default;
$font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-serif: Georgia, "Times New Roman", Times, serif !default;
$brand: #004a83 !default; $brand: #004a83 !default;
$brand-secondary: darken($brand, 10%) !default; $brand-secondary: color.adjust($brand, $lightness: -10%) !default;
$text-medium: #515151 !default; $text-medium: #515151 !default;
$text-light: #bfbfbf !default; $text-light: #bfbfbf !default;
@@ -154,7 +156,7 @@ $sdg-colors: (
// --------------------------------------------------------------- // ---------------------------------------------------------------
$anchor-color: $brand !default; $anchor-color: $brand !default;
$anchor-color-hover: darken($anchor-color, 20%) !default; $anchor-color-hover: color.adjust($anchor-color, $lightness: -20%) !default;
$tab-background-active: $white !default; $tab-background-active: $white !default;

10
app/assets/stylesheets/_settings.scss
View File

@@ -1,3 +1,5 @@
@use "sass:color";
// Foundation for Sites Settings // Foundation for Sites Settings
// ----------------------------- // -----------------------------
// //
@@ -773,15 +775,15 @@ $table-color-scale: 5% !default;
$table-border: 1px solid smart-scale($table-background, $table-color-scale) !default; $table-border: 1px solid smart-scale($table-background, $table-color-scale) !default;
$table-padding: rem-calc(8 10 10) !default; $table-padding: rem-calc(8 10 10) !default;
$table-hover-scale: 2% !default; $table-hover-scale: 2% !default;
$table-row-hover: darken($table-background, $table-hover-scale) !default; $table-row-hover: color.adjust($table-background, $lightness: -1 * $table-hover-scale) !default;
$table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale) !default; $table-row-stripe-hover: color.adjust($table-background, $lightness: -1 * ($table-color-scale + $table-hover-scale)) !default;
$table-is-striped: true !default; $table-is-striped: true !default;
$table-striped-background: smart-scale($table-background, $table-color-scale) !default; $table-striped-background: smart-scale($table-background, $table-color-scale) !default;
$table-stripe: even !default; $table-stripe: even !default;
$table-head-background: smart-scale($table-background, $table-color-scale * 0.5) !default; $table-head-background: smart-scale($table-background, $table-color-scale * 0.5) !default;
$table-head-row-hover: darken($table-head-background, $table-hover-scale) !default; $table-head-row-hover: color.adjust($table-head-background, $lightness: -1 * $table-hover-scale) !default;
$table-foot-background: smart-scale($table-background, $table-color-scale) !default; $table-foot-background: smart-scale($table-background, $table-color-scale) !default;
$table-foot-row-hover: darken($table-foot-background, $table-hover-scale) !default; $table-foot-row-hover: color.adjust($table-foot-background, $lightness: -1 * $table-hover-scale) !default;
$table-head-font-color: $body-font-color !default; $table-head-font-color: $body-font-color !default;
$table-foot-font-color: $body-font-color !default; $table-foot-font-color: $body-font-color !default;
$show-header-for-stacked: false !default; $show-header-for-stacked: false !default;

6
app/assets/stylesheets/admin.scss
View File

@@ -1,3 +1,5 @@
@use "sass:color";
// Table of Contents // Table of Contents
// //
// 01. Global styles // 01. Global styles
@@ -131,7 +133,7 @@ $table-header: #ecf1f6;
border: $table-border; border: $table-border;
&:hover { &:hover {
background: adjust-color(darken($table-background, 2%), $red: -4, $green: -1); background: color.adjust(color.adjust($table-background, $lightness: -2%), $red: -4, $green: -1);
} }
} }
@@ -356,7 +358,7 @@ code {
&:active, &:active,
&:focus { &:focus {
border-bottom-color: transparent; border-bottom-color: transparent;
color: darken($delete, 10%); color: color.adjust($delete, $lightness: -10%);
} }
} }

2
app/assets/stylesheets/admin/locales/form.scss
View File

@@ -13,7 +13,7 @@
> select + fieldset, > select + fieldset,
> fieldset + fieldset { > fieldset + fieldset {
margin-top: $line-height / 2; margin-top: calc($line-height / 2);
} }
> [type="hidden"] + fieldset, > [type="hidden"] + fieldset,

4
app/assets/stylesheets/layout.scss
View File

@@ -1,3 +1,5 @@
@use "sass:color";
// Table of Contents // Table of Contents
// //
// 01. Global styles // 01. Global styles
@@ -1238,7 +1240,7 @@ table {
} }
&:nth-child(even) { &:nth-child(even) {
background: adjust-color($table-background, $red: -3, $green: -1, $blue: -2); background: color.adjust($table-background, $red: -3, $green: -1, $blue: -2);
} }
} }

6
app/assets/stylesheets/mixins/icons.scss
View File

@@ -1,3 +1,5 @@
@use "sass:color";
%font-icon { %font-icon {
@extend %fa-icon; @extend %fa-icon;
font-family: "Font Awesome 5 Free"; font-family: "Font Awesome 5 Free";
@@ -1539,7 +1541,7 @@ $font-awesome-icons: (
.destroy-officer-link, .destroy-officer-link,
.reject-link, .reject-link,
.confirm-hide-link { .confirm-hide-link {
color: darken($alert-color, 5%); color: color.adjust($alert-color, $lightness: -5%);
} }
.show-link, .show-link,
@@ -1571,7 +1573,7 @@ $font-awesome-icons: (
.restore-link, .restore-link,
.investments-link { .investments-link {
color: darken($warning-color, 20%); color: color.adjust($warning-color, $lightness: -20%);
&:not(:hover, :focus)::before { &:not(:hover, :focus)::before {
color: $warning-color; color: $warning-color;

10
app/assets/stylesheets/participation.scss
View File

@@ -1,3 +1,5 @@
@use "sass:color";
// Table of Contents // Table of Contents
// //
// 01. Votes and supports // 01. Votes and supports
@@ -19,8 +21,8 @@
position: relative; position: relative;
.progress { .progress {
background: lighten($proposals, 35%); background: color.adjust($proposals, $lightness: 35%);
border: 1px solid lighten($proposals, 35%); border: 1px solid color.adjust($proposals, $lightness: 35%);
height: rem-calc(14); height: rem-calc(14);
position: relative; position: relative;
@@ -59,7 +61,7 @@
&:hover, &:hover,
&:active { &:active {
background: lighten($proposals, 25%); background: color.adjust($proposals, $lightness: 25%);
cursor: pointer; cursor: pointer;
} }
} }
@@ -899,7 +901,7 @@
a, a,
.info { .info {
color: lighten($body-font-color, 15%); color: color.adjust($body-font-color, $lightness: 15%);
font-size: $small-font-size; font-size: $small-font-size;
} }
} }

4
app/assets/stylesheets/sdg/tag_list.scss
View File

@@ -1,3 +1,5 @@
@use "sass:color";
.sdg-tag-list { .sdg-tag-list {
.sdg-goal-tag-list { .sdg-goal-tag-list {
@@ -21,7 +23,7 @@
background-color: $color; background-color: $color;
&:hover { &:hover {
background-color: darken($color, 10%); background-color: color.adjust($color, $lightness: -10%);
} }
} }

4
app/assets/stylesheets/shared/map_location.scss
View File

@@ -1,3 +1,5 @@
@use "sass:color";
.map-location-remove-marker { .map-location-remove-marker {
border-bottom: 1px dotted; border-bottom: 1px dotted;
border-radius: 0; border-radius: 0;
@@ -10,7 +12,7 @@
&:active, &:active,
&:focus { &:focus {
border-bottom-style: solid; border-bottom-style: solid;
color: darken($delete, 10%); color: color.adjust($delete, $lightness: -10%);
} }
} }

6
config/initializers/sass.rb
View File

@@ -1,8 +1,10 @@
# TODO: remove once we upgrade Foundation and Font Awesome # TODO: Remove quiet_deps once we upgrade Foundation and Font Awesome,
# and remove silence_deprecations once we migrate away from Sass @import rules,
# which will be removed in Dart Sass 3.0.0.
SassC::Engine.class_eval do SassC::Engine.class_eval do
alias_method :original_initialize, :initialize alias_method :original_initialize, :initialize
def initialize(template, options = {}) def initialize(template, options = {})
original_initialize(template, options.merge(quiet_deps: true)) original_initialize(template, options.merge(quiet_deps: true, silence_deprecations: [:import]))
end end
end end