From 58805e1b6441a352330b60acc1c9815b40ded2ca Mon Sep 17 00:00:00 2001 From: Jessie Keck Date: Wed, 13 Dec 2017 07:21:37 -0800 Subject: [PATCH] Load blacklight_range_limit styling via require (#1014) --- CHANGELOG.md | 10 ++++++++++ app/assets/stylesheets/application.scss | 8 ++++++++ app/assets/stylesheets/application_parker.scss | 8 ++++++++ app/assets/stylesheets/base.scss | 1 - 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cea406bd4..ef0bface8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed ### Security +## [1.12.1] - 2017-12-13 + +### Added +### Changed +### Deprecated +### Removed +### Fixed +- Fixed styling issue with the Date range facet #1014 +### Security + ## [1.12.0] - 2017-12-12 ### Added diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 9acd9cd62..a7c4e9aba 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1 +1,9 @@ +/* +* TODO: This should be turned into a @import +* once blacklight_range_limit switches +* to using scss and @imports. +* Used by blacklight_range_limit +*= require 'blacklight_range_limit' +*/ + @import "base"; diff --git a/app/assets/stylesheets/application_parker.scss b/app/assets/stylesheets/application_parker.scss index 179f20041..a56c9058f 100644 --- a/app/assets/stylesheets/application_parker.scss +++ b/app/assets/stylesheets/application_parker.scss @@ -1,2 +1,10 @@ +/* +* TODO: This should be turned into a @import +* once blacklight_range_limit switches +* to using scss and @imports. +* Used by blacklight_range_limit +*= require 'blacklight_range_limit' +*/ + @import "base"; @import "modules/parker"; diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss index 31942dc13..38ed92266 100644 --- a/app/assets/stylesheets/base.scss +++ b/app/assets/stylesheets/base.scss @@ -7,7 +7,6 @@ @import "blacklight"; @import "blacklight_gallery"; @import "blacklight_heatmaps/default"; -@import "blacklight_range_limit.css"; @import "spotlight"; @import "sul_theme"; @import "viewers";