Merge branch 'fix-default-category-for-dropdowns-gitlab-ui-integration-test' into 'master'

Fix styling of various dropdowns See merge request gitlab-org/gitlab!48800

Merge branch 'fix-default-category-for-dropdowns-gitlab-ui-integration-test' into 'master'
Fix styling of various dropdowns See merge request gitlab-org/gitlab!48800
2bb6d7d1 · Kushal Pandya · 25e2d584 · 94943827 · 2bb6d7d1 · 2bb6d7d1
Commit 2bb6d7d1 authored Nov 30, 2020 by Kushal Pandya
16 changed files
--- a/changelogs/unreleased/fix-default-category-for-dropdowns-gitlab-ui-integration-test.yml
+++ b/changelogs/unreleased/fix-default-category-for-dropdowns-gitlab-ui-integration-test.yml
+---
+title: Fix styling of various dropdowns
+merge_request: 48800
+author:
+type: fixed
--- a/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/labels_selector_spec.js.snap
+++ b/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/labels_selector_spec.js.snap
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`Value Stream Analytics LabelsSelector with no item selected will render the label selector 1`] = `
-"<gl-dropdown-stub headertext=\\"\\" text=\\"\\" category=\\"tertiary\\" variant=\\"default\\" size=\\"medium\\" toggleclass=\\"gl-overflow-hidden\\" class=\\"gl-w-full\\">
+"<gl-dropdown-stub headertext=\\"\\" text=\\"\\" category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" toggleclass=\\"gl-overflow-hidden\\" class=\\"gl-w-full\\">
  <gl-dropdown-section-header-stub>Select a label </gl-dropdown-section-header-stub>
  <div class=\\"mb-3 px-3\\">
    <gl-search-box-by-type-stub value=\\"\\" clearbuttontitle=\\"Clear\\"></gl-search-box-by-type-stub>
@@ -30,7 +30,7 @@ exports[`Value Stream Analytics LabelsSelector with no item selected will render
 `;

 exports[`Value Stream Analytics LabelsSelector with selectedLabelId set will render the label selector 1`] = `
-"<gl-dropdown-stub headertext=\\"\\" text=\\"\\" category=\\"tertiary\\" variant=\\"default\\" size=\\"medium\\" toggleclass=\\"gl-overflow-hidden\\" class=\\"gl-w-full\\">
+"<gl-dropdown-stub headertext=\\"\\" text=\\"\\" category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" toggleclass=\\"gl-overflow-hidden\\" class=\\"gl-w-full\\">
  <gl-dropdown-section-header-stub>Select a label </gl-dropdown-section-header-stub>
  <div class=\\"mb-3 px-3\\">
    <gl-search-box-by-type-stub value=\\"\\" clearbuttontitle=\\"Clear\\"></gl-search-box-by-type-stub>

--- a/ee/spec/frontend/analytics/productivity_analytics/components/__snapshots__/metric_chart_spec.js.snap
+++ b/ee/spec/frontend/analytics/productivity_analytics/components/__snapshots__/metric_chart_spec.js.snap
@@ -23,7 +23,7 @@ exports[`MetricChart component template when isLoading is false and chartData is
  <!---->
   
  <gl-dropdown-stub
-    category="tertiary"
+    category="primary"
    class="mb-4 metric-dropdown"
    headertext=""
    menu-class="w-100 mw-100"

--- a/ee/spec/frontend/analytics/productivity_analytics/components/__snapshots__/mr_table_spec.js.snap
+++ b/ee/spec/frontend/analytics/productivity_analytics/components/__snapshots__/mr_table_spec.js.snap
@@ -37,7 +37,7 @@ exports[`MergeRequestTable component matches the snapshot 1`] = `
            </span>
             
            <gl-dropdown-stub
-              category="tertiary"
+              category="primary"
              class="w-100 metric-col"
              headertext=""
              menu-class="w-100 mw-100"

--- a/ee/spec/frontend/dependencies/components/__snapshots__/dependencies_actions_spec.js.snap
+++ b/ee/spec/frontend/dependencies/components/__snapshots__/dependencies_actions_spec.js.snap
@@ -8,7 +8,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
    class="btn-group flex-grow-1 mr-2"
  >
    <gl-dropdown-stub
-      category="tertiary"
+      category="primary"
      class="flex-grow-1 text-center"
      headertext=""
      right=""

--- a/ee/spec/frontend/on_demand_scans/components/profile_selector/__snapshots__/scanner_profile_selector_spec.js.snap
+++ b/ee/spec/frontend/on_demand_scans/components/profile_selector/__snapshots__/scanner_profile_selector_spec.js.snap
@@ -73,7 +73,7 @@ exports[`OnDemandScansScannerProfileSelector renders properly with profiles 1`]
          <button
            aria-expanded="false"
            aria-haspopup="true"
-            class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary"
+            class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle"
            type="button"
          >
            <!---->

--- a/ee/spec/frontend/on_demand_scans/components/profile_selector/__snapshots__/site_profile_selector_spec.js.snap
+++ b/ee/spec/frontend/on_demand_scans/components/profile_selector/__snapshots__/site_profile_selector_spec.js.snap
@@ -73,7 +73,7 @@ exports[`OnDemandScansSiteProfileSelector renders properly with profiles 1`] = `
          <button
            aria-expanded="false"
            aria-haspopup="true"
-            class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary"
+            class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle"
            type="button"
          >
            <!---->

--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
    "@babel/preset-env": "^7.10.1",
    "@gitlab/at.js": "1.5.5",
    "@gitlab/svgs": "1.175.0",
-    "@gitlab/ui": "24.3.0",
+    "@gitlab/ui": "24.3.1",
    "@gitlab/visual-review-tools": "1.6.1",
    "@rails/actioncable": "^6.0.3-3",
    "@rails/ujs": "^6.0.3-2",

--- a/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap
+++ b/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap
@@ -9,7 +9,7 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ
    menu-class="dropdown-menu-large"
  >
    <button
-      class="btn btn-danger btn-md gl-button split-content-button btn-danger-secondary"
+      class="btn btn-danger btn-md gl-button split-content-button"
      type="button"
    >
      <!---->
@@ -27,7 +27,7 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ
    <button
      aria-expanded="false"
      aria-haspopup="true"
-      class="btn dropdown-toggle btn-danger btn-md gl-button gl-dropdown-toggle btn-danger-secondary dropdown-toggle-split"
+      class="btn dropdown-toggle btn-danger btn-md gl-button gl-dropdown-toggle dropdown-toggle-split"
      type="button"
    >
      <span

--- a/spec/frontend/design_management/components/upload/__snapshots__/design_version_dropdown_spec.js.snap
+++ b/spec/frontend/design_management/components/upload/__snapshots__/design_version_dropdown_spec.js.snap
@@ -2,7 +2,7 @@

 exports[`Design management design version dropdown component renders design version dropdown button 1`] = `
 <gl-dropdown-stub
-  category="tertiary"
+  category="primary"
  headertext=""
  issueiid=""
  projectpath=""
@@ -42,7 +42,7 @@ exports[`Design management design version dropdown component renders design vers

 exports[`Design management design version dropdown component renders design version list 1`] = `
 <gl-dropdown-stub
-  category="tertiary"
+  category="primary"
  headertext=""
  issueiid=""
  projectpath=""

--- a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
@@ -47,7 +47,7 @@ exports[`Alert integration settings form default state should match the default
       
      <gl-dropdown-stub
        block="true"
-        category="tertiary"
+        category="primary"
        data-qa-selector="incident_templates_dropdown"
        headertext=""
        id="alert-integration-settings-issue-template"

--- a/spec/frontend/jira_import/components/__snapshots__/jira_import_form_spec.js.snap
+++ b/spec/frontend/jira_import/components/__snapshots__/jira_import_form_spec.js.snap
@@ -86,7 +86,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
          <button
            aria-expanded="false"
            aria-haspopup="true"
-            class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary"
+            class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle"
            type="button"
          >
            <!---->
@@ -201,7 +201,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
          <button
            aria-expanded="false"
            aria-haspopup="true"
-            class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary"
+            class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle"
            type="button"
          >
            <!---->

--- a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
+++ b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
@@ -33,7 +33,7 @@ exports[`Dashboard template matches the default snapshot 1`] = `
      class="mb-2 pr-2 d-flex d-sm-block"
    >
      <gl-dropdown-stub
-        category="tertiary"
+        category="primary"
        class="flex-grow-1"
        data-qa-selector="environments_dropdown"
        headertext=""

--- a/spec/frontend/pages/projects/graphs/__snapshots__/code_coverage_spec.js.snap
+++ b/spec/frontend/pages/projects/graphs/__snapshots__/code_coverage_spec.js.snap
@@ -10,7 +10,7 @@ exports[`Code Coverage when fetching data is successful matches the snapshot 1`]
    <!---->
     
    <gl-dropdown-stub
-      category="tertiary"
+      category="primary"
      headertext=""
      size="medium"
      text="rspec"

--- a/spec/frontend/vue_shared/components/__snapshots__/split_button_spec.js.snap
+++ b/spec/frontend/vue_shared/components/__snapshots__/split_button_spec.js.snap
@@ -2,7 +2,7 @@

 exports[`SplitButton renders actionItems 1`] = `
 <gl-dropdown-stub
-  category="tertiary"
+  category="primary"
  headertext=""
  menu-class=""
  size="medium"

--- a/yarn.lock
+++ b/yarn.lock
@@ -866,10 +866,10 @@
  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz#734f341784af1cd1d62d160a17bcdfb61ff7b04d"
  integrity sha512-gXpc87TGSXIzfAr4QER1Qw1v3P47pBO6BXkma52blgwXVmcFNe3nhQzqsqt66wKNzrIrk3lAcB4GUyPHbPVXpg==

-"@gitlab/ui@24.3.0":
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.3.0.tgz#6e3f7d6e198d12faad046ba819ffc56aa520d2ea"
-  integrity sha512-jfDMEEUrJUC8OoQrtpeupomfbiIX0AnQ5SYaugVwkNocRQ/dWwFf1OwbnKh3BNRNUS2581Vt1yjZb32CO8+GiA==
+"@gitlab/ui@24.3.1":
+  version "24.3.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.3.1.tgz#3bc40a1e33326fa89cf25d29afa1628c0ab59684"
+  integrity sha512-m2/Q/vuWrDt5ZGcdbf7VB6h152VtDA+BeVZu1T8RxzQGzgCJ9XnRqb8wTvW4KOXzdbsY/iqCHPRYhZKVrnakqg==
  dependencies:
    "@babel/standalone" "^7.0.0"
    "@gitlab/vue-toasted" "^1.3.0"