Merge pull request #35 from Metatavu/feature-version-update

Update changes
Metatavu · Dec 10, 2020 · 4ae03fe · 4ae03fe
2 parents bd1aa25 + 472acdf
commit 4ae03fe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 36 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+DECIDIM_VERSION = "0.23.1"
+
 source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "decidim", "0.21.0"
-# gem "decidim-consultations", "0.21.0"
-# gem "decidim-initiatives", "0.21.0"
+gem "decidim", DECIDIM_VERSION
+gem "decidim-conferences", DECIDIM_VERSION
+gem "decidim-consultations", DECIDIM_VERSION
+gem "decidim-initiatives", DECIDIM_VERSION
 
 gem "bootsnap", "~> 1.3"
 
@@ -18,7 +21,7 @@ gem "faker", "~> 1.9"
 group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
 
-  gem "decidim-dev", "0.21.0"
+  gem "decidim-dev", DECIDIM_VERSION
 end
 
 group :development do

diff --git a/app/assets/stylesheets/decidim.scss b/app/assets/stylesheets/decidim.scss
@@ -94,10 +94,17 @@ $primary-rgb: 82,172,170;
 
         & .topbar {
             justify-content: flex-start;
+            & div {
+                flex: auto;
+            }
         }
         @media (max-width: 639px) {
             & .topbar {
                 justify-content: flex-end;
+                & div {
+                    display: block;
+                }
+
             }
         }
         & .header-hero {

diff --git a/app/views/layouts/decidim/_application.html.erb b/app/views/layouts/decidim/_application.html.erb