diff options
author | Phil Hughes <me@iamphill.com> | 2018-05-30 10:33:43 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-05-30 10:33:43 +0100 |
commit | c760965079fce0f020980987794ea61c86eb09ff (patch) | |
tree | 32bbac523c665a785eaaab85d9be305c02d8ce68 /app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue | |
parent | 323e402e21a643da22714bdede3cc6e248ba2cf4 (diff) | |
parent | fd79df64c5411308e67a62b4c02a07f5317ddec1 (diff) | |
download | gitlab-ce-c760965079fce0f020980987794ea61c86eb09ff.tar.gz |
Merge branch 'master' into ide-list-merge-requests
Diffstat (limited to 'app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue')
-rw-r--r-- | app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue index f0df759ef7a..6745c1aafff 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue @@ -82,6 +82,7 @@ :title="notificationTooltip" data-container="body" data-placement="left" + data-boundary="viewport" > <icon :name="notificationIcon" @@ -91,12 +92,12 @@ /> </span> </div> - <span class="issuable-header-text hide-collapsed pull-left"> + <span class="issuable-header-text hide-collapsed float-left"> {{ __('Notifications') }} </span> <toggle-button ref="toggleButton" - class="pull-right hide-collapsed js-issuable-subscribe-button" + class="float-right hide-collapsed js-issuable-subscribe-button" :is-loading="showLoadingState" :value="subscribed" @change="toggleSubscription" |