Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0b9ce3f3
Commit
0b9ce3f3
authored
Mar 23, 2021
by
Jeremy Elder
Committed by
Phil Hughes
Mar 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Audit and update buttons on SearchController#show
parent
79d2df0d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
app/assets/javascripts/search/sidebar/components/app.vue
app/assets/javascripts/search/sidebar/components/app.vue
+3
-1
app/assets/javascripts/search/topbar/components/app.vue
app/assets/javascripts/search/topbar/components/app.vue
+3
-3
changelogs/unreleased/273311-fy21q4-foundations-kr2-audit-and-update-buttons-on-searchcontrolle.yml
...tions-kr2-audit-and-update-buttons-on-searchcontrolle.yml
+5
-0
No files found.
app/assets/javascripts/search/sidebar/components/app.vue
View file @
0b9ce3f3
...
@@ -32,7 +32,9 @@ export default {
...
@@ -32,7 +32,9 @@ export default {
<status-filter
/>
<status-filter
/>
<confidentiality-filter
/>
<confidentiality-filter
/>
<div
class=
"gl-display-flex gl-align-items-center gl-mt-3"
>
<div
class=
"gl-display-flex gl-align-items-center gl-mt-3"
>
<gl-button
variant=
"success"
type=
"submit"
>
{{
__
(
'
Apply
'
)
}}
</gl-button>
<gl-button
category=
"primary"
variant=
"confirm"
size=
"small"
type=
"submit"
>
{{
__
(
'
Apply
'
)
}}
</gl-button>
<gl-link
v-if=
"showReset"
class=
"gl-ml-auto"
@
click=
"resetQuery"
>
{{
<gl-link
v-if=
"showReset"
class=
"gl-ml-auto"
@
click=
"resetQuery"
>
{{
__
(
'
Reset filters
'
)
__
(
'
Reset filters
'
)
}}
</gl-link>
}}
</gl-link>
...
...
app/assets/javascripts/search/topbar/components/app.vue
View file @
0b9ce3f3
...
@@ -65,9 +65,9 @@ export default {
...
@@ -65,9 +65,9 @@ export default {
<label
class=
"gl-display-block"
>
{{
__
(
'
Project
'
)
}}
</label>
<label
class=
"gl-display-block"
>
{{
__
(
'
Project
'
)
}}
</label>
<project-filter
:initial-data=
"projectInitialData"
/>
<project-filter
:initial-data=
"projectInitialData"
/>
</div>
</div>
<gl-button
class=
"btn-search gl-lg-ml-2"
variant=
"success"
type=
"submit"
>
{{
<gl-button
class=
"btn-search gl-lg-ml-2"
category=
"primary"
variant=
"confirm"
type=
"submit"
__
(
'
Search
'
)
>
{{
__
(
'
Search
'
)
}}
}}
</gl-button>
</gl-button>
</section>
</section>
</gl-form>
</gl-form>
</
template
>
</
template
>
changelogs/unreleased/273311-fy21q4-foundations-kr2-audit-and-update-buttons-on-searchcontrolle.yml
0 → 100644
View file @
0b9ce3f3
---
title
:
Update Search and Apply buttons to confirm variant to align with Pajamas design system
merge_request
:
56122
author
:
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment