Skip to content

Commit

Permalink
Merge pull request #1564 from projectblacklight/bs4a5
Browse files Browse the repository at this point in the history
Update components to use bootstrap 4.alpha5 classes
  • Loading branch information
cbeer committed Oct 28, 2016
2 parents 6014beb + e10a7c0 commit c7c3329
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions app/views/catalog/_facet_pagination.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="prev_next_links btn-group pull-md-left">
<div class="prev_next_links btn-group float-md-left">
<%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), params: search_state.to_h, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link', data: { blacklight_modal: "preserve" } do %>
<span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
<% end %>
Expand All @@ -8,7 +8,7 @@
<% end %>
</div>

<div class="sort-options btn-group pull-md-right">
<div class="sort-options btn-group float-md-right">
<% if @pagination.sort == 'index' -%>
<span class="active az btn btn-secondary"><%= t('blacklight.search.facets.sort.index') %></span>
<%= link_to(t('blacklight.search.facets.sort.count'), @pagination.params_for_resort_url('count', search_state.to_h), class: "sort_change numeric btn btn-secondary", data: { blacklight_modal: "preserve" }) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/catalog/_sort_and_per_page.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="sortAndPerPage" class="sort-pagination clearfix">
<%= render partial: "paginate_compact", object: @response if show_pagination? %>
<%= render_results_collection_tools wrapping_class: "search-widgets pull-md-right" %>
<%= render_results_collection_tools wrapping_class: "search-widgets float-md-right" %>
</div>
2 changes: 1 addition & 1 deletion app/views/search_history/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<%- if @searches.blank? -%>
<h3 class='section-heading'><%=t('blacklight.search_history.no_history')%></h3>
<%- else -%>
<%= link_to t('blacklight.search_history.clear.action_title'), blacklight.clear_search_history_path, :method => :delete, :data => { :confirm => t('blacklight.search_history.clear.action_confirm') }, :class => 'btn btn-danger pull-md-right' %>
<%= link_to t('blacklight.search_history.clear.action_title'), blacklight.clear_search_history_path, :method => :delete, :data => { :confirm => t('blacklight.search_history.clear.action_confirm') }, :class => 'btn btn-danger float-md-right' %>
<h3 class='section-heading'><%=t('blacklight.search_history.recent')%></h3>
<table class="table table-striped search-history">
<%- @searches.each_with_index do |search,index| -%>
Expand Down
6 changes: 2 additions & 4 deletions app/views/shared/_header_navbar.html.erb
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<nav id="header-navbar" class="navbar navbar-dark bg-inverse navbar-full" role="navigation">
<div class="<%= container_classes %>">
<button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
&#9776;
</button>
<button class="navbar-toggler hidden-xs-up" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation"></button>

<%= link_to application_name, root_path, class: "navbar-brand" %>

<div class="collapse navbar-toggleable-xs pull-md-right" id="user-util-collapse">
<div class="collapse navbar-toggleable-xs float-md-right" id="user-util-collapse">
<%= render partial: '/user_util_links' %>
</div>
</div>
Expand Down

0 comments on commit c7c3329

Please sign in to comment.