Add bootstrap 4

diff --git a/Gemfile b/Gemfile
index dd3a8170b2e0b97239a77c6c1ebe3635ca6fa46f..d7739491172f55d499e652c2bc6941bde9f62bf8 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -42,6 +42,7 @@ gem "image_optim_rails"
 # Load rails plugins
 gem "active_record_union"
 gem "activerecord-import"
 # 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"
 gem "cancancan"
 gem "composite_primary_keys", "~> 12.0.0"
 gem "config"

diff --git a/Gemfile.lock b/Gemfile.lock
index 91c20bb735d023a43927fbb106fd9d39fca8867d..5af33d9a18ed98d05f94725d75e6e6268c58ae80 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,6 +104,10 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.5)
       msgpack (~> 1.0)
       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)
     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)
       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)
     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)
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.4.2)

+  bootstrap (~> 4.3.1)

   browser
   bzip2-ffi
   cancancan
   browser
   bzip2-ffi
   cancancan

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 40c5eaa2a8e91f4362b4852ea389bfefa1085608..0e42eb9000e959e505b2b379fcd8be00cffc4960 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,4 +1,5 @@
 @import "parameters";
 @import "parameters";

+@import "bootstrap";

 
 /* Styles common to large and small screens */
 
 
 /* Styles common to large and small screens */
 


@@ -1236,7 +1237,7 @@ tr.turn:hover {
       width: 12px;
       height: 12px;
       margin: 4px 0px;
       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>;
     }
   }
       // add color via inline css on element: background-color: <tag value>;
     }
   }