diff --git a/Gemfile b/Gemfile index e641a024..1b09dbc5 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,16 @@ gem 'coffee-rails', '~> 4.1.0' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby +# PUL Assets +gem 'pul-assets', :git => 'git@github.com:pulibrary/pul_assets.git', :branch => :master +# PUL Assets - Dependencies +gem 'modernizr-rails' +gem 'normalize-rails' +gem 'susy' +gem 'breakpoint' +gem 'bourbon' +gem 'jquery-tablesorter' + # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks diff --git a/Gemfile.lock b/Gemfile.lock index ebf9de9f..0df2181d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,6 +35,15 @@ GIT tophat underscore-rails (~> 1.6) +GIT + remote: git@github.com:pulibrary/pul_assets.git + revision: 459643d50525811ea0e1adebee5f2a914df10229 + branch: master + specs: + pul-assets (0.2.2) + bourbon (~> 4.2.6) + susy (~> 2.2.12) + GEM remote: https://rubygems.org/ specs: @@ -112,7 +121,13 @@ GEM autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.3.0) + bourbon (4.2.6) + sass (~> 3.4) + thor (~> 0.19) breadcrumbs_on_rails (2.3.1) + breakpoint (2.7.0) + sass (~> 3.3) + sassy-maps (< 1.0.0) builder (3.2.2) bunny (2.2.2) amq-protocol (>= 2.0.1) @@ -247,6 +262,8 @@ GEM rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jquery-tablesorter (1.20.5) + railties (>= 3.2, < 6) json (1.8.3) jwt (1.5.2) kaminari (0.16.3) @@ -276,6 +293,7 @@ GEM mini_magick (4.3.6) mini_portile2 (2.0.0) minitest (5.8.3) + modernizr-rails (2.7.1) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) @@ -285,6 +303,7 @@ GEM netrc (0.11.0) nokogiri (1.6.7.1) mini_portile2 (~> 2.0.0.rc2) + normalize-rails (3.0.3) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -411,6 +430,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassy-maps (0.4.0) + sass (~> 3.3) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -454,6 +475,8 @@ GEM sshkit (1.8.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + susy (2.2.12) + sass (>= 3.3.0, < 3.5) term-ansicolor (1.3.2) tins (~> 1.0) test_xml (0.1.7) @@ -506,6 +529,8 @@ DEPENDENCIES blacklight-gallery (>= 0.3.0) blacklight-oembed blacklight-spotlight! + bourbon + breakpoint byebug capistrano-passenger capistrano-rails @@ -522,11 +547,15 @@ DEPENDENCIES jbuilder (~> 2.0) jettywrapper (>= 2.0) jquery-rails + jquery-tablesorter + modernizr-rails + normalize-rails omniauth-cas open_uri_redirections pg poltergeist pry-rails + pul-assets! rails (= 4.2.5) rsolr (~> 1.0.6) rspec-rails @@ -540,6 +569,7 @@ DEPENDENCIES social-share-button spring sqlite3 + susy turbolinks uglifier (>= 1.3.0) vcr diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 10d55cad..9b723cd2 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,5 +15,6 @@ //= require turbolinks// // Required by Blacklight //= require blacklight/blacklight +//= require pul-assets //= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 88% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss index f9cd5b34..1fca7291 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.scss @@ -13,3 +13,11 @@ *= require_tree . *= require_self */ + +@import 'pul-assets'; + +@import 'utils/variables__bootstrap'; + +body { + margin-bottom: 0; +} diff --git a/app/assets/stylesheets/spotlight.scss b/app/assets/stylesheets/spotlight.scss index 3ba194a7..8d846864 100644 --- a/app/assets/stylesheets/spotlight.scss +++ b/app/assets/stylesheets/spotlight.scss @@ -8,4 +8,4 @@ @import 'sir-trevor'; @import 'sir-trevor-icons'; @import 'bootstrap'; -@import 'spotlight/spotlight'; \ No newline at end of file +@import 'spotlight/spotlight'; diff --git a/app/views/layouts/spotlight/spotlight.html.erb b/app/views/layouts/spotlight/spotlight.html.erb new file mode 100644 index 00000000..77c9bc7d --- /dev/null +++ b/app/views/layouts/spotlight/spotlight.html.erb @@ -0,0 +1,50 @@ + +
+ + + + + + + + + + +