Commit b4672964 authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch 'cngo-delete-button-css' into 'master'

Delete unused button css

See merge request gitlab-org/gitlab!79756
parents 4bf1a144 7500cd57
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
<td v-if="error" class="js-error-lazy-load-diff diff-loading-error-block"> <td v-if="error" class="js-error-lazy-load-diff diff-loading-error-block">
{{ __('Unable to load the diff') }} {{ __('Unable to load the diff') }}
<button <button
class="btn-link btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button" class="btn-link btn-link-retry gl-p-0 js-toggle-lazy-diff-retry-button"
@click="fetchDiff" @click="fetchDiff"
> >
{{ __('Try again') }} {{ __('Try again') }}
......
...@@ -158,12 +158,6 @@ ...@@ -158,12 +158,6 @@
line-height: $gl-btn-small-line-height; line-height: $gl-btn-small-line-height;
} }
&.btn-xs {
padding: 2px $gl-btn-padding;
font-size: $gl-btn-xs-font-size;
line-height: $gl-btn-xs-line-height;
}
&.btn-success { &.btn-success {
@include btn-green; @include btn-green;
} }
...@@ -438,10 +432,6 @@ fieldset[disabled] .btn, ...@@ -438,10 +432,6 @@ fieldset[disabled] .btn,
cursor: default; cursor: default;
} }
.btn-no-padding {
padding: 0;
}
// This class helps convert `.gl-button` children so that they consistently // This class helps convert `.gl-button` children so that they consistently
// match the style of `.btn` elements which might be around them. Ideally we // match the style of `.btn` elements which might be around them. Ideally we
// wouldn't need this class. // wouldn't need this class.
......
...@@ -589,8 +589,6 @@ $gl-btn-vert-padding: 8px; ...@@ -589,8 +589,6 @@ $gl-btn-vert-padding: 8px;
$gl-btn-horz-padding: 12px; $gl-btn-horz-padding: 12px;
$gl-btn-small-font-size: 13px; $gl-btn-small-font-size: 13px;
$gl-btn-small-line-height: 18px; $gl-btn-small-line-height: 18px;
$gl-btn-xs-font-size: 13px;
$gl-btn-xs-line-height: 13px;
/* /*
* Badges * Badges
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
%td.line_content.js-success-lazy-load %td.line_content.js-success-lazy-load
.js-code-placeholder .js-code-placeholder
%td.js-error-lazy-load-diff.hidden.diff-loading-error-block %td.js-error-lazy-load-diff.hidden.diff-loading-error-block
- button = button_tag(_("Try again"), class: "btn-link gl-button btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button") - button = button_tag(_("Try again"), class: "btn-link gl-button btn-link-retry gl-p-0 js-toggle-lazy-diff-retry-button")
= _("Unable to load the diff. %{button_try_again}").html_safe % { button_try_again: button} = _("Unable to load the diff. %{button_try_again}").html_safe % { button_try_again: button}
= render "discussions/diff_discussion", discussions: [discussion], expanded: true = render "discussions/diff_discussion", discussions: [discussion], expanded: true
- else - else
......
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