Commit 417c9c00 authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch 'psi-no-extend-dropdown' into 'master'

Remove extend from dropdown-menu-toggle

See merge request gitlab-org/gitlab!70899
parents cbb9ab43 911db473
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
} }
.dropdown-toggle, .dropdown-toggle,
.dropdown-menu-toggle,
.confidential-merge-request-fork-group .dropdown-toggle { .confidential-merge-request-fork-group .dropdown-toggle {
padding: 6px 8px 6px 10px; padding: 6px 8px 6px 10px;
background-color: $white; background-color: $white;
...@@ -131,7 +132,6 @@ ...@@ -131,7 +132,6 @@
// This is double classed to solve a specificity issue with the gitlab ui buttons // This is double classed to solve a specificity issue with the gitlab ui buttons
.dropdown-menu-toggle.dropdown-menu-toggle { .dropdown-menu-toggle.dropdown-menu-toggle {
@extend .dropdown-toggle;
justify-content: flex-start; justify-content: flex-start;
overflow: hidden; overflow: hidden;
padding-right: 25px; padding-right: 25px;
......
...@@ -198,22 +198,6 @@ h1 { ...@@ -198,22 +198,6 @@ h1 {
.dropdown { .dropdown {
position: relative; position: relative;
} }
.dropdown-menu-toggle {
white-space: nowrap;
}
.dropdown-menu-toggle::after {
display: inline-block;
margin-left: 0.255em;
vertical-align: 0.255em;
content: "";
border-top: 0.3em solid;
border-right: 0.3em solid transparent;
border-bottom: 0;
border-left: 0.3em solid transparent;
}
.dropdown-menu-toggle:empty::after {
margin-left: 0;
}
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
...@@ -466,9 +450,6 @@ a { ...@@ -466,9 +450,6 @@ a {
.hide { .hide {
display: none; display: none;
} }
.dropdown-menu-toggle::after {
display: none;
}
.badge:not(.gl-badge) { .badge:not(.gl-badge) {
padding: 4px 5px; padding: 4px 5px;
font-size: 12px; font-size: 12px;
...@@ -548,7 +529,7 @@ body { ...@@ -548,7 +529,7 @@ body {
border-radius: 0.25rem; border-radius: 0.25rem;
white-space: nowrap; white-space: nowrap;
} }
.no-outline.dropdown-menu-toggle { .dropdown-menu-toggle.no-outline {
outline: 0; outline: 0;
} }
.dropdown-menu-toggle.dropdown-menu-toggle { .dropdown-menu-toggle.dropdown-menu-toggle {
......
...@@ -178,22 +178,6 @@ h1 { ...@@ -178,22 +178,6 @@ h1 {
.dropdown { .dropdown {
position: relative; position: relative;
} }
.dropdown-menu-toggle {
white-space: nowrap;
}
.dropdown-menu-toggle::after {
display: inline-block;
margin-left: 0.255em;
vertical-align: 0.255em;
content: "";
border-top: 0.3em solid;
border-right: 0.3em solid transparent;
border-bottom: 0;
border-left: 0.3em solid transparent;
}
.dropdown-menu-toggle:empty::after {
margin-left: 0;
}
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
...@@ -446,9 +430,6 @@ a { ...@@ -446,9 +430,6 @@ a {
.hide { .hide {
display: none; display: none;
} }
.dropdown-menu-toggle::after {
display: none;
}
.badge:not(.gl-badge) { .badge:not(.gl-badge) {
padding: 4px 5px; padding: 4px 5px;
font-size: 12px; font-size: 12px;
...@@ -528,7 +509,7 @@ body { ...@@ -528,7 +509,7 @@ body {
border-radius: 0.25rem; border-radius: 0.25rem;
white-space: nowrap; white-space: nowrap;
} }
.no-outline.dropdown-menu-toggle { .dropdown-menu-toggle.no-outline {
outline: 0; outline: 0;
} }
.dropdown-menu-toggle.dropdown-menu-toggle { .dropdown-menu-toggle.dropdown-menu-toggle {
......
...@@ -198,22 +198,6 @@ h1 { ...@@ -198,22 +198,6 @@ h1 {
.dropdown { .dropdown {
position: relative; position: relative;
} }
.dropdown-menu-toggle {
white-space: nowrap;
}
.dropdown-menu-toggle::after {
display: inline-block;
margin-left: 0.255em;
vertical-align: 0.255em;
content: "";
border-top: 0.3em solid;
border-right: 0.3em solid transparent;
border-bottom: 0;
border-left: 0.3em solid transparent;
}
.dropdown-menu-toggle:empty::after {
margin-left: 0;
}
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
...@@ -466,9 +450,6 @@ a { ...@@ -466,9 +450,6 @@ a {
.hide { .hide {
display: none; display: none;
} }
.dropdown-menu-toggle::after {
display: none;
}
.badge:not(.gl-badge) { .badge:not(.gl-badge) {
padding: 4px 5px; padding: 4px 5px;
font-size: 12px; font-size: 12px;
...@@ -548,7 +529,7 @@ body { ...@@ -548,7 +529,7 @@ body {
border-radius: 0.25rem; border-radius: 0.25rem;
white-space: nowrap; white-space: nowrap;
} }
.no-outline.dropdown-menu-toggle { .dropdown-menu-toggle.no-outline {
outline: 0; outline: 0;
} }
.dropdown-menu-toggle.dropdown-menu-toggle { .dropdown-menu-toggle.dropdown-menu-toggle {
......
...@@ -178,22 +178,6 @@ h1 { ...@@ -178,22 +178,6 @@ h1 {
.dropdown { .dropdown {
position: relative; position: relative;
} }
.dropdown-menu-toggle {
white-space: nowrap;
}
.dropdown-menu-toggle::after {
display: inline-block;
margin-left: 0.255em;
vertical-align: 0.255em;
content: "";
border-top: 0.3em solid;
border-right: 0.3em solid transparent;
border-bottom: 0;
border-left: 0.3em solid transparent;
}
.dropdown-menu-toggle:empty::after {
margin-left: 0;
}
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
...@@ -446,9 +430,6 @@ a { ...@@ -446,9 +430,6 @@ a {
.hide { .hide {
display: none; display: none;
} }
.dropdown-menu-toggle::after {
display: none;
}
.badge:not(.gl-badge) { .badge:not(.gl-badge) {
padding: 4px 5px; padding: 4px 5px;
font-size: 12px; font-size: 12px;
...@@ -528,7 +509,7 @@ body { ...@@ -528,7 +509,7 @@ body {
border-radius: 0.25rem; border-radius: 0.25rem;
white-space: nowrap; white-space: nowrap;
} }
.no-outline.dropdown-menu-toggle { .dropdown-menu-toggle.no-outline {
outline: 0; outline: 0;
} }
.dropdown-menu-toggle.dropdown-menu-toggle { .dropdown-menu-toggle.dropdown-menu-toggle {
......
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