Skip to content

Commit

Permalink
Merge pull request #2241 from samvera/some-frontend-fixes
Browse files Browse the repository at this point in the history
Some frontend fixes
  • Loading branch information
kirkkwang authored Jun 12, 2024
2 parents b3d552b + d2e3426 commit 7f4d418
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 15 deletions.
8 changes: 7 additions & 1 deletion app/assets/stylesheets/hyku.scss
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,12 @@ body.public-facing {
width: 1.5em;
}

// remove a button that appears on the facets menu in the catalog search results
// clicking this button seemingly does nothing
.catalog-index .facets-header > button {
display: none;
}

// make sure constraints are on only one line, even with markdown
span.constraint-value p, .facet-values p {
display: inline-block;
Expand All @@ -543,7 +549,7 @@ span.constraint-value p, .facet-values p {
}

// button to remove a filter should be red instead of white
.remove.dropdown-toggle .glyphicon.glyphicon-remove {
.remove.dropdown-toggle .fa.fa-remove {
color: #c4302b;
}

Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/themes/institutional_repository.scss
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@
margin-top: -25px;
}

.glyphicon-menu-right,
.glyphicon-menu-left {
.fa-chevron-right,
.fa-chevron-left {
color: #555;
display: inline-block;
font-weight: 700;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<span class="facet-label">
<span class="selected"><%= range_display(field_name) %></span>
<%= link_to remove_range_param(field_name), :class=>"remove", :title => t('blacklight.range_limit.remove_limit') do %>
<span class="glyphicon glyphicon-remove"></span>
<span class="fa fa-remove"></span>
<span class="sr-only">[<%= t('blacklight.range_limit.remove_limit') %>]</span>
<% end %>
</span>
Expand Down
2 changes: 1 addition & 1 deletion app/views/hyrax/admin/users/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<%= role.name.titleize %>
<%= link_to main_app.remove_role_admin_user_path(id: user.id, role_id: role.id), method: :delete, data: { confirm: t('hyrax.admin.users.roles.remove.confirmation', user: user.email, role: role.name.titleize) } do %>
<% if current_ability.admin? || (can?(:edit, User) && role.name != 'admin') %>
<span class="glyphicon glyphicon-remove"></span>
<span class="fa fa-remove"></span>
<% end %>
<% end %>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<%= link_to '#',
class: "btn btn-default btn-sm mt-20",
data: { behavior: 'select-work', target: '#worktypes-to-create', 'create-type' => 'single' } do %>
<i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
<i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
<% end %>
<% else # simple link to the first work type %>
<%= link_to new_polymorphic_path([main_app, @presenter.first_work_type]),
class: "btn btn-default btn-sm mt-20" do %>
<i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
<i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
<% end %>
<% end %>
<% else %>
<%= link_to hyrax.my_works_path,
class: "btn btn-default btn-sm mt-20" do %>
<i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
<i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
<% end %>
<% end %>
<p><%= link_to t(:'hyrax.pages.tabs.terms_page'), hyrax.terms_path, class: 'cr_terms' %></p>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/hyrax.de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ de:
product_twitter_handle: "@HydraInABox"
search:
button:
html: <span class="glyphicon glyphicon-search"></span> Gehen
html: <span class="fa fa-search"></span> Gehen
text: Suche
form:
option:
Expand Down
2 changes: 1 addition & 1 deletion config/locales/hyrax.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ en:
passive_consent_to_agreement: By saving this work I agree to the
search:
button:
html: <span class="glyphicon glyphicon-search"></span> Go
html: <span class="fa fa-search"></span> Go
text: Search
form:
option:
Expand Down
2 changes: 1 addition & 1 deletion config/locales/hyrax.es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ es:
product_twitter_handle: "@HydraInABox"
search:
button:
html: <span class="glyphicon glyphicon-search"></span> Vamos
html: <span class="fa fa-search"></span> Vamos
text: Buscar
form:
option:
Expand Down
2 changes: 1 addition & 1 deletion config/locales/hyrax.fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ fr:
product_twitter_handle: "@HydraInABox"
search:
button:
html: <span class="glyphicon glyphicon-search"></span> Aller
html: <span class="fa fa-search"></span> Aller
text: Chercher
form:
option:
Expand Down
2 changes: 1 addition & 1 deletion config/locales/hyrax.it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ it:
product_twitter_handle: "@HydraInABox"
search:
button:
html: <span class="glyphicon glyphicon-search"></span> Partire
html: <span class="fa fa-search"></span> Partire
text: Ricerca
form:
option:
Expand Down
2 changes: 1 addition & 1 deletion config/locales/hyrax.pt-BR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ pt-BR:
product_twitter_handle: "@HydraInABox"
search:
button:
html: <span class="glyphicon glyphicon-search"></span> Ir
html: <span class="fa fa-search"></span> Ir
text: Procurar
form:
option:
Expand Down
2 changes: 1 addition & 1 deletion config/locales/hyrax.zh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ zh:
product_twitter_handle: "@HydraInABox"
search:
button:
html: <span class="glyphicon glyphicon-search"></span>走
html: <span class="fa fa-search"></span>走
text: 搜索
form:
option:
Expand Down

0 comments on commit 7f4d418

Please sign in to comment.