Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix broken icons #1768

Merged
merged 2 commits into from
Aug 9, 2024
Merged

Fix broken icons #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd7ee28
Fix broken icons
andysellick Aug 8, 2024
74b2ea6
Fix missing remove icons
andysellick Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/views/related-content-tagger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
21 changes: 21 additions & 0 deletions app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion app/views/taggings/_tagging_entry.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%= tagging_update.title_for_related_link(base_path) %> (<%= base_path %>)
</a>

<a href="#" class="select2-search-choice-close" tabindex="-1"></a>
<a href="#" class="js-remove-related glyphicon glyphicon-remove remove-icon" tabindex="-1" title="Remove <%= base_path %>"></a>

<span class="glyphicon glyphicon-resize-vertical" aria-hidden="true"></span>

Expand Down
Loading