diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-05-28 12:23:45 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-05-28 12:23:45 +0000 |
| commit | 71dea693c61295c16cb9c28c76b1122a3b8a3acf (patch) | |
| tree | 5a93307b78816e6f3cb0b290b7c7dc321f2cea7b | |
| parent | 8b278829de2ce81b1cc57b9b7001c412a6a38a73 (diff) | |
| parent | 94235cbbcd2af54c462bbcb0e3f7e8c5998c0f2c (diff) | |
| download | gitlab-ce-71dea693c61295c16cb9c28c76b1122a3b8a3acf.tar.gz | |
Merge branch 'leipert-backport-bs4-merge-conflict' into 'master'
Backport of CE->EE merge conflict resolution
See merge request gitlab-org/gitlab-ce!19171
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_details_block.vue | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue index 82fec7e936b..8f3c66b0cbe 100644 --- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue +++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue @@ -48,11 +48,10 @@ export default { return `${this.job.runner.description} (#${this.job.runner.id})`; }, retryButtonClass() { - let className = 'js-retry-button pull-right btn btn-retry d-none d-md-block d-lg-block d-xl-block'; + let className = + 'js-retry-button float-right btn btn-retry d-none d-md-block d-lg-block d-xl-block'; className += - this.job.status && this.job.recoverable - ? ' btn-primary' - : ' btn-inverted-secondary'; + this.job.status && this.job.recoverable ? ' btn-primary' : ' btn-inverted-secondary'; return className; }, hasTimeout() { @@ -104,8 +103,7 @@ export default { <button type="button" :aria-label="__('Toggle Sidebar')" - class="btn btn-blank gutter-toggle pull-right - d-block d-sm-block d-md-none js-sidebar-build-toggle" + class="btn btn-blank gutter-toggle float-right d-block d-md-none js-sidebar-build-toggle" > <i aria-hidden="true" |