summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-06-09 09:02:27 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-06-09 09:02:27 +0100
commit2787e7f28413d5253f476373b573ee4366535638 (patch)
treea263595c3a107280f38e2fbf8d754cea3998e509
parent4a399ee45140b33846ba8cb1f3877d8e83160611 (diff)
downloadgitlab-ce-33467-remove-nicescroll.tar.gz
Remove margins from buttons to avoid showing tooltip on a non clickable area33467-remove-nicescroll
-rw-r--r--app/assets/stylesheets/pages/builds.scss8
-rw-r--r--app/views/projects/jobs/show.html.haml8
2 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index a20ecc89a22..d931a78e112 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -95,6 +95,7 @@
display: flex;
align-self: center;
font-size: 15px;
+ margin-bottom: 4px;
svg {
height: 15px;
@@ -102,16 +103,19 @@
fill: $gl-text-color;
}
- a,
+ .controllers-buttons,
.btn-scroll {
color: $gl-text-color;
- margin: 1px 10px;
height: 15px;
vertical-align: middle;
padding: 0;
width: 12px;
}
+ .controllers-buttons {
+ margin: 1px 10px;
+ }
+
.btn-scroll.animate {
.first-triangle {
animation: blinking-scroll-button 1s ease infinite;
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml
index 9bf47252bd0..987068dc18e 100644
--- a/app/views/projects/jobs/show.html.haml
+++ b/app/views/projects/jobs/show.html.haml
@@ -68,7 +68,7 @@
= link_to raw_namespace_project_job_path(@project.namespace, @project, @build),
title: 'Show complete raw',
data: { placement: 'top', container: 'body' },
- class: 'js-raw-link-controller has-tooltip' do
+ class: 'js-raw-link-controller has-tooltip controllers-buttons' do
= icon('file-text-o')
- if can?(current_user, :update_build, @project) && @build.erasable?
@@ -76,12 +76,12 @@
method: :post,
data: { confirm: 'Are you sure you want to erase this build?', placement: 'top', container: 'body' },
title: 'Erase job log',
- class: 'has-tooltip js-erase-link' do
+ class: 'has-tooltip js-erase-link controllers-buttons' do
= icon('trash')
- .has-tooltip{ title: 'Scroll to top', data: { placement: 'top', container: 'body'} }
+ .has-tooltip.controllers-buttons{ title: 'Scroll to top', data: { placement: 'top', container: 'body'} }
%button.js-scroll-up.btn-scroll.btn-transparent.btn-blank{ type: 'button', disabled: true }
= custom_icon('scroll_up')
- .has-tooltip{ title: 'Scroll to bottom', data: { placement: 'top', container: 'body'} }
+ .has-tooltip.controllers-buttons{ title: 'Scroll to bottom', data: { placement: 'top', container: 'body'} }
%button.js-scroll-down.btn-scroll.btn-transparent.btn-blank{ type: 'button', disabled: true }
= custom_icon('scroll_down')
.bash.sticky.js-scroll-container