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.

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

update page icons to bootstrap #4265

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions app/assets/stylesheets/modules/constraints.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
line-height: $h4-font-size;
}

.bi-skip-backward-fill {
font-size: .9rem;
}

span.constraint.btn-group {
span.constraint-value {
border-top-left-radius: $sul-constraint-btn-radius;
Expand Down
7 changes: 6 additions & 1 deletion app/assets/stylesheets/modules/side-nav-minimap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@
background-color: $sul-side-nav-minimap-active-btn-bg;
}

i.fa, .sul-icon {
i.bi.bi-arrow-up-short, i.bi.bi-arrow-down-short {
font-size: 1.5rem;
vertical-align: sub;
}

i.bi, .sul-icon {
display: inline-block;
text-align: center;
width: 35px;
Expand Down
2 changes: 1 addition & 1 deletion app/components/blacklight/start_over_button_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Blacklight
class StartOverButtonComponent < Blacklight::Component
def call
link_to("<i class='fa fa-fast-backward'></i> <span class='d-none d-sm-inline'>#{label}</span></a>".html_safe, start_over_path, class: 'btn btn-primary btn-reset')
link_to("<i class='bi bi-skip-backward-fill'></i> <span class='d-none d-sm-inline'>#{label}</span></a>".html_safe, start_over_path, class: 'btn btn-primary btn-reset')
end

private
Expand Down
4 changes: 2 additions & 2 deletions app/views/shared/_side_nav_minimap.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<li>
<button data-target-id="topnav-container" aria-label="Jump to top">
<span class="nav-label">Top</span>
<i class="fa fa-arrow-up"></i>
<i class="bi bi-arrow-up-short"></i>
</button>
</li>

Expand All @@ -25,7 +25,7 @@
<li>
<button data-target-id="sul-footer-container" aria-label="Jump to bottom">
<span class="nav-label">Bottom</span>
<i class="fa fa-arrow-down"></i>
<i class="bi bi-arrow-down-short"></i>
</button>
</li>
</ul>
22 changes: 11 additions & 11 deletions config/locales/searchworks.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ en:
sms: 'text'
printer: 'printer'

back_to_search: '<i class="fa fa-fast-backward"></i><span class="d-none d-sm-inline">&nbsp; Back to results</span>'
back_to_search: '<i class="bi bi-skip-backward-fill"></i><span class="d-none d-sm-inline">&nbsp; Back to results</span>'
feedback_form:
success: '<strong>Thank you!</strong> Your feedback has been sent.'
connection_form:
Expand All @@ -333,45 +333,45 @@ en:
record_side_nav:
abstract:
id: "abstract"
icon: '<i class="fa fa-align-justify"></i>'
icon: '<i class="bi bi-justify"></i>'
label: "Abstract"
abstract_contents:
id: "abstract-contents"
icon: '<i class="fa fa-align-justify"></i>'
icon: '<i class="bi bi-justify"></i>'
label: "Contents"
contributors:
id: "contributors"
icon: '<i class="fa fa-user"></i>'
icon: '<i class="bi bi-person-fill"></i>'
label: "Contributors"
access_conditions:
id: "access-conditions"
icon: '<i class="fa fa-key"></i>'
icon: '<i class="bi bi-key-fill"></i>'
label: "Access"
contents_summary:
id: "contents-summary"
icon: '<i class="fa fa-align-justify"></i>'
icon: '<i class="bi bi-justify"></i>'
label: "Summary"
subjects:
id: "subjects"
icon: '<i class="fa fa-tags"></i>'
icon: '<i class="bi bi-tags-fill"></i>'
label: "Subjects"
bibliography_info:
id: "bibliography-info"
icon: '<i class="fa fa-info"></i>'
icon: '<i class="bi bi-info-circle"></i>'
label: "Info"
details:
id: "details"
icon: '<i class="fa fa-info"></i>'
icon: '<i class="bi bi-info-circle"></i>'
label: "Details"
browse_nearby:
id: "browse-nearby"
icon: '<span class="sul-icon sul-icon-books-3"></span>'
label: "Browse"
fulltext:
id: "full-text"
icon: '<i class="fa fa-align-justify"></i>'
icon: '<i class="bi bi-justify"></i>'
label: "Full Text"
summary:
id: "summary"
icon: '<i class="fa fa-align-justify"></i>'
icon: '<i class="bi bi-justify"></i>'
label: "Summary"
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
it "should render side nav content" do
expect(rendered).to have_css("ul.side-nav-minimap")

expect(rendered).to have_css(".side-nav-minimap button i.fa.fa-arrow-up")
expect(rendered).to have_css(".side-nav-minimap button i.fa.fa-arrow-down")
expect(rendered).to have_css(".side-nav-minimap button i.bi.bi-arrow-up-short")
expect(rendered).to have_css(".side-nav-minimap button i.bi.bi-arrow-down-short")

expect(rendered).to have_css(".side-nav-minimap button.contributors")
expect(rendered).to have_css(".side-nav-minimap button.contents-summary")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
it "renders side nav content" do
expect(rendered).to have_css("ul.side-nav-minimap")

expect(rendered).to have_css(".side-nav-minimap button i.fa.fa-arrow-up")
expect(rendered).to have_css(".side-nav-minimap button i.fa.fa-arrow-down")
expect(rendered).to have_css(".side-nav-minimap button i.bi.bi-arrow-up-short")
expect(rendered).to have_css(".side-nav-minimap button i.bi.bi-arrow-down-short")

expect(rendered).to have_css(".side-nav-minimap button.contributors")
expect(rendered).to have_css(".side-nav-minimap button.abstract-contents")
Expand Down