From 63633d77c750b0f88312c772d8e75811c43d8f0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 21:03:16 +0000 Subject: [PATCH 01/35] Bump sinatra from 4.0.0 to 4.1.0 Bumps [sinatra](https://github.com/sinatra/sinatra) from 4.0.0 to 4.1.0. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 61db43fc8..0011180cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -415,7 +415,7 @@ GEM multi_xml (0.7.1) bigdecimal (~> 3.1) multipart-post (2.4.1) - mustermann (3.0.2) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) mutex_m (0.2.0) namae (1.2.0) @@ -519,8 +519,9 @@ GEM rack (3.1.8) rack-attack (6.7.0) rack (>= 1.0, < 4) - rack-protection (4.0.0) + rack-protection (4.1.0) base64 (>= 0.1.0) + logger (>= 1.6.0) rack (>= 3.0.0, < 4) rack-proxy (0.7.7) rack @@ -678,10 +679,11 @@ GEM simple_form (5.3.1) actionpack (>= 5.2) activemodel (>= 5.2) - sinatra (4.0.0) + sinatra (4.1.0) + logger (>= 1.6.0) mustermann (~> 3.0) rack (>= 3.0.0, < 4) - rack-protection (= 4.0.0) + rack-protection (= 4.1.0) rack-session (>= 2.0.0, < 3) tilt (~> 2.0) sitemap_generator (6.3.0) From 9fe3c41c5702590209cda68714a050098d31187c Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Tue, 10 Oct 2023 16:32:52 -0400 Subject: [PATCH 02/35] update to Blacklight 8, with blacklight_range_limit and JS blacklight_frontend upgrades to match This doesn't actually WORK yet, we have to fix some things, but updated dependencies --- Gemfile | 2 +- Gemfile.lock | 13 ++++++------- package.json | 2 +- yarn.lock | 19 +++++-------------- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index 5c76e5f0a..1d11a14f7 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem 'scout_apm' # NOTE ALSO: We are using `blacklight-frontend` JS NPM package, updating blacklight # version may require an update with yarn to `blacklight-frontend`, has to be # checked manually. -gem "blacklight", "~> 7.38.0" +gem "blacklight", "~> 8.0" gem "blacklight_range_limit", "9.0.0.beta1" # version no longer sync'd with blacklight, not sure how we tell what version works with what version of BL # for some code to deal with transcoding video, via AWS MediaConvert diff --git a/Gemfile.lock b/Gemfile.lock index 0011180cf..4dd0c6846 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -158,16 +158,15 @@ GEM bcrypt (3.1.20) bigdecimal (3.1.8) bindex (0.8.1) - blacklight (7.38.0) - deprecation + blacklight (8.6.1) globalid - hashdiff i18n (>= 1.7.0) jbuilder (~> 2.7) kaminari (>= 0.15) ostruct (>= 0.3.2) - rails (>= 5.1, < 7.3) - view_component (>= 2.66, < 4) + rails (>= 6.1, < 8) + view_component (>= 2.74, < 4) + zeitwerk blacklight_range_limit (9.0.0.beta1) blacklight (>= 7.25.2, < 9) view_component (>= 2.54, < 4) @@ -467,7 +466,7 @@ GEM omniauth (~> 2.0) orm_adapter (0.5.0) os (1.1.4) - ostruct (0.6.0) + ostruct (0.6.1) parser (3.3.4.2) ast (~> 2.4.1) racc @@ -792,7 +791,7 @@ DEPENDENCIES aws-sdk-s3 (~> 1.0) axe-core-rspec (~> 4.3) barnes - blacklight (~> 7.38.0) + blacklight (~> 8.0) blacklight_range_limit (= 9.0.0.beta1) bootsnap (>= 1.4.4) bootstrap (~> 4.6, >= 4.6.2) diff --git a/package.json b/package.json index 50c986355..b388ccfcc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@popperjs/core": "^2.11.8", "@rails/ujs": "^ 7.1.3-4", "@shopify/draggable": "^1.0.0-beta.8", - "blacklight-frontend": "^7.32.0", + "blacklight-frontend": "^8.0.1", "blacklight-range-limit": "9.0.0-beta1", "bootstrap": "^ 5.0.0", "domready": "^1.0.8", diff --git a/yarn.lock b/yarn.lock index 378af6b29..b335e12de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -355,14 +355,12 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -blacklight-frontend@^7.32.0: - version "7.32.0" - resolved "https://registry.yarnpkg.com/blacklight-frontend/-/blacklight-frontend-7.32.0.tgz#c7eec22dc1057059c75171e7b3b6ff4733e7d938" - integrity sha512-m1eA5zyOEwowbK6DAA3rncMDybs2zssp62Viy6fsCNGw6ayLx49CTCbOKZiEvqqTu/8cBDrFh2Z0dzcKnF5nYA== +blacklight-frontend@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/blacklight-frontend/-/blacklight-frontend-8.0.1.tgz#20c923ea45e0d9c774ad3d23ef0bed2e31a12c71" + integrity sha512-KVQ4txligEJb3RZx4LpGEx/YDWRWgSDP7xdJOzudFLFwZ8eJAwbwc7L5ErXvuNwdSz0o6v5vf6IIr66Hpbg5TA== dependencies: bootstrap ">=4.3.1 <6.0.0" - jquery "^3.5.1" - typeahead.js "^0.11.1" blacklight-range-limit@9.0.0-beta1: version "9.0.0-beta1" @@ -605,7 +603,7 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -jquery@>=1.7, "jquery@^ 3.6.0", jquery@^3.3.1, jquery@^3.5.1: +"jquery@^ 3.6.0", jquery@^3.3.1: version "3.6.2" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.2.tgz#8302bbc9160646f507bdf59d136a478b312783c4" integrity sha512-/e7ulNIEEYk1Z/l4X0vpxGt+B/dNsV8ghOPAWZaJs8pkGvsSC0tm33aMGylXcj/U7y4IcvwtMXPMyBFZn/gK9A== @@ -847,13 +845,6 @@ tom-select@^2.3.1: "@orchidjs/sifter" "^1.1.0" "@orchidjs/unicode-variants" "^1.1.2" -typeahead.js@^0.11.1: - version "0.11.1" - resolved "https://registry.yarnpkg.com/typeahead.js/-/typeahead.js-0.11.1.tgz#4e64e671b22310a8606f4aec805924ba84b015b8" - integrity sha512-yGaLzGjVHyryZdNfrWz2NHXUwEO7hrlVmGMGCo5+6mH3nEEhcQ0Te3mK3G60uRnxfERu8twOWSU4WmwScbwhMg== - dependencies: - jquery ">=1.7" - url-toolkit@^2.2.1: version "2.2.5" resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.5.tgz#58406b18e12c58803e14624df5e374f638b0f607" From 3739d6b2dbf6f73060488419470230b51158186c Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Tue, 27 Jun 2023 15:54:34 -0400 Subject: [PATCH 03/35] remove blackligt deprecation silence, for upgrade to BL8 --- .../silence_blacklight_deprecation.rb | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 config/initializers/silence_blacklight_deprecation.rb diff --git a/config/initializers/silence_blacklight_deprecation.rb b/config/initializers/silence_blacklight_deprecation.rb deleted file mode 100644 index 5125c7b78..000000000 --- a/config/initializers/silence_blacklight_deprecation.rb +++ /dev/null @@ -1,21 +0,0 @@ -# This silences ALL deprecation warnings from Blacklight, and anything else that uses the -# "deprecation" gem -- currently, in our app looks like just the "qa" gem. -# -# This is not ideal, but we couldn't find a way to avoid deprecation warnings when -# upgrading to BL 7.19.2, and we need to keep them from cluttering up our logs. -# -# We do wrap in sane_patch for extra self-documenting/alerting, although just -# for Blaclight not for `qa`, sorry. -# -# TBD: link to blog post with background - -details = <<-EOS -We had to silence Blacklight 7.x deprecation messages that we were unable to -avoid. But before upgrading to Blacklight 8.0, you'll have to deal with this, -one way or another. You may want to re-enable deprecation warnings while -still in BL 7.x to see what you're in for. -EOS - -SanePatch.patch('blacklight', '~> 7.0', details: details ) do - Deprecation.default_deprecation_behavior = :silence -end From 9a39fef6a76d49a8ae8c18603c8042cfc98a14b0 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Tue, 27 Jun 2023 16:00:18 -0400 Subject: [PATCH 04/35] refresh override of catalog/index.html.erb to prevent splash page --- app/views/catalog/index.html.erb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/views/catalog/index.html.erb b/app/views/catalog/index.html.erb index 02d73935c..5d0825fac 100644 --- a/app/views/catalog/index.html.erb +++ b/app/views/catalog/index.html.erb @@ -5,13 +5,22 @@ and want this blacklight search action to always show results -- if no query is entered, it will just show all results, if we let it. - Customization forked from: https://github.com/projectblacklight/blacklight/blob/5a0e229b68d3a853e7dce7f477d777336ac7f63a/app/views/catalog/index.html.erb + Customization forked from: https://github.com/projectblacklight/blacklight/blob/v8.0.1/app/views/catalog/index.html.erb + + + If this feature got merged, we would not need to override this whole component: + https://github.com/projectblacklight/blacklight/pull/3049 %> +<% content_for(:head) do %> + +<% end %> <% content_for(:sidebar) do %> - <%= render 'search_sidebar' %> + <% conf = blacklight_config.view_config(document_index_view_type) %> + <%= render conf.sidebar_component.new(blacklight_config: blacklight_config, + response: @response, + view_config: conf) %> <% end %> -<% content_for(:sidebar_aria_label) { t('blacklight.search.documents.aria.limit_search') } %> -<% content_for(:content_aria_label) { t('blacklight.search.documents.aria.search_results') } %> <%= render 'search_results' %> + From fb5538acfafe52237f193c12ee6727df82281059 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Tue, 27 Jun 2023 16:01:23 -0400 Subject: [PATCH 05/35] move override of Sidebar (to add 'other search tools') to use component architecture for BL8 --- ...cklight_search_sidebar_component.html.erb} | 6 +----- .../blacklight_search_sidebar_component.rb | 20 +++++++++++++++++++ app/controllers/catalog_controller.rb | 1 + 3 files changed, 22 insertions(+), 5 deletions(-) rename app/{views/catalog/_search_sidebar.html.erb => components/scihist/blacklight_search_sidebar_component.html.erb} (90%) create mode 100644 app/components/scihist/blacklight_search_sidebar_component.rb diff --git a/app/views/catalog/_search_sidebar.html.erb b/app/components/scihist/blacklight_search_sidebar_component.html.erb similarity index 90% rename from app/views/catalog/_search_sidebar.html.erb rename to app/components/scihist/blacklight_search_sidebar_component.html.erb index 733d9e6a4..7dbf100f2 100644 --- a/app/views/catalog/_search_sidebar.html.erb +++ b/app/components/scihist/blacklight_search_sidebar_component.html.erb @@ -1,11 +1,7 @@ -<%# override blacklight to add our extra links -https://github.com/projectblacklight/blacklight/blob/v6.7.2/app/views/catalog/_search_sidebar.html.erb -%> +<%= render_original_sidebar %> -<%= render 'facets' %> <% if params[:q].present? %> - <%# bootstrap utility classes d-none and d-md-block say show only on md and above, when we have enough room for columns. %>
diff --git a/app/components/scihist/blacklight_search_sidebar_component.rb b/app/components/scihist/blacklight_search_sidebar_component.rb new file mode 100644 index 000000000..08c7d552f --- /dev/null +++ b/app/components/scihist/blacklight_search_sidebar_component.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +# A customized component for Blacklight only to CALL ORIGINAL, and then ADD ON TO END +# our list of "other search links" +# +# Configured in CatalogController, config.index.sidebar_component +# +class Scihist::BlacklightSearchSidebarComponent < ApplicationComponent + ORIGINAL_COMPONENT_CLASS = Blacklight::Search::SidebarComponent + + + def initialize(**kwargs) + @original_initialize_kwargs = kwargs + super + end + + def render_original_sidebar + helpers.render ORIGINAL_COMPONENT_CLASS.new(**@original_initialize_kwargs) + end +end diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index e9b6b4cdd..b080bb40a 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -462,6 +462,7 @@ def active_sort_fields config.index.constraints_component = Scihist::BlacklightConstraintsComponent + config.index.sidebar_component = Scihist::BlacklightSearchSidebarComponent end # Some bad actors sometimes send query params that Blacklight doesn't expect and From 2047275b9954534f1bef031a8621a2fd770dcd5a Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Jul 2023 16:00:51 -0400 Subject: [PATCH 06/35] fix blacklight-frontend JS import in a way that works for BL8 --- app/frontend/javascript/blacklight_setup.js | 45 ++++++++------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/app/frontend/javascript/blacklight_setup.js b/app/frontend/javascript/blacklight_setup.js index 867e5c1e2..469a7961e 100644 --- a/app/frontend/javascript/blacklight_setup.js +++ b/app/frontend/javascript/blacklight_setup.js @@ -1,34 +1,23 @@ -// The Blacklight docs at -// https://github.com/projectblacklight/blacklight/wiki/Using-Webpacker-to-compile-javascript-assets#installing-webpacker-in-blacklight -// -// Suggest importing ALL of BL JS with: -// -// import 'blacklight-frontend/app/javascripts/blacklight/blacklight' -// -// BUT we instead take a picking-and-choosing approach to import only -// the BL JS we want. This is mainluy to *avoid* importing `typeahead`, -// which at least in BL 7.x is a LOT of code (it brings in some big dependencies) -// -// It's possible we're still including other JS we don't actually use; on the other -// side, future versions of BL may include JS that we want but don't automatically -// get included without us realizing and editing here. -// -// While this picking-and-choosing apporach is not documented, other BL -// apps in the wild do it, eg: -// -// * https://github.com/psu-libraries/psulib_blacklight/blob/451a8ab9e64eaed8b0000bda0300a4f28097f165/app/javascript/psulib_blacklight/index.js -// * https://github.com/unt-libraries/discover/blob/3c02d22bda7ec3f9e1d2f71a49c3b7e662ef8758/app/webpacker/packs/base.js.erb +// Import all blacklight javascript, in BL 8 via a rollup derived combo file + +import Blacklight from 'blacklight-frontend'; + + +// We USED to be able to pick-and-choose just the ones we need -- we don't actually need all of them, because +// we don't use all BL parts. // -// From all sub-parts at Blacklight 7.31.0 +// As of Blacklight 8, that is not seem possible anymore, but will be again in 9 // +// https://github.com/projectblacklight/blacklight/issues/3050 +// We used to import only: -import 'blacklight-frontend/app/javascript/blacklight/core'; -// import 'blacklight-frontend/app/javascript/blacklight/bookmark_toggle'; -// import 'blacklight-frontend/app/javascript/blacklight/button_focus'; -// import 'blacklight-frontend/app/javascript/blacklight/checkbox_submit'; -import 'blacklight-frontend/app/javascript/blacklight/facet_load'; -import 'blacklight-frontend/app/javascript/blacklight/modal'; -//import 'blacklight-frontend/app/javascript/blacklight/search_context'; +// import 'blacklight-frontend/app/javascript/blacklight/core'; +// // import 'blacklight-frontend/app/javascript/blacklight/bookmark_toggle'; +// // import 'blacklight-frontend/app/javascript/blacklight/button_focus'; +// // import 'blacklight-frontend/app/javascript/blacklight/checkbox_submit'; +// import 'blacklight-frontend/app/javascript/blacklight/facet_load'; +// import 'blacklight-frontend/app/javascript/blacklight/modal'; +// //import 'blacklight-frontend/app/javascript/blacklight/search_context'; import BlacklightRangeLimit from "blacklight-range-limit"; From 5bf6fd5c82b277316785bc40e78e49431655ddef Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Jul 2023 17:39:57 -0400 Subject: [PATCH 07/35] fix active facet CSS overrides for BL8 --- app/frontend/stylesheets/local/search_results.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/frontend/stylesheets/local/search_results.scss b/app/frontend/stylesheets/local/search_results.scss index bca0b6049..75ff816f0 100644 --- a/app/frontend/stylesheets/local/search_results.scss +++ b/app/frontend/stylesheets/local/search_results.scss @@ -47,14 +47,18 @@ line-height: 1.2; } - // no special styles on active facet + // eliminate any special styles on active facet by overrides + // Originally active facet gets green bg and white text, we don't want! .facet-limit-active { color: inherit; border-color: $card-border-color !important; & .card-header { background-color: $card-cap-bg !important; - color: #333; // not sure where this came from, but matches chf_sufia + color: $body-color; border-color: $card-border-color !important; + button { + color: inherit; // in BL 8 need to override at this level too + } } .facet-values li .selected { color: inherit !important; From 0ab4dd6500c01a93ed57bdfd1c22357ad02ebdce Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Wed, 5 Jul 2023 13:18:02 -0400 Subject: [PATCH 08/35] still trying to get blacklight_range_limit working --- app/frontend/javascript/blacklight_setup.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/frontend/javascript/blacklight_setup.js b/app/frontend/javascript/blacklight_setup.js index 469a7961e..35a396990 100644 --- a/app/frontend/javascript/blacklight_setup.js +++ b/app/frontend/javascript/blacklight_setup.js @@ -1,4 +1,7 @@ +<<<<<<< HEAD // Import all blacklight javascript, in BL 8 via a rollup derived combo file +======= +// While not doc'd very well, this seems to be [the/a] way to import all blacklight Javascript. import Blacklight from 'blacklight-frontend'; From 81a53ae1076fee3c5dd92513280c7265a4a35598 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Tue, 10 Oct 2023 16:09:31 -0400 Subject: [PATCH 09/35] tell blacklight we are still using bootstrap 4 --- Gemfile | 1 + app/controllers/catalog_controller.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 1d11a14f7..70fcc57f1 100644 --- a/Gemfile +++ b/Gemfile @@ -112,6 +112,7 @@ gem 'jbuilder', '~> 2.5' # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.4.4', require: false +# note if updating to 5, you should change bootstrap_version config in catalog_controller gem 'bootstrap', '~> 4.6', '>= 4.6.2' gem 'sprockets-rails', '>= 3.4.2' diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index b080bb40a..fc90374ca 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -155,6 +155,9 @@ def active_sort_fields # We overide to use custom sub-class for Solr HTTP retries config.repository_class = Scihist::BlacklightSolrRepository + # We need to tell Blacklight we use bootstrap 4, not yet 5 + config.bootstrap_version = 4 + ## Class for converting Blacklight's url parameters to into request parameters for the search index # config.search_builder_class = ::SearchBuilder From bfcf42f970551bcbef18135331a8e24eba656f7f Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Tue, 19 Nov 2024 11:34:38 -0500 Subject: [PATCH 10/35] remove merge marker accidentally left in --- app/frontend/javascript/blacklight_setup.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/frontend/javascript/blacklight_setup.js b/app/frontend/javascript/blacklight_setup.js index 35a396990..4a8c36c27 100644 --- a/app/frontend/javascript/blacklight_setup.js +++ b/app/frontend/javascript/blacklight_setup.js @@ -1,6 +1,4 @@ -<<<<<<< HEAD // Import all blacklight javascript, in BL 8 via a rollup derived combo file -======= // While not doc'd very well, this seems to be [the/a] way to import all blacklight Javascript. import Blacklight from 'blacklight-frontend'; From b950282c77ffb0cf7cc94983903530e84437591b Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Tue, 19 Nov 2024 11:43:00 -0500 Subject: [PATCH 11/35] aria-label to make accesibility checker happy --- app/components/scihist_masthead.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/scihist_masthead.html.erb b/app/components/scihist_masthead.html.erb index f9df0a8ab..e28baf8d8 100644 --- a/app/components/scihist_masthead.html.erb +++ b/app/components/scihist_masthead.html.erb @@ -49,7 +49,7 @@
-
From a37b27bfc15a9d44c58c1222b75ad7968dbaaebf Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 25 Nov 2024 12:35:28 -0500 Subject: [PATCH 26/35] set padding to match bootstrap 4 cause that's what we designed for --- app/frontend/stylesheets/_variables.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/frontend/stylesheets/_variables.scss b/app/frontend/stylesheets/_variables.scss index 97d043ff8..a1a74ae1e 100644 --- a/app/frontend/stylesheets/_variables.scss +++ b/app/frontend/stylesheets/_variables.scss @@ -190,6 +190,10 @@ $grid-gutter-width: 2rem; $badge-padding-x: 0.4em; $badge-padding-y: 0.25em; +// Make match bootstrap 4, cause that's what we designed for +$table-cell-padding-x: .75rem; +$table-cell-padding-y: .75rem; + // Restore bootstrap 4 links not underlined by default. Yes underline by default is // better, but we designed CSS based on this default, easier to do this. $link-decoration: none; From 01abfbfc0e1a756af0ae67c9f8e103703d572072 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 25 Nov 2024 12:39:30 -0500 Subject: [PATCH 27/35] space it out a bit, lost spacing in bootstrap 5 --- app/views/admin/works/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/works/show.html.erb b/app/views/admin/works/show.html.erb index feb639e4c..617ade28f 100644 --- a/app/views/admin/works/show.html.erb +++ b/app/views/admin/works/show.html.erb @@ -78,7 +78,7 @@