Merge pull request #295 from ncbo/bootstrap5-tweaks

Bootstrap 5 tweaks
ontoportal-lirmm · Nov 21, 2023 · 0c029c4 · 0c029c4
2 parents 8235b63 + 31f745a
commit 0c029c4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 42 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -79,7 +79,7 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    airbrussh (1.4.2)
+    airbrussh (1.5.0)
       sshkit (>= 1.6.1, != 1.7.0)
     ast (2.4.2)
     autoprefixer-rails (10.4.15.0)
@@ -92,7 +92,7 @@ GEM
       sassc-rails (>= 2.0.0)
     brakeman (6.0.1)
     builder (3.2.4)
-    capistrano (3.17.3)
+    capistrano (3.18.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -127,17 +127,16 @@ GEM
     crass (1.0.6)
     cube-ruby (0.0.3)
     daemons (1.4.1)
-    dalli (3.2.5)
-    date (3.3.3)
+    dalli (3.2.6)
+    date (3.3.4)
     diff-lcs (1.5.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     ed25519 (1.3.0)
     erubi (1.12.0)
     erubis (2.7.0)
     eventmachine (1.2.7)
-    excon (0.103.0)
-    execjs (2.9.0)
+    excon (0.104.0)
+    execjs (2.9.1)
     faraday (2.7.11)
       base64
       faraday-net_http (>= 2.0, < 3.1)
@@ -148,7 +147,7 @@ GEM
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
-    ffi (1.15.5)
+    ffi (1.16.3)
     flamegraph (0.9.5)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -181,7 +180,7 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lz4-ruby (0.3.3)
@@ -195,32 +194,29 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0808)
+    mime-types-data (3.2023.1003)
     mini_mime (1.1.5)
     minitest (5.20.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)
     mysql2 (0.5.5)
-    net-imap (0.3.7)
+    net-imap (0.4.5)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     net-ssh (7.2.0)
     netrc (0.11.0)
-    newrelic_rpm (9.5.0)
-    nio4r (2.5.9)
-    nokogiri (1.15.4-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    newrelic_rpm (9.6.0)
+      base64
+    nio4r (2.6.0)
+    nokogiri (1.15.5-x86_64-darwin)
       racc (~> 1.4)
     oj (3.16.1)
     open_uri_redirections (0.2.1)
@@ -233,8 +229,8 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     psych (3.3.4)
-    public_suffix (5.0.3)
-    racc (1.7.1)
+    public_suffix (5.0.4)
+    racc (1.7.3)
     rack (2.2.8)
     rack-mini-profiler (3.1.1)
       rack (>= 1.2.0)
@@ -273,14 +269,14 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rdoc (6.3.3)
     recaptcha (5.9.0)
       json
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.2)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -315,7 +311,7 @@ GEM
       rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -350,33 +346,30 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sshkit (1.21.5)
+    sshkit (1.21.6)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stackprof (0.2.25)
-    temple (0.10.2)
+    temple (0.10.3)
     terser (1.1.19)
       execjs (>= 0.3.0, < 3)
     thin (1.8.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (1.2.2)
+    thor (1.3.0)
     tilt (2.3.0)
-    timeout (0.4.0)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   arm64-darwin-22

diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
@@ -46,10 +46,8 @@
               %i.fas.fa-search.fa-lg{'aria-hidden': 'true'}
           %div.dropdown
             %div.btn-group
-              %button{type: 'button', class: 'btn btn-info'} Browse ontologies
-              %button{type: 'button', class: 'btn btn-info dropdown-toggle dropdown-toggle-split',
-                      'data-bs-toggle': 'dropdown', 'aria-expanded': false}
-                %span.visually-hidden Toggle browse ontologies dropdown
+              = tag.button('Browse ontologies', class: 'btn btn-outline-primary dropdown-toggle', type: 'button',
+                           'data-bs-toggle': 'dropdown', 'aria-expanded': 'false')
               %ul.dropdown-menu
                 = link_to('All', ontologies_path, class: 'dropdown-item')
                 %li

diff --git a/app/views/ontologies/browse.html.erb b/app/views/ontologies/browse.html.erb
@@ -9,13 +9,13 @@
 
 <main class="flex-shrink-0" role="main">
   <div class="container-fluid">
+    <div id="angular-notices">
+      <%=render partial: 'layouts/notices'%>
+    </div>
     <div class="splash" ng-cloak>
       <div style="font-size: 3em;">Ontologies loading</div>
       <p>please wait...</p>
     </div>
-    <div id="angular-notices">
-      <%=render partial: 'layouts/notices'%>
-    </div>
   </div>
 
   <div class="grid-container" style="margin-bottom: 1em; margin-top: 1em;" ng-cloak>