Skip to content

Commit

Permalink
Remove workarounds for dartsass-sprockets prod compilation added in #471
Browse files Browse the repository at this point in the history


- BL core invalid CSS bug making this necessary has now been fixed in 8.7.0
  • Loading branch information
seanaery committed Dec 4, 2024
1 parent 59c3aeb commit 9690e04
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 91 deletions.
63 changes: 0 additions & 63 deletions app/assets/stylesheets/blacklight/_controls.scss

This file was deleted.

28 changes: 1 addition & 27 deletions app/assets/stylesheets/trln_argon/trln_argon_dependencies.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,7 @@

@import 'bootstrap';

// Commented out the default blacklight @import so we have more
// granular control over overriding individual @imports with
// local files. We will be able to revert once the breakpoint-max(xs)
// bugfix is backported to BL8 (see blacklight/_controls.scss).
// See: https://github.com/projectblacklight/blacklight/blob/release-8.x/app/assets/stylesheets/blacklight/_blacklight_base.scss

// @import 'blacklight/blacklight';
// --------------------------------
@import "blacklight/mixins";
@import 'blacklight/blacklight_defaults';
@import "blacklight/bootstrap_overrides";
@import "blacklight/layout";
@import "blacklight/header";
@import "blacklight/constraints";
@import "blacklight/controls"; // <-- temporary local override
@import "blacklight/search_form";
@import "blacklight/search_results";
@import "blacklight/pagination";
@import "blacklight/group";
@import "blacklight/bookmark";
@import "blacklight/balanced_list";
@import "blacklight/facets";
@import "blacklight/search_history";
@import "blacklight/modal";
@import "blacklight/icons";
@import "blacklight/autocomplete";
// --------------------------------
@import 'blacklight/blacklight';

@import 'blacklight_advanced_search';

Expand Down
2 changes: 1 addition & 1 deletion trln_argon.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']

s.add_dependency 'rails', '>= 7.1', '< 7.2'
s.add_dependency 'blacklight', '~> 8.0'
s.add_dependency 'blacklight', '~> 8.7'
s.add_dependency 'blacklight_advanced_search', '~> 8.0.0.alpha2'
s.add_dependency 'blacklight-hierarchy', '~> 6.3'
s.add_dependency 'blacklight_range_limit', '9.0.0.beta1'
Expand Down

0 comments on commit 9690e04

Please sign in to comment.