Skip to content

Commit e6ccfa3

Browse files
committed
Merge pull request #540 from sul-dlss/move_slideshow
Moved slideshow into blacklight-gallery
2 parents 327f890 + 4f470c5 commit e6ccfa3

File tree

11 files changed

+4
-294
lines changed

11 files changed

+4
-294
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gem 'sprockets', '2.11.0'
2424
# it'll want sass 3.2.0 and we'll have a conflict
2525
gem 'sass', '~> 3.2.0'
2626

27-
gem "blacklight-gallery", github: 'projectblacklight/blacklight-gallery'
27+
gem 'blacklight-gallery', github: 'projectblacklight/blacklight-gallery'
2828
gem 'sir-trevor-rails', github: 'sul-dlss/sir-trevor-rails'
2929

3030
group :test do

app/assets/javascripts/spotlight/slideshow.js

Lines changed: 0 additions & 84 deletions
This file was deleted.
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
/*
2-
*= require 'blacklight_gallery/default'
3-
*/
4-
51
.blacklight-browse {
62
.index-document-functions {
73
display: none;
84
}
9-
}
5+
}

app/assets/stylesheets/spotlight/_slideshow.css.scss

Lines changed: 0 additions & 100 deletions
This file was deleted.

app/assets/stylesheets/spotlight/_spotlight.css.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66
@import "spotlight/variables";
77
@import "bootstrap/variables";
8+
89
@import "spotlight/sir-trevor";
910
@import "spotlight/attachments";
1011
@import "spotlight/pages";
12+
@import 'blacklight_gallery/default';
1113
@import "spotlight/browse";
1214
@import "spotlight/header";
1315
@import "spotlight/footer";
1416
@import "spotlight/catalog";
15-
@import "spotlight/slideshow";
1617
@import "spotlight/curation";
1718
@import "spotlight/exhibit_admin";
1819
@import "spotlight/item_text_block";

app/views/spotlight/catalog/_document_slideshow.html.erb

Lines changed: 0 additions & 22 deletions
This file was deleted.

app/views/spotlight/catalog/_grid_slideshow.html.erb

Lines changed: 0 additions & 7 deletions
This file was deleted.

app/views/spotlight/catalog/_index_slideshow.html.erb

Lines changed: 0 additions & 8 deletions
This file was deleted.

app/views/spotlight/catalog/_slideshow.html.erb

Lines changed: 0 additions & 39 deletions
This file was deleted.

config/locales/spotlight.en.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,6 @@ en:
172172
inprogress:
173173
label: ""
174174
private: "Private"
175-
document_slideshow:
176-
header: Click an image to start the slideshow
177175
admin:
178176
title: Curation - Items
179177
header: Items

0 commit comments

Comments
 (0)