diff options
author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-14 01:24:11 +0300 |
---|---|---|
committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-14 01:24:11 +0300 |
commit | adb069881ae0253c5bf3718aded02976f13fc859 (patch) | |
tree | e9759cc2e09a7be1f030635975e299370e6fc138 /app/assets/stylesheets/pages | |
parent | fd93d8f044eef611d73325660463b599ef997c6d (diff) | |
parent | db18593b286002dfbe677a6c2fbfc65366bfdd07 (diff) |
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
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index c2b42e02eee..05bf5596fb3 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -425,7 +425,7 @@ margin-left: 5px; > .btn { - margin-right: $btn-xs-side-margin; + margin-right: $btn-margin-5; } } } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index f50ca677800..99fe4a578be 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -51,12 +51,6 @@ opacity: 0.3; } - &.btn-xs { - line-height: 1; - padding: 5px 10px; - margin-top: 1px; - } - &.dropdown-toggle { .fa { color: inherit; diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 3b037d066dc..3849a04db5d 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -129,7 +129,7 @@ .icon svg { position: relative; top: 2px; - margin-right: $btn-xs-side-margin; + margin-right: $btn-margin-5; width: $gl-font-size; height: $gl-font-size; fill: $orange-600; |