Skip to content

Commit

Permalink
Upgrade decidim and fix stylesheet packs
Browse files Browse the repository at this point in the history
  • Loading branch information
@fblupi
fblupi committed Oct 2, 2023
1 parent 057a7a0 commit 22bc9af
Show file tree
Hide file tree
Showing 5 changed files with 381 additions and 102 deletions.
3 changes: 1 addition & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
source "https://rubygems.org"

ruby RUBY_VERSION
# DECIDIM_VERSION = { git: "https://github.com/decidim/decidim" }
DECIDIM_VERSION = "0.27.2"
DECIDIM_VERSION = "0.27.4"

gem "decidim", DECIDIM_VERSION

Expand Down
186 changes: 93 additions & 93 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ GEM
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2)
axe-core-api (4.6.0)
axe-core-api (4.7.0)
dumb_delegator
virtus
axe-core-rspec (4.1.0)
Expand All @@ -102,7 +102,7 @@ GEM
browser (2.7.1)
builder (3.2.4)
byebug (11.1.3)
capybara (3.38.0)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
Expand Down Expand Up @@ -131,7 +131,7 @@ GEM
actionpack (>= 5.0)
cells (>= 4.1.6, < 5.0.0)
charlock_holmes (0.7.7)
chef-utils (18.1.0)
chef-utils (18.3.0)
concurrent-ruby
childprocess (4.1.0)
codecov (0.6.0)
Expand All @@ -158,53 +158,53 @@ GEM
db-query-matchers (0.10.0)
activesupport (>= 4.0, < 7)
rspec (~> 3.0)
decidim (0.27.2)
decidim-accountability (= 0.27.2)
decidim-admin (= 0.27.2)
decidim-api (= 0.27.2)
decidim-assemblies (= 0.27.2)
decidim-blogs (= 0.27.2)
decidim-budgets (= 0.27.2)
decidim-comments (= 0.27.2)
decidim-core (= 0.27.2)
decidim-debates (= 0.27.2)
decidim-forms (= 0.27.2)
decidim-generators (= 0.27.2)
decidim-meetings (= 0.27.2)
decidim-pages (= 0.27.2)
decidim-participatory_processes (= 0.27.2)
decidim-proposals (= 0.27.2)
decidim-sortitions (= 0.27.2)
decidim-surveys (= 0.27.2)
decidim-system (= 0.27.2)
decidim-templates (= 0.27.2)
decidim-verifications (= 0.27.2)
decidim-accountability (0.27.2)
decidim-comments (= 0.27.2)
decidim-core (= 0.27.2)
decidim-admin (0.27.2)
decidim (0.27.4)
decidim-accountability (= 0.27.4)
decidim-admin (= 0.27.4)
decidim-api (= 0.27.4)
decidim-assemblies (= 0.27.4)
decidim-blogs (= 0.27.4)
decidim-budgets (= 0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-debates (= 0.27.4)
decidim-forms (= 0.27.4)
decidim-generators (= 0.27.4)
decidim-meetings (= 0.27.4)
decidim-pages (= 0.27.4)
decidim-participatory_processes (= 0.27.4)
decidim-proposals (= 0.27.4)
decidim-sortitions (= 0.27.4)
decidim-surveys (= 0.27.4)
decidim-system (= 0.27.4)
decidim-templates (= 0.27.4)
decidim-verifications (= 0.27.4)
decidim-accountability (0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-admin (0.27.4)
active_link_to (~> 1.0)
decidim-core (= 0.27.2)
decidim-core (= 0.27.4)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0)
decidim-api (0.27.2)
decidim-api (0.27.4)
graphql (~> 1.12, < 1.13)
graphql-docs (~> 2.1.0)
rack-cors (~> 1.0)
decidim-assemblies (0.27.2)
decidim-core (= 0.27.2)
decidim-blogs (0.27.2)
decidim-admin (= 0.27.2)
decidim-comments (= 0.27.2)
decidim-core (= 0.27.2)
decidim-budgets (0.27.2)
decidim-comments (= 0.27.2)
decidim-core (= 0.27.2)
decidim-comments (0.27.2)
decidim-core (= 0.27.2)
decidim-assemblies (0.27.4)
decidim-core (= 0.27.4)
decidim-blogs (0.27.4)
decidim-admin (= 0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-budgets (0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-comments (0.27.4)
decidim-core (= 0.27.4)
redcarpet (~> 3.5, >= 3.5.1)
decidim-core (0.27.2)
decidim-core (0.27.4)
active_link_to (~> 1.0)
acts_as_list (~> 0.9)
batch-loader (~> 1.2)
Expand All @@ -214,7 +214,7 @@ GEM
cells-rails (~> 0.1.3)
charlock_holmes (~> 0.7)
date_validator (~> 0.12.0)
decidim-api (= 0.27.2)
decidim-api (= 0.27.4)
devise (~> 4.7)
devise-i18n (~> 1.2)
diffy (~> 3.3)
Expand All @@ -227,7 +227,7 @@ GEM
hashdiff (>= 0.4.0, < 2.0.0)
invisible_captcha (~> 0.12)
kaminari (~> 1.2, >= 1.2.1)
loofah (~> 2.3.1)
loofah (~> 2.19.0)
mime-types (>= 1.16, < 4.0)
mini_magick (~> 4.9)
mustache (~> 1.1.0)
Expand Down Expand Up @@ -255,15 +255,15 @@ GEM
webpacker (= 6.0.0.rc.5)
webpush (~> 1.1)
wisper (~> 2.0)
decidim-debates (0.27.2)
decidim-comments (= 0.27.2)
decidim-core (= 0.27.2)
decidim-dev (0.27.2)
decidim-debates (0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-dev (0.27.4)
axe-core-rspec (~> 4.1.0)
byebug (~> 11.0)
capybara (~> 3.24)
db-query-matchers (~> 0.10.0)
decidim (= 0.27.2)
decidim (= 0.27.4)
erb_lint (~> 0.0.35)
factory_bot_rails (~> 4.8)
i18n-tasks (~> 0.9.18)
Expand All @@ -286,45 +286,45 @@ GEM
w3c_rspec_validators (~> 0.3.0)
webmock (~> 3.6)
wisper-rspec (~> 1.0)
decidim-forms (0.27.2)
decidim-core (= 0.27.2)
decidim-forms (0.27.4)
decidim-core (= 0.27.4)
wicked_pdf (~> 2.1)
wkhtmltopdf-binary (~> 0.12)
decidim-generators (0.27.2)
decidim-core (= 0.27.2)
decidim-meetings (0.27.2)
decidim-core (= 0.27.2)
decidim-forms (= 0.27.2)
decidim-generators (0.27.4)
decidim-core (= 0.27.4)
decidim-meetings (0.27.4)
decidim-core (= 0.27.4)
decidim-forms (= 0.27.4)
icalendar (~> 2.5)
decidim-pages (0.27.2)
decidim-core (= 0.27.2)
decidim-participatory_processes (0.27.2)
decidim-core (= 0.27.2)
decidim-proposals (0.27.2)
decidim-comments (= 0.27.2)
decidim-core (= 0.27.2)
decidim-pages (0.27.4)
decidim-core (= 0.27.4)
decidim-participatory_processes (0.27.4)
decidim-core (= 0.27.4)
decidim-proposals (0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
doc2text (~> 0.4.5)
redcarpet (~> 3.5, >= 3.5.1)
decidim-sortitions (0.27.2)
decidim-admin (= 0.27.2)
decidim-comments (= 0.27.2)
decidim-core (= 0.27.2)
decidim-proposals (= 0.27.2)
decidim-surveys (0.27.2)
decidim-core (= 0.27.2)
decidim-forms (= 0.27.2)
decidim-templates (= 0.27.2)
decidim-system (0.27.2)
decidim-sortitions (0.27.4)
decidim-admin (= 0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-proposals (= 0.27.4)
decidim-surveys (0.27.4)
decidim-core (= 0.27.4)
decidim-forms (= 0.27.4)
decidim-templates (= 0.27.4)
decidim-system (0.27.4)
active_link_to (~> 1.0)
decidim-core (= 0.27.2)
decidim-core (= 0.27.4)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0)
decidim-templates (0.27.2)
decidim-core (= 0.27.2)
decidim-forms (= 0.27.2)
decidim-verifications (0.27.2)
decidim-core (= 0.27.2)
decidim-templates (0.27.4)
decidim-core (= 0.27.4)
decidim-forms (= 0.27.4)
decidim-verifications (0.27.4)
decidim-core (= 0.27.4)
declarative-builder (0.1.0)
declarative-option (< 0.2.0)
declarative-option (0.1.0)
Expand All @@ -343,8 +343,8 @@ GEM
devise (>= 4.6)
diff-lcs (1.5.0)
diffy (3.4.2)
doc2text (0.4.5)
nokogiri (>= 1.13.2, < 1.14.0)
doc2text (0.4.6)
nokogiri (>= 1.13.2, < 1.15.0)
rubyzip (~> 2.3.0)
docile (1.4.0)
doorkeeper (5.6.4)
Expand Down Expand Up @@ -429,7 +429,7 @@ GEM
rails-i18n
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
icalendar (2.8.0)
icalendar (2.9.0)
ice_cube (~> 0.16)
ice_cube (0.16.4)
ice_nine (0.11.2)
Expand Down Expand Up @@ -467,7 +467,7 @@ GEM
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.3.1)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand Down Expand Up @@ -598,8 +598,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
Expand Down Expand Up @@ -634,15 +634,15 @@ GEM
rspec-cells (0.3.8)
cells (>= 4.0.0, < 6.0.0)
rspec-rails (>= 3.0.0, < 6.1.0)
rspec-core (3.12.1)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-html-matchers (0.9.4)
nokogiri (~> 1)
rspec (>= 3.0.0.a, < 4)
rspec-mocks (3.12.3)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (4.1.2)
Expand All @@ -655,7 +655,7 @@ GEM
rspec-support (~> 3.10)
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.12.0)
rspec-support (3.12.1)
rspec_junit_formatter (0.3.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.28.2)
Expand Down Expand Up @@ -761,7 +761,7 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webmock (3.18.1)
webmock (3.19.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
Expand All @@ -776,7 +776,7 @@ GEM
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
wicked_pdf (2.6.3)
wicked_pdf (2.7.0)
activesupport
wisper (2.0.1)
wisper-rspec (1.1.0)
Expand All @@ -792,8 +792,8 @@ DEPENDENCIES
bootsnap (~> 1.4)
byebug (~> 11.0)
codecov
decidim (= 0.27.2)
decidim-dev (= 0.27.2)
decidim (= 0.27.4)
decidim-dev (= 0.27.4)
decidim-navigation_maps!
faker (~> 2.14)
letter_opener_web (~> 1.3)
Expand Down
6 changes: 2 additions & 4 deletions app/packs/stylesheets/decidim/navigation_maps/admin/navigation_maps.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//= require leaflet
//= require leaflet-geoman
//= require_self

@import "stylesheets/decidim/plugins/leaflet";
@import "stylesheets/decidim/plugins/leaflet-geoman";
@import "stylesheets/decidim/variables";
@import "stylesheets/decidim/utils/settings";
@import "stylesheets/decidim/utils/mixins";
Expand Down
5 changes: 2 additions & 3 deletions app/packs/stylesheets/decidim/navigation_maps/navigation_maps.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//= require leaflet
//= require leaflet-geoman
//= require_self
@import "stylesheets/decidim/plugins/leaflet";
@import "stylesheets/decidim/plugins/leaflet-geoman";
@import "stylesheets/decidim/navigation_maps/variables";

.home-section {
Expand Down
Loading

0 comments on commit 22bc9af

Please sign in to comment.