diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 15:34:51 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 15:34:51 +0100 |
| commit | d35ad403f50b2d496f0d5938502fb55ef2190f7c (patch) | |
| tree | f4e4246256b5865c65ac2662bc898be7a52a7bfc | |
| parent | 932b9f8cb2a90884f4f22747dfc86075b082bf4f (diff) | |
| download | gitlab-ce-d35ad403f50b2d496f0d5938502fb55ef2190f7c.tar.gz | |
FE review changes
| -rw-r--r-- | app/assets/javascripts/project_label_subscription.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/project_label_subscription.js b/app/assets/javascripts/project_label_subscription.js index 35a76875a7a..9049f87e037 100644 --- a/app/assets/javascripts/project_label_subscription.js +++ b/app/assets/javascripts/project_label_subscription.js @@ -63,6 +63,6 @@ export default class ProjectLabelSubscription { const type = /group/.test(originalTitle) ? 'group' : 'project'; const newTitle = tooltipTitles[type][newStatus]; - $button.tooltip('hide').attr('title', newTitle).tooltip('_fixTitle'); + $button.attr('title', newTitle).tooltip('_fixTitle'); } } diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index d65fc0d2d68..1e7b9534275 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -469,7 +469,6 @@ img.emoji { .append-right-5 { margin-right: 5px; } .append-right-8 { margin-right: 8px; } .append-right-10 { margin-right: 10px; } -.append-right-15 { margin-right: 15px; } .append-right-default { margin-right: $gl-padding; } .append-right-20 { margin-right: 20px; } .append-bottom-0 { margin-bottom: 0; } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 946223cfff0..0702272e3ed 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -776,3 +776,5 @@ $modal-body-height: 134px; Prometheus */ $prometheus-table-row-highlight-color: $theme-gray-100; + +$priority-label-empty-state-width: 114px;
\ No newline at end of file diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index 8ccf778e169..712e881de6f 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -325,5 +325,5 @@ } .priority-labels-empty-state .svg-content img { - max-width: 114px; + max-width: $priority-label-empty-state-width; } |