Skip to content

Commit

Permalink
Merge branch 'production' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Dolski committed Mar 1, 2024
2 parents f768d2b + 467e48e commit 69f0e1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/assets/javascripts/items.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const ItemsView = {

// When the All Items tab is selected, remove all other search input.
allItemsTab.on("show.bs.tab", function () {
window.location = "/items";
window.location = "/search";
});

// When the Simple Search or Advanced Search submit button is clicked,
Expand Down
4 changes: 2 additions & 2 deletions app/views/search/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
role: "tab",
type: "button",
"aria-controls": "simple-search",
"aria-selected": "true"} Simple Search
"aria-selected": "false"} Simple Search
%li.nav-item{role: "presentation"}
%button#advanced-search-tab.nav-link{"data-bs-toggle": "pill",
"data-bs-target": "#advanced-search",
role: "tab",
type: "button",
"aria-controls": "advanced-search",
"aria-selected": "true"} Advanced Search
"aria-selected": "false"} Advanced Search
.tab-content
#all-items.tab-pane.fade.show.active{role: "tabpanel",
"aria-labelledby": "all-items-tab"}
Expand Down

0 comments on commit 69f0e1b

Please sign in to comment.