Commit 2bb6d7d1 authored by Kushal Pandya's avatar Kushal Pandya

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
parents 25e2d584 94943827
---
title: Fix styling of various dropdowns
merge_request: 48800
author:
type: fixed
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Value Stream Analytics LabelsSelector with no item selected will render the label selector 1`] = ` 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> <gl-dropdown-section-header-stub>Select a label </gl-dropdown-section-header-stub>
<div class=\\"mb-3 px-3\\"> <div class=\\"mb-3 px-3\\">
<gl-search-box-by-type-stub value=\\"\\" clearbuttontitle=\\"Clear\\"></gl-search-box-by-type-stub> <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 ...@@ -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`] = ` 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> <gl-dropdown-section-header-stub>Select a label </gl-dropdown-section-header-stub>
<div class=\\"mb-3 px-3\\"> <div class=\\"mb-3 px-3\\">
<gl-search-box-by-type-stub value=\\"\\" clearbuttontitle=\\"Clear\\"></gl-search-box-by-type-stub> <gl-search-box-by-type-stub value=\\"\\" clearbuttontitle=\\"Clear\\"></gl-search-box-by-type-stub>
......
...@@ -23,7 +23,7 @@ exports[`MetricChart component template when isLoading is false and chartData is ...@@ -23,7 +23,7 @@ exports[`MetricChart component template when isLoading is false and chartData is
<!----> <!---->
<gl-dropdown-stub <gl-dropdown-stub
category="tertiary" category="primary"
class="mb-4 metric-dropdown" class="mb-4 metric-dropdown"
headertext="" headertext=""
menu-class="w-100 mw-100" menu-class="w-100 mw-100"
......
...@@ -37,7 +37,7 @@ exports[`MergeRequestTable component matches the snapshot 1`] = ` ...@@ -37,7 +37,7 @@ exports[`MergeRequestTable component matches the snapshot 1`] = `
</span> </span>
<gl-dropdown-stub <gl-dropdown-stub
category="tertiary" category="primary"
class="w-100 metric-col" class="w-100 metric-col"
headertext="" headertext=""
menu-class="w-100 mw-100" menu-class="w-100 mw-100"
......
...@@ -8,7 +8,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = ` ...@@ -8,7 +8,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
class="btn-group flex-grow-1 mr-2" class="btn-group flex-grow-1 mr-2"
> >
<gl-dropdown-stub <gl-dropdown-stub
category="tertiary" category="primary"
class="flex-grow-1 text-center" class="flex-grow-1 text-center"
headertext="" headertext=""
right="" right=""
......
...@@ -73,7 +73,7 @@ exports[`OnDemandScansScannerProfileSelector renders properly with profiles 1`] ...@@ -73,7 +73,7 @@ exports[`OnDemandScansScannerProfileSelector renders properly with profiles 1`]
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" 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" type="button"
> >
<!----> <!---->
......
...@@ -73,7 +73,7 @@ exports[`OnDemandScansSiteProfileSelector renders properly with profiles 1`] = ` ...@@ -73,7 +73,7 @@ exports[`OnDemandScansSiteProfileSelector renders properly with profiles 1`] = `
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" 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" type="button"
> >
<!----> <!---->
......
...@@ -9,7 +9,7 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ ...@@ -9,7 +9,7 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ
menu-class="dropdown-menu-large" menu-class="dropdown-menu-large"
> >
<button <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" type="button"
> >
<!----> <!---->
...@@ -27,7 +27,7 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ ...@@ -27,7 +27,7 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" 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" type="button"
> >
<span <span
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
exports[`Design management design version dropdown component renders design version dropdown button 1`] = ` exports[`Design management design version dropdown component renders design version dropdown button 1`] = `
<gl-dropdown-stub <gl-dropdown-stub
category="tertiary" category="primary"
headertext="" headertext=""
issueiid="" issueiid=""
projectpath="" projectpath=""
...@@ -42,7 +42,7 @@ exports[`Design management design version dropdown component renders design vers ...@@ -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`] = ` exports[`Design management design version dropdown component renders design version list 1`] = `
<gl-dropdown-stub <gl-dropdown-stub
category="tertiary" category="primary"
headertext="" headertext=""
issueiid="" issueiid=""
projectpath="" projectpath=""
......
...@@ -47,7 +47,7 @@ exports[`Alert integration settings form default state should match the default ...@@ -47,7 +47,7 @@ exports[`Alert integration settings form default state should match the default
<gl-dropdown-stub <gl-dropdown-stub
block="true" block="true"
category="tertiary" category="primary"
data-qa-selector="incident_templates_dropdown" data-qa-selector="incident_templates_dropdown"
headertext="" headertext=""
id="alert-integration-settings-issue-template" id="alert-integration-settings-issue-template"
......
...@@ -86,7 +86,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] = ...@@ -86,7 +86,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" 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" type="button"
> >
<!----> <!---->
...@@ -201,7 +201,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] = ...@@ -201,7 +201,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" 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" type="button"
> >
<!----> <!---->
......
...@@ -33,7 +33,7 @@ exports[`Dashboard template matches the default snapshot 1`] = ` ...@@ -33,7 +33,7 @@ exports[`Dashboard template matches the default snapshot 1`] = `
class="mb-2 pr-2 d-flex d-sm-block" class="mb-2 pr-2 d-flex d-sm-block"
> >
<gl-dropdown-stub <gl-dropdown-stub
category="tertiary" category="primary"
class="flex-grow-1" class="flex-grow-1"
data-qa-selector="environments_dropdown" data-qa-selector="environments_dropdown"
headertext="" headertext=""
......
...@@ -10,7 +10,7 @@ exports[`Code Coverage when fetching data is successful matches the snapshot 1`] ...@@ -10,7 +10,7 @@ exports[`Code Coverage when fetching data is successful matches the snapshot 1`]
<!----> <!---->
<gl-dropdown-stub <gl-dropdown-stub
category="tertiary" category="primary"
headertext="" headertext=""
size="medium" size="medium"
text="rspec" text="rspec"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
exports[`SplitButton renders actionItems 1`] = ` exports[`SplitButton renders actionItems 1`] = `
<gl-dropdown-stub <gl-dropdown-stub
category="tertiary" category="primary"
headertext="" headertext=""
menu-class="" menu-class=""
size="medium" size="medium"
......
...@@ -866,10 +866,10 @@ ...@@ -866,10 +866,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz#734f341784af1cd1d62d160a17bcdfb61ff7b04d" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz#734f341784af1cd1d62d160a17bcdfb61ff7b04d"
integrity sha512-gXpc87TGSXIzfAr4QER1Qw1v3P47pBO6BXkma52blgwXVmcFNe3nhQzqsqt66wKNzrIrk3lAcB4GUyPHbPVXpg== integrity sha512-gXpc87TGSXIzfAr4QER1Qw1v3P47pBO6BXkma52blgwXVmcFNe3nhQzqsqt66wKNzrIrk3lAcB4GUyPHbPVXpg==
"@gitlab/ui@24.3.0": "@gitlab/ui@24.3.1":
version "24.3.0" version "24.3.1"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.3.0.tgz#6e3f7d6e198d12faad046ba819ffc56aa520d2ea" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.3.1.tgz#3bc40a1e33326fa89cf25d29afa1628c0ab59684"
integrity sha512-jfDMEEUrJUC8OoQrtpeupomfbiIX0AnQ5SYaugVwkNocRQ/dWwFf1OwbnKh3BNRNUS2581Vt1yjZb32CO8+GiA== integrity sha512-m2/Q/vuWrDt5ZGcdbf7VB6h152VtDA+BeVZu1T8RxzQGzgCJ9XnRqb8wTvW4KOXzdbsY/iqCHPRYhZKVrnakqg==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0" "@gitlab/vue-toasted" "^1.3.0"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment