summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-10 19:59:50 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-10 19:59:50 +0000
commit63caff8fcd9382ad1db896336017241e25e2b5c1 (patch)
treeb173fb8d5fddb1f65a9e8d6643cb87c1937a056e
parentae68bf268a97190a9d7fd23710e7ec2b72705ec3 (diff)
parent18455939ca42f1aeff6d524b046e392289877458 (diff)
downloadgitlab-ce-63caff8fcd9382ad1db896336017241e25e2b5c1.tar.gz
Merge branch '27963-tooltips-jobs' into 'master'
Fixes tooltips in mini pipeline graph Closes #27963 and #28008 See merge request !9140
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss14
-rw-r--r--changelogs/unreleased/27963-tooltips-jobs.yml4
-rw-r--r--spec/features/merge_requests/mini_pipeline_graph_spec.rb2
3 files changed, 15 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 974100bdff0..0c7019dc64f 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -94,6 +94,10 @@
padding: 10px 8px;
}
+ td.stage-cell {
+ padding: 10px 0;
+ }
+
.commit-link {
padding: 9px 8px 10px;
}
@@ -291,12 +295,14 @@
height: 22px;
margin: 3px 6px 3px 0;
- .tooltip {
- white-space: nowrap;
+ // Hack to show a button tooltip inline
+ button.has-tooltip + .tooltip {
+ min-width: 105px;
}
- .tooltip-inner {
- padding: 3px 4px;
+ // Bootstrap way of showing the content inline for anchors.
+ a.has-tooltip {
+ white-space: nowrap;
}
&:not(:last-child) {
diff --git a/changelogs/unreleased/27963-tooltips-jobs.yml b/changelogs/unreleased/27963-tooltips-jobs.yml
new file mode 100644
index 00000000000..ba418d86433
--- /dev/null
+++ b/changelogs/unreleased/27963-tooltips-jobs.yml
@@ -0,0 +1,4 @@
+---
+title: Fix tooltips in mini pipeline graph
+merge_request:
+author:
diff --git a/spec/features/merge_requests/mini_pipeline_graph_spec.rb b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
index b08bd36bde9..84ad8765d8f 100644
--- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb
+++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
@@ -66,7 +66,7 @@ feature 'Mini Pipeline Graph', :js, :feature do
end
it 'should close when toggle is clicked again' do
- toggle.click
+ toggle.trigger('click')
expect(toggle.find(:xpath, '..')).not_to have_selector('.mini-pipeline-graph-dropdown-menu')
end