Merge pull request #1617 from projectblacklight/bootstrap-fixes

Bootstrap fixes
projectblacklight · Jan 22, 2017 · 3cdde55 · 3cdde55
2 parents f9fa0a8 + 444bd3e
commit 3cdde55
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/app/views/bookmarks/_tools.html.erb b/app/views/bookmarks/_tools.html.erb
@@ -1,6 +1,6 @@
 <ul class="<%= controller_name %>Tools nav nav-pills">
   <%= render_show_doc_actions document_list, document: nil, document_list: @response.documents, url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h) do |config, inner| %>
-    <li>
+    <li class="nav-item">
       <%= inner %>
     </li>
   <% end %>

diff --git a/app/views/catalog/_document_action.html.erb b/app/views/catalog/_document_action.html.erb
@@ -1,4 +1,5 @@
 <%= link_to document_action_label(document_action_config.key, document_action_config),
             document_action_path(document_action_config, (local_assigns.has_key?(:url_opts) ? url_opts : {}).merge(({id: document} if document) || {})),
             id: document_action_config.fetch(:id, "#{document_action_config.key}Link"),
+            class: 'nav-link',
             data: {}.merge(({ blacklight_modal: "trigger" } if document_action_config.modal != false) || {}) %>
diff --git a/app/views/catalog/_email_form.html.erb b/app/views/catalog/_email_form.html.erb
@@ -5,7 +5,7 @@
              method: :post do %>
 
   <div class="modal-body">
-    <%= render '/flash_msg' %>
+    <%= render '/shared/flash_msg' %>
     <div class="form-group row">
       <label class="control-label col-sm-2" for="to">
         <%= t('blacklight.email.form.to') %>

diff --git a/app/views/catalog/_sms_form.html.erb b/app/views/catalog/_sms_form.html.erb
@@ -4,7 +4,7 @@
              class: "modal_form",
              method: :post do %>
 <div class="modal-body">
-  <%= render '/flash_msg' %>
+  <%= render '/shared/flash_msg' %>
     <div class="form-group row">
       <label class="control-label col-sm-2" for="to"> 
         <%= t('blacklight.sms.form.to') %>

diff --git a/app/views/catalog/email_success.html.erb b/app/views/catalog/email_success.html.erb
@@ -4,6 +4,6 @@
 </div>
 
 <div class="modal-body">
-  <%= render partial: '/flash_msg' %>
+  <%= render partial: '/shared/flash_msg' %>
   <span data-blacklight-modal="close"></span>
 </div>
diff --git a/app/views/catalog/sms_success.html.erb b/app/views/catalog/sms_success.html.erb
@@ -4,6 +4,6 @@
 </div>
 
 <div class="modal-body">
-  <%= render partial: '/flash_msg' %>
+  <%= render partial: '/shared/flash_msg' %>
   <span data-blacklight-modal="close"></span>
 </div>