summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2016-10-07 19:30:34 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2016-10-19 10:55:58 +0100
commitf744a5c12f0c82573f5247b9e7580c3eeb7768cf (patch)
treedf9c2dc744805452238610e30bdbdc07a10a1324 /app/assets
parentbaa3d0b3744b6ee7ef067ec39238257748fde71b (diff)
downloadgitlab-ce-22089-show-full-job-name-on-hover-on-pipeline-graph.tar.gz
Added tooltips for dropdown items Reverted pretty much everything in favour of a DOM approach Simplified JS
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/pipelines.js.es611
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss14
2 files changed, 10 insertions, 15 deletions
diff --git a/app/assets/javascripts/pipelines.js.es6 b/app/assets/javascripts/pipelines.js.es6
index dd320c52e44..a7624de6089 100644
--- a/app/assets/javascripts/pipelines.js.es6
+++ b/app/assets/javascripts/pipelines.js.es6
@@ -4,17 +4,6 @@
constructor() {
$(document).off('click', '.toggle-pipeline-btn').on('click', '.toggle-pipeline-btn', this.toggleGraph);
this.addMarginToBuildColumns();
- this.initGroupedPipelineTooltips();
- }
-
- initGroupedPipelineTooltips() {
- $('.dropdown-menu-toggle', $('.grouped-pipeline-dropdown').parent()).each(function() {
- const $this = $(this);
- $this.tooltip({
- title: $this.data('tooltip-title'),
- placement: 'bottom'
- });
- });
}
toggleGraph() {
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 7b71876b822..46308742aaf 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -360,10 +360,6 @@
&:hover {
background-color: $gray-lighter;
-
- .dropdown-menu-toggle {
- background-color: transparent;
- }
}
&.playable {
@@ -393,6 +389,15 @@
}
}
+ .tooltip {
+ white-space: nowrap;
+
+ .tooltip-inner {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+
.ci-status-text {
width: 135px;
white-space: nowrap;
@@ -410,6 +415,7 @@
}
.dropdown-menu-toggle {
+ background-color: transparent;
border: none;
width: auto;
padding: 0;