From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 4 Dec 2019 13:21:14 +0000 (+0100)
Subject: Add bootstrap 4
X-Git-Tag: live~2425^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7f9dacbada0dcda8918d930945de327f504612a2

Add bootstrap 4
---

diff --git a/Gemfile b/Gemfile
index dd3a8170b..d77394911 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,6 +42,7 @@ gem "image_optim_rails"
 # Load rails plugins
 gem "active_record_union"
 gem "activerecord-import"
+gem "bootstrap", "~> 4.3.1"
 gem "cancancan"
 gem "composite_primary_keys", "~> 12.0.0"
 gem "config"
diff --git a/Gemfile.lock b/Gemfile.lock
index 91c20bb73..5af33d9a1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,6 +104,10 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.5)
       msgpack (~> 1.0)
+    bootstrap (4.3.1)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.14.3, < 2)
+      sassc-rails (>= 2.0.0)
     browser (2.7.1)
     builder (3.2.3)
     bzip2-ffi (1.0.0)
@@ -319,6 +323,7 @@ GEM
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
+    popper_js (1.14.5)
     progress (3.5.2)
     psych (3.1.0)
     public_suffix (4.0.1)
@@ -465,6 +470,7 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.4.2)
+  bootstrap (~> 4.3.1)
   browser
   bzip2-ffi
   cancancan
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 40c5eaa2a..0e42eb900 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,4 +1,5 @@
 @import "parameters";
+@import "bootstrap";
 
 /* Styles common to large and small screens */
 
@@ -1236,7 +1237,7 @@ tr.turn:hover {
       width: 12px;
       height: 12px;
       margin: 4px 0px;
-      border: 1px solid rgba(0, 0, 0, .1); 
+      border: 1px solid rgba(0, 0, 0, .1);
       // add color via inline css on element: background-color: <tag value>;
     }
   }