From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 24 Jun 2020 10:24:27 +0000 (+0200)
Subject: Add bootstrap_form formbuilder gem
X-Git-Tag: live~2061^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/54616e9612240e5d93610600ca67a3f0bb0dc5d3

Add bootstrap_form formbuilder gem
---

diff --git a/Gemfile b/Gemfile
index 8aa907764..9df88f8fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,6 +44,7 @@ gem "actionpack-page_caching", ">= 1.2.0"
 gem "active_record_union"
 gem "activerecord-import"
 gem "bootstrap", "~> 4.3.1"
+gem "bootstrap_form", "~> 4.0"
 gem "cancancan"
 gem "composite_primary_keys", "~> 12.0.0"
 gem "config"
diff --git a/Gemfile.lock b/Gemfile.lock
index d5bbee1ba..0aa9545a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -110,6 +110,9 @@ GEM
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
+    bootstrap_form (4.5.0)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
     browser (4.2.0)
     builder (3.2.4)
     bzip2-ffi (1.0.0)
@@ -483,6 +486,7 @@ DEPENDENCIES
   binding_of_caller
   bootsnap (>= 1.4.2)
   bootstrap (~> 4.3.1)
+  bootstrap_form (~> 4.0)
   browser
   bzip2-ffi
   cancancan
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 54ecb30e2..52729cf62 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,5 +1,6 @@
 @import "parameters";
 @import "bootstrap";
+@import "rails_bootstrap_forms";
 
 /* Styles common to large and small screens */