-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #743 from WGBH-MLA/i54-dual-booting-ui
i54 Get UI working with Dual Boot Conditionals
- Loading branch information
Showing
18 changed files
with
345 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| // This is a manifest file that'll be compiled into application.js, which will include all the files | ||
| // listed below. | ||
| // | ||
| // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's | ||
| // vendor/assets/javascripts directory can be referenced here using a relative path. | ||
| // | ||
| // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the | ||
| // compiled file. JavaScript code in this file should be added after the last require_* statement. | ||
| // | ||
| // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details | ||
| // about supported directives. | ||
| // | ||
| //= require turbolinks | ||
| // | ||
| // Required by Blacklight | ||
| //= require jquery3 | ||
| //= require 'blacklight_advanced_search' | ||
|
|
||
|
|
||
| //= require rails-ujs | ||
| //= require popper | ||
| //= require twitter/typeahead | ||
| //= require bootstrap | ||
| //= require jquery-ui | ||
| //= require jquery.dataTables | ||
| //= require dataTables.bootstrap4 | ||
| //= require blacklight/blacklight | ||
| //= require ./global/blacklight_gallery | ||
| //= require video | ||
|
|
||
| //= require bulkrax/application | ||
| //= require_tree ./global | ||
| //= require hyrax | ||
| //= require bootstrap-multiselect |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * This is a manifest file that'll be compiled into application.css, which will include all the files | ||
| * listed below. | ||
| * | ||
| * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's | ||
| * vendor/assets/stylesheets directory can be referenced here using a relative path. | ||
| * | ||
| * You're free to add application-wide styles to this file and they'll appear at the bottom of the | ||
| * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS | ||
| * files in this directory. Styles in this file should be added after the last require_* statement. | ||
| * It is generally better to create a new file per style scope. | ||
| * | ||
| *= require_tree ./global_rails_6_1 | ||
| *= require dataTables.bootstrap4 | ||
| *= require 'bulkrax/application' | ||
| *= require_self | ||
| *= require 'blacklight_advanced_search' | ||
| *= require bootstrap-multiselect | ||
| *= require video-js | ||
| */ |
11 changes: 11 additions & 0 deletions
11
app/assets/stylesheets/global_rails_6_1/accordion_icon.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| .panel-heading .accordion-toggle:after { | ||
| /* symbol for "opening" panels */ | ||
| font-family: 'Glyphicons Halflings'; /* essential for enabling glyphicon */ | ||
| content: "\e114"; /* adjust as needed, taken from bootstrap.css */ | ||
| float: right; /* adjust as needed */ | ||
| color: grey; /* adjust as needed */ | ||
| } | ||
| .panel-heading .accordion-toggle.collapsed:after { | ||
| /* symbol for "collapsed" panels */ | ||
| content: "\e080"; /* adjust as needed, taken from bootstrap.css */ | ||
| } |
32 changes: 32 additions & 0 deletions
32
app/assets/stylesheets/global_rails_6_1/ams_icons.scss.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // Adds to the .work-type-tag definiton originally defined by Hyrax. | ||
| // This allows the child span.[work_type]-icon | ||
| .work-type-tag { | ||
| display: flex; | ||
| } | ||
|
|
||
| %work-type-icon { | ||
| background-repeat: no-repeat; | ||
| background-size: contain; | ||
| width: 40px; | ||
| margin-right: 10px; | ||
| } | ||
|
|
||
| .asset-icon { | ||
| @extend %work-type-icon; | ||
| background-image: url("<%= asset_path 'asset.png' %>"); | ||
| } | ||
|
|
||
| .essence-track-icon { | ||
| @extend %work-type-icon; | ||
| background-image: url("<%= asset_path 'essence_track.png' %>"); | ||
| } | ||
|
|
||
| .digital-instantiation-icon { | ||
| @extend %work-type-icon; | ||
| background-image: url("<%= asset_path 'digital_instantiation.png' %>"); | ||
| } | ||
|
|
||
| .physical-instantiation-icon { | ||
| @extend %work-type-icon; | ||
| background-image: url("<%= asset_path 'physical_instantiation.png' %>"); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* ... | ||
| *= require jquery-ui | ||
| *= require select2 | ||
| *= require_self | ||
| */ | ||
|
|
||
| @import "bootstrap-default-overrides"; | ||
| @import 'bootstrap'; | ||
| @import 'blacklight/blacklight'; | ||
| @import "font-awesome"; | ||
| @import "blacklight_gallery/gallery"; | ||
| @import "blacklight_gallery/masonry"; | ||
| @import "blacklight_gallery/slideshow"; | ||
| @import "blacklight_gallery/osd_viewer"; | ||
| @import "hyrax/blacklight_gallery"; | ||
| @import 'hyrax/hyrax'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| /* | ||
| *= require openseadragon/openseadragon | ||
| */ |
78 changes: 78 additions & 0 deletions
78
app/assets/stylesheets/global_rails_6_1/search_results.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| div.facets h3 { | ||
| font-size: 1.3em; | ||
| } | ||
|
|
||
| .search-form .form-control { | ||
| height: 35px; | ||
| } | ||
| .search-form a.advanced_search { | ||
| margin: 0 !important; | ||
| border-left: 0; | ||
| } | ||
| .search-form .input-group-btn .scope_select { | ||
| border-radius: 0; | ||
| } | ||
|
|
||
| #sort-dropdown .dropdown-toggle, #per_page-dropdown .dropdown-toggle { | ||
| color: rgb(57,57,59); | ||
| } | ||
|
|
||
| .search-result-title a { | ||
| color: rgb(57,57,59); | ||
| } | ||
|
|
||
| .metadata h4 { | ||
| display: inline; | ||
| font-size: 14px; | ||
| font-weight: bold; | ||
| margin-left: 10px; | ||
| } | ||
|
|
||
| .metadata-col { | ||
| margin: 5px auto; | ||
| } | ||
|
|
||
| .metadata .metadata-desc-col p { | ||
| margin: 10px 0 0 10px; | ||
| } | ||
|
|
||
| @media screen and (max-width: 767px){ | ||
| .metadata h4 { | ||
| margin-left: 0; | ||
| } | ||
|
|
||
| .metadata .metadata-desc-col p { | ||
| margin: 0; | ||
| } | ||
| } | ||
|
|
||
| .green { | ||
| color: green; | ||
| } | ||
|
|
||
| .red { | ||
| color: red; | ||
| } | ||
|
|
||
| .aapb-push-button { | ||
| vertical-align: middle; | ||
| line-height: 20px; | ||
| font-size: 14px; | ||
| font-weight: 400; | ||
| display: inline-block; | ||
| color: #333; | ||
| background-color: #fff; | ||
| border: 1px solid #ccc; | ||
| padding-top: 6px; | ||
| padding-left: 12px; | ||
| padding-right: 12px; | ||
| padding-bottom: 6px; | ||
| border-radius: 4px; | ||
| } | ||
|
|
||
| .aapb-push-button:hover { | ||
| background-color: #ddd; | ||
| border: 1px solid #bbb; | ||
| text-decoration: none; | ||
| color: #000; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| select.multiple_titles_with_types, | ||
| select.multiple_descriptions_with_types, | ||
| select.multiple_dates_with_types { | ||
| width: 30% !important; | ||
| } | ||
|
|
||
| input.multiple_titles_with_types, | ||
| input.multiple_dates_with_types, | ||
| textarea.multiple_descriptions_with_types { | ||
| width: 65% !important; | ||
| margin-right: 5px !important; | ||
| } | ||
|
|
||
| select.child_contributors | ||
| { | ||
| width: 22% !important; | ||
| } | ||
|
|
||
| input.child_contributors | ||
| { | ||
| width: 22% !important; | ||
| margin-left: 5px !important; | ||
| } | ||
|
|
||
| select.child_annotations | ||
| { | ||
| width: 16% !important; | ||
| } | ||
|
|
||
| input.child_annotations | ||
| { | ||
| width: 16% !important; | ||
| margin-left: 3px !important; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| .canonical-image { | ||
| display: block; | ||
| padding: 0.5em 0; | ||
| width: 100%; | ||
| } | ||
|
|
||
| .mejs__container { | ||
| margin: 0 auto !important; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <%# OVERRIDE Hyrax 4.0 to allow for dual boot %> | ||
| <%= csrf_meta_tag %> | ||
| <meta charset="utf-8" /> | ||
| <%# Only display meta tag, which enables creation of the ActionCable | ||
| consumer, when realtime notifications are enabled and the user is | ||
| signed in %> | ||
| <% if Hyrax.config.realtime_notifications? && signed_in? %> | ||
| <%= tag :meta, name: 'current-user', data: { user_key: current_user.user_key } %> | ||
| <% end %> | ||
| <!-- added for use on small devices like phones --> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <link rel="resourcesync" href="<%= hyrax.capability_list_url %>" /> | ||
|
|
||
| <!-- Twitter card metadata --> | ||
| <%= yield :twitter_meta %> | ||
| <!-- Google Scholar metadata --> | ||
| <%= yield :gscholar_meta %> | ||
|
|
||
| <title><%= content_for?(:page_title) ? yield(:page_title) : default_page_title %></title> | ||
|
|
||
| <%# OVERRIDE to allow for dual boot start %> | ||
| <% if App.rails_5_1? %> | ||
| <!-- application css --> | ||
| <%= stylesheet_link_tag 'application' %> | ||
| <!-- application js --> | ||
| <%= javascript_include_tag 'application' %> | ||
| <% else %> | ||
| <!-- application css --> | ||
| <%= stylesheet_link_tag 'application_rails_6_1' %> | ||
| <!-- application js --> | ||
| <%= javascript_include_tag 'application_rails_6_1' %> | ||
| <% end %> | ||
| <%# OVERRIDE end %> | ||
| <%= render 'shared/appearance_styles' %> | ||
| <% if Hyrax.config.analytics? %> | ||
| <% if Hyrax.config.analytics_provider == 'google' %> | ||
| <%= render partial: 'shared/ga', formats: [:html] %> | ||
| <% elsif Hyrax.config.analytics_provider == 'matomo' %> | ||
| <%= render partial: 'shared/matomo', formats: [:html] %> | ||
| <% end %> | ||
| <% end %> | ||
|
|
||
| <!-- for extras, e.g., a favicon --> | ||
| <%= render partial: '/head_tag_extras', formats: [:html] %> |
Oops, something went wrong.