diff --git a/app/assets/javascripts/views/related-content-tagger.js b/app/assets/javascripts/views/related-content-tagger.js index b1dfd15f3..1dc36b08d 100644 --- a/app/assets/javascripts/views/related-content-tagger.js +++ b/app/assets/javascripts/views/related-content-tagger.js @@ -10,7 +10,7 @@ var $templateTag = $fieldset.find('.related-item-template > li').first() var $fieldErrors = $fieldset.find('.related-item-error-message') - $fieldset.on('click', '.select2-search-choice-close', removeItem) + $fieldset.on('click', '.js-remove-related', removeItem) $basePathInput.on('keypress', lookUpBasePathOnEnterPress) $lookupButton.on('click', lookUpBasePath) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 9a30cfa7d..30b5a4199 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -86,3 +86,24 @@ .nav.nav-tabs { margin-bottom: 20px; } + +@font-face { + font-family: "Glyphicons Halflings"; + src: url("bootstrap/glyphicons-halflings-regular.eot"); + src: url("bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"),url("bootstrap/glyphicons-halflings-regular.woff2") format("woff2"),url("bootstrap/glyphicons-halflings-regular.woff") format("woff"),url("bootstrap/glyphicons-halflings-regular.ttf") format("truetype"),url("bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg") +} + +.sortable-list .glyphicon.remove-icon { + float: left; + margin-left: -20px; + margin-right: 10px; +} + +// overrides for select2 as it doesn't compile properly in dart-sass, uses image-url +.select2-container .select2-choice .select2-arrow { + background: url("select2.png") no-repeat 0 1px; +} + +.select2-search-choice-close { + background: url("select2.png") right top no-repeat; +} diff --git a/app/views/taggings/_tagging_entry.html.erb b/app/views/taggings/_tagging_entry.html.erb index 9ef5aebdb..9e990327a 100644 --- a/app/views/taggings/_tagging_entry.html.erb +++ b/app/views/taggings/_tagging_entry.html.erb @@ -7,7 +7,7 @@ <%= tagging_update.title_for_related_link(base_path) %> (<%= base_path %>) - +