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

Replace jumpMenu controls with menu-button components #2814

Draft
wants to merge 47 commits into
base: dev
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d064beb
Add showSelectedValue option in menu-button component.
demiankatz Mar 31, 2023
bbe193c
Convert sort control to use menu-button.
demiankatz Mar 31, 2023
d97e578
Fix style.
demiankatz Mar 31, 2023
2706988
Convert limit control.
demiankatz Mar 31, 2023
9fa8233
php-cs-fixer
demiankatz Mar 31, 2023
c8ff113
Merge branch 'dev' into jumpmenu-to-menu-button
demiankatz Apr 4, 2023
0e2711b
Add support for custom link attributes.
demiankatz Apr 4, 2023
88cb036
Eliminate library card jump menu.
demiankatz Apr 4, 2023
7854e41
Fix styles.
demiankatz Apr 4, 2023
694dc0c
Style tweak.
demiankatz Apr 4, 2023
a621742
Refactor myresearch sort.
demiankatz Apr 4, 2023
626f46e
Allow no label.
demiankatz Apr 4, 2023
72fe14b
Refactor scheduled search control.
demiankatz Apr 4, 2023
9590f21
Finish jumpmenu conversion.
demiankatz Apr 4, 2023
01df62f
Remove jumpMenu logic.
demiankatz Apr 4, 2023
d496be6
style: apply button styles and alignment to new search controls.
crhallberg Apr 11, 2023
f6fca3e
Merge branch 'dev' into jumpmenu-to-menu-button
demiankatz Apr 12, 2023
0bb8fac
Separate selected value from label.
demiankatz Apr 12, 2023
83db603
style: visual and code styles.
crhallberg Apr 12, 2023
6cc486a
Revert accidental change.
demiankatz Apr 13, 2023
b7f3943
lessToSass
demiankatz Apr 13, 2023
0970aa1
Space out icon with CSS instead of actual space.
demiankatz Apr 13, 2023
1825b0f
Fix SearchLimitTest and make some associated fixes/improvements.
demiankatz Apr 13, 2023
09c6326
Fix SavedSearchesTest.
demiankatz Apr 13, 2023
607cb34
php-cs-fixer
demiankatz Apr 13, 2023
625c694
Merge branch 'dev' into jumpmenu-to-menu-button
demiankatz Apr 13, 2023
ad4af22
Merge branch 'dev' into jumpmenu-to-menu-button
demiankatz Jun 21, 2023
b713db9
Merge remote-tracking branch 'origin/dev' into jumpmenu-to-menu-button
crhallberg Jul 25, 2023
307197f
Merge branch 'dev' into jumpmenu-to-menu-button-2
EreMaijala Jan 11, 2024
7133452
Fix search controls, stack vertically.
EreMaijala Jan 11, 2024
63bed40
Fix alignment and spacing issues.
EreMaijala Jan 11, 2024
6ebf0f5
Fix empty label and white-space decoration issue in search history.
EreMaijala Jan 11, 2024
aa5824c
Fix Mink tests.
EreMaijala Jan 11, 2024
89014c8
Improve dropdown alignment and nav menu button style.
EreMaijala Jan 11, 2024
46be96d
Fix code style.
EreMaijala Jan 11, 2024
2144891
Merge pull request #29 from EreMaijala/jumpmenu-to-menu-button
demiankatz Jan 11, 2024
fd7264e
Merge remote-tracking branch 'origin/dev' into jumpmenu-to-menu-button
crhallberg Feb 6, 2024
d59134f
fix: style search controls to take up enough room.
crhallberg Feb 6, 2024
26171bc
lessToSass.
demiankatz Feb 8, 2024
4acca55
Merge branch 'dev' into jumpmenu-to-menu-button
demiankatz Feb 8, 2024
b0e7cab
Restore missing definition.
demiankatz Feb 8, 2024
f6a9570
Merge remote-tracking branch 'origin/dev' into jumpmenu-to-menu-button
crhallberg Feb 27, 2024
b0cd316
Merge remote-tracking branch 'origin/dev' into jumpmenu-to-menu-button
crhallberg Feb 28, 2024
c7dfee4
Use clickCss where possible.
demiankatz Feb 28, 2024
9ca7d95
Merge remote-tracking branch 'origin/dev' into jumpmenu-to-menu-button
crhallberg Mar 25, 2024
cf7d254
Merge remote-tracking branch 'origin/dev' into jumpmenu-to-menu-button
crhallberg May 7, 2024
2e0e7e0
chore: less
crhallberg May 7, 2024
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
Prev Previous commit
Next Next commit
style: apply button styles and alignment to new search controls.
  • Loading branch information
crhallberg committed Apr 11, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit d496be64291fa009c4bd0a13427d33e452e3bbb2
4 changes: 2 additions & 2 deletions themes/bootprint3/css/compiled.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions themes/bootstrap3/css/compiled.css

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions themes/bootstrap3/less/components/search.less
Original file line number Diff line number Diff line change
@@ -57,9 +57,13 @@ header .container.navbar { margin-bottom: 0; }
}

@media (min-width: 768px) {
.search-header { display: flex; }
.search-header,
.search-controls {
display: flex;
align-items: center;
gap: 6px;
}
.search-stats { flex-grow: 1; }
.search-controls { text-align: right; }
}

.versions-tab {
@@ -73,6 +77,11 @@ header .container.navbar { margin-bottom: 0; }
}
}

.search__option .dropdown-toggle {
&:extend(.btn);
&:extend(.btn-default);
}

.record-nav,
.bulkActionButtons {
.clearfix();
13 changes: 11 additions & 2 deletions themes/bootstrap3/scss/components/search.scss
Original file line number Diff line number Diff line change
@@ -57,9 +57,13 @@ header .container.navbar { margin-bottom: 0; }
}

@media (min-width: 768px) {
.search-header { display: flex; }
.search-header,
.search-controls {
display: flex;
align-items: center;
gap: 6px;
}
.search-stats { flex-grow: 1; }
.search-controls { text-align: right; }
}

.versions-tab {
@@ -73,6 +77,11 @@ header .container.navbar { margin-bottom: 0; }
}
}

.search__option .dropdown-toggle {
@extend .btn;
@extend .btn-default;
}

.record-nav,
.bulkActionButtons {
@include clearfix();
1 change: 1 addition & 0 deletions themes/bootstrap3/templates/search/controls/limit.phtml
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
echo $this->component(
'menu-button',
[
'wrapperClass' => 'search__option',
'showSelectedValue' => true,
'toggleLabel' => 'Results per page',
'menuItems' => array_map(
1 change: 1 addition & 0 deletions themes/bootstrap3/templates/search/controls/sort.phtml
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
echo $this->component(
'menu-button',
[
'wrapperClass' => 'search__option',
'showSelectedValue' => true,
'toggleLabel' => 'Sort',
'menuItems' => array_map(
4 changes: 2 additions & 2 deletions themes/local_theme_example/css/compiled.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions themes/sandal/css/compiled.css

Large diffs are not rendered by default.