Update to bootstrap 4.2.1

sleepepi · Jan 25, 2019 · 9c295c2 · 9c295c2
1 parent 18729f5
commit 9c295c2
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
   - Update to ruby 2.6.0
   - Update to rails 6.0.0.beta1
   - Update to carrierwave 1.3.1
+  - Update to bootstrap 4.2.1
 
 ## 4.0.0 (November 7, 2018)
 

diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,7 @@ gem "pg",                      ">= 0.18", "< 2.0"
 # Gems used by project
 gem "autoprefixer-rails",      "9.1.0"
 gem "aws-sdk-s3",                          require: false
-gem "bootstrap",               "~> 4.1.3"
+gem "bootstrap",               "~> 4.2.1"
 gem "carrierwave",             "~> 1.3.1"
 gem "devise",                  "~> 4.5.0"
 gem "fog-aws"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -86,10 +86,10 @@ GEM
     bindex (0.5.0)
     bootsnap (1.3.2)
       msgpack (~> 1.0)
-    bootstrap (4.1.3)
-      autoprefixer-rails (>= 6.0.3)
-      popper_js (>= 1.12.9, < 2)
-      sass (>= 3.5.2)
+    bootstrap (4.2.1)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.14.3, < 2)
+      sassc-rails (>= 2.0.0)
     builder (3.2.3)
     capybara (3.13.2)
       addressable
@@ -259,6 +259,12 @@ GEM
     sassc (2.0.0)
       ffi (~> 1.9.6)
       rake
+    sassc-rails (2.1.0)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
@@ -310,7 +316,7 @@ DEPENDENCIES
   autoprefixer-rails (= 9.1.0)
   aws-sdk-s3
   bootsnap (>= 1.1.0)
-  bootstrap (~> 4.1.3)
+  bootstrap (~> 4.2.1)
   capybara (>= 2.15, < 4.0)
   carrierwave (~> 1.3.1)
   coffee-rails (~> 4.2)

diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
@@ -40,7 +40,7 @@
             %small= abbreviated_time(user.current_sign_in_at || user.created_at)
           %td.d-none.d-md-table-cell.text-center
             %small= user.sign_in_count
-          %td.text-center= render "layouts/edit_delete_dropdown", edit_url: edit_admin_user_path(user), delete_url: admin_user_path(user), delete_confirmation: "Delete #{user.full_name}?"
+          %td.text-center.nowrap= render "layouts/edit_delete_dropdown", edit_url: edit_admin_user_path(user), delete_url: admin_user_path(user), delete_confirmation: "Delete #{user.full_name}?"
 
   .center-horizontally= paginate @users, theme: "bootstrap"
 - else

diff --git a/app/views/folders/_files.html.haml b/app/views/folders/_files.html.haml
@@ -26,7 +26,7 @@
           %td.d-none.d-sm-table-cell.text-center.nowrap
             %small= document.created_at.strftime("%Y-%^b-%d")
           - if current_user.editor?
-            %td.text-center= render "layouts/edit_delete_dropdown", edit_url: edit_document_path(document), delete_url: document, delete_confirmation: "Delete #{document.filename}?"
+            %td.text-center.nowrap= render "layouts/edit_delete_dropdown", edit_url: edit_document_path(document), delete_url: document, delete_confirmation: "Delete #{document.filename}?"
 - else
   .jumbotron.jumbotron-custom-text{ class: current_user.editor? ? "mb-0" : nil }
     = icon("fas", "clone", class: "mr-1")

diff --git a/app/views/sites/coordinating_centers.html.haml b/app/views/sites/coordinating_centers.html.haml
@@ -24,7 +24,7 @@
         %tr
           %td= link_to site.name, site
           - if current_user.editor?
-            %td.text-center= render "layouts/edit_delete_dropdown", edit_url: edit_site_path(site), delete_url: site, delete_confirmation: "Delete #{site.name}?"
+            %td.text-center.nowrap= render "layouts/edit_delete_dropdown", edit_url: edit_site_path(site), delete_url: site, delete_confirmation: "Delete #{site.name}?"
   .center-horizontally= paginate @sites, theme: "bootstrap"
 - else
   .jumbotron.jumbotron-custom-text

diff --git a/app/views/sites/index.html.haml b/app/views/sites/index.html.haml
@@ -27,7 +27,7 @@
           %td= link_to site.name, site
           %td= site.center_type_name
           - if current_user.editor?
-            %td.text-center= render "layouts/edit_delete_dropdown", edit_url: edit_site_path(site), delete_url: site, delete_confirmation: "Delete #{site.name}?"
+            %td.text-center.nowrap= render "layouts/edit_delete_dropdown", edit_url: edit_site_path(site), delete_url: site, delete_confirmation: "Delete #{site.name}?"
 
   .center-horizontally= paginate @sites, theme: "bootstrap"
 - else

diff --git a/app/views/sites/recruiting_centers.html.haml b/app/views/sites/recruiting_centers.html.haml
@@ -24,7 +24,7 @@
         %tr
           %td= link_to site.name, site
           - if current_user.editor?
-            %td.text-center= render "layouts/edit_delete_dropdown", edit_url: edit_site_path(site), delete_url: site, delete_confirmation: "Delete #{site.name}?"
+            %td.text-center.nowrap= render "layouts/edit_delete_dropdown", edit_url: edit_site_path(site), delete_url: site, delete_confirmation: "Delete #{site.name}?"
   .center-horizontally= paginate @sites, theme: "bootstrap"
 - else
   .jumbotron.jumbotron-custom-text