summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Eipert <leipert@gitlab.com>2018-05-27 15:56:46 +0200
committerLukas Eipert <leipert@gitlab.com>2018-05-28 09:48:29 +0200
commit94235cbbcd2af54c462bbcb0e3f7e8c5998c0f2c (patch)
treec592a665d2a139df5f25e1502d657aa504e1ea81
parentbee339ad10fc4d4bd94a406eb0d24d7759d73972 (diff)
downloadgitlab-ce-94235cbbcd2af54c462bbcb0e3f7e8c5998c0f2c.tar.gz
backport EE version of
`app/assets/javascripts/jobs/components/sidebar_details_block.vue` and run prettier Squashed commits: [4551a37adc] backport EE version of `app/assets/javascripts/jobs/components/sidebar_details_block.vue`
-rw-r--r--app/assets/javascripts/jobs/components/sidebar_details_block.vue10
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"