Merge branch...

Merge branch '273311-fy21q4-foundations-kr2-audit-and-update-buttons-on-searchcontroller-show' into 'master'

Audit and update buttons on SearchController#show

See merge request gitlab-org/gitlab!56122

app/assets/javascripts/search/sidebar/components/app.vue

@@ -32,7 +32,9 @@ export default {
     <status-filter />
     <confidentiality-filter />
     <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">{{
         __('Reset filters')
       }}</gl-link>

app/assets/javascripts/search/topbar/components/app.vue

@@ -65,9 +65,9 @@ export default {
         <label class="gl-display-block">{{ __('Project') }}</label>
         <project-filter :initial-data="projectInitialData" />
       </div>
-      <gl-button class="btn-search gl-lg-ml-2" variant="success" type="submit">{{
-        __('Search')
-      }}</gl-button>
+      <gl-button class="btn-search gl-lg-ml-2" category="primary" variant="confirm" type="submit"
+        >{{ __('Search') }}
+      </gl-button>
     </section>
   </gl-form>
 </template>

changelogs/unreleased/273311-fy21q4-foundations-kr2-audit-and-update-buttons-on-searchcontrolle.yml

+---
+title: Update Search and Apply buttons to confirm variant to align with Pajamas design system
+merge_request: 56122
+author:
+type: other