Commit adb06988 authored by Annabel Gray's avatar Annabel Gray

Merge branch 'jivl-remove-remaining-btn-xs-class-usage' into 'master'

Remove the btn-xs class from the stylesheets

Closes #46743

See merge request gitlab-org/gitlab-ce!19719
parents fd93d8f0 db18593b
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
v-if="mr.removeWIPPath" v-if="mr.removeWIPPath"
:disabled="isMakingRequest" :disabled="isMakingRequest"
type="button" type="button"
class="btn btn-default btn-xs js-remove-wip" class="btn btn-default btn-sm js-remove-wip"
@click="removeWIP"> @click="removeWIP">
<i <i
v-if="isMakingRequest" v-if="isMakingRequest"
......
...@@ -121,10 +121,6 @@ ...@@ -121,10 +121,6 @@
&.btn-sm { &.btn-sm {
margin-left: $btn-sm-side-margin; margin-left: $btn-sm-side-margin;
} }
&.btn-xs {
margin-left: $btn-xs-side-margin;
}
} }
@mixin btn-svg { @mixin btn-svg {
...@@ -150,10 +146,6 @@ ...@@ -150,10 +146,6 @@
line-height: 18px; line-height: 18px;
} }
&.btn-xs {
padding: 2px 5px;
}
&.btn-success, &.btn-success,
&.btn-new, &.btn-new,
&.btn-create, &.btn-create,
......
...@@ -61,10 +61,6 @@ ...@@ -61,10 +61,6 @@
padding-top: 0; padding-top: 0;
line-height: 19px; line-height: 19px;
&.btn.btn-xs {
padding: 2px 5px;
}
&:focus { &:focus {
margin-top: -10px; margin-top: -10px;
padding-top: 10px; padding-top: 10px;
......
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
flex-flow: row wrap; flex-flow: row wrap;
.nav-controls { .nav-controls {
$controls-margin: $btn-xs-side-margin - 2px; $controls-margin: $btn-margin-5 - 2px;
flex: 0 0 100%; flex: 0 0 100%;
&.controls-flex { &.controls-flex {
......
...@@ -278,7 +278,7 @@ $active-item-blue: $blue-500; ...@@ -278,7 +278,7 @@ $active-item-blue: $blue-500;
$layout-link-gray: #7e7c7c; $layout-link-gray: #7e7c7c;
$btn-side-margin: 10px; $btn-side-margin: 10px;
$btn-sm-side-margin: 7px; $btn-sm-side-margin: 7px;
$btn-xs-side-margin: 5px; $btn-margin-5: 5px;
$issue-status-expired: $orange-500; $issue-status-expired: $orange-500;
$issuable-sidebar-color: $gl-text-color-secondary; $issuable-sidebar-color: $gl-text-color-secondary;
$sidebar-block-hover-color: #ebebeb; $sidebar-block-hover-color: #ebebeb;
......
...@@ -425,7 +425,7 @@ ...@@ -425,7 +425,7 @@
margin-left: 5px; margin-left: 5px;
> .btn { > .btn {
margin-right: $btn-xs-side-margin; margin-right: $btn-margin-5;
} }
} }
} }
......
...@@ -51,12 +51,6 @@ ...@@ -51,12 +51,6 @@
opacity: 0.3; opacity: 0.3;
} }
&.btn-xs {
line-height: 1;
padding: 5px 10px;
margin-top: 1px;
}
&.dropdown-toggle { &.dropdown-toggle {
.fa { .fa {
color: inherit; color: inherit;
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
.icon svg { .icon svg {
position: relative; position: relative;
top: 2px; top: 2px;
margin-right: $btn-xs-side-margin; margin-right: $btn-margin-5;
width: $gl-font-size; width: $gl-font-size;
height: $gl-font-size; height: $gl-font-size;
fill: $orange-600; fill: $orange-600;
......
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