Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
f3a5409c
Commit
f3a5409c
authored
Dec 22, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-hover-pipeline' into 'master'
Fix hover pipeline See merge request !8253
parents
66e7f126
87b89c05
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
14 deletions
+51
-14
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+49
-12
app/views/projects/stage/_in_stage_group.html.haml
app/views/projects/stage/_in_stage_group.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
f3a5409c
...
@@ -597,6 +597,27 @@
...
@@ -597,6 +597,27 @@
}
}
}
}
}
}
.grouped-pipeline-dropdown
{
.dropdown-build
{
.build-content
{
width
:
100%
;
&
:hover
{
background-color
:
$stage-hover-bg
;
color
:
$gl-text-color
;
}
}
.ci-action-icon-container
{
padding
:
0
;
font-size
:
11px
;
position
:
absolute
;
top
:
1px
;
right
:
8px
;
}
}
}
}
}
.dropdown-counter-badge
{
.dropdown-counter-badge
{
...
@@ -607,9 +628,11 @@
...
@@ -607,9 +628,11 @@
margin-right
:
2px
;
margin-right
:
2px
;
}
}
.grouped-pipeline-dropdown
{
.grouped-pipeline-dropdown
{
padding
:
0
;
padding
:
0
;
width
:
191px
;
width
:
191px
;
min-width
:
191px
;
left
:
auto
;
left
:
auto
;
right
:
-195px
;
right
:
-195px
;
top
:
-4px
;
top
:
-4px
;
...
@@ -619,11 +642,22 @@
...
@@ -619,11 +642,22 @@
display
:
inline-block
;
display
:
inline-block
;
}
}
.build-content
{
.dropdown-build
{
width
:
138px
;
.build-content
{
width
:
100%
;
&
:hover
{
&
:hover
{
background-color
:
$stage-hover-bg
;
background-color
:
$stage-hover-bg
;
color
:
$gl-text-color
;
}
}
.ci-action-icon-container
{
padding
:
0
;
font-size
:
11px
;
position
:
absolute
;
margin-top
:
3px
;
right
:
7px
;
}
}
}
}
...
@@ -633,12 +667,10 @@
...
@@ -633,12 +667,10 @@
margin
:
3px
0
;
margin
:
3px
0
;
li
{
li
{
padding-top
:
2px
;
margin
:
4px
8px
4px
9px
;
margin
:
4px
7px
;
padding
:
0
;
padding
:
0
3px
;
line-height
:
1
.1
;
padding-left
:
0
;
position
:
relative
;
padding-bottom
:
0
;
line-height
:
0
;
.ci-action-icon-container
:hover
{
.ci-action-icon-container
:hover
{
background-color
:
transparent
;
background-color
:
transparent
;
...
@@ -652,6 +684,11 @@
...
@@ -652,6 +684,11 @@
}
}
}
}
.pipeline-graph
.dropdown-build
.ci-status-icon
svg
{
width
:
18px
;
height
:
18px
;
}
.ci-status-text
{
.ci-status-text
{
max-width
:
110px
;
max-width
:
110px
;
white-space
:
nowrap
;
white-space
:
nowrap
;
...
@@ -660,7 +697,7 @@
...
@@ -660,7 +697,7 @@
vertical-align
:
bottom
;
vertical-align
:
bottom
;
display
:
inline-block
;
display
:
inline-block
;
position
:
relative
;
position
:
relative
;
font-weight
:
1
00
;
font-weight
:
2
00
;
}
}
// Action Icons
// Action Icons
...
@@ -697,7 +734,7 @@
...
@@ -697,7 +734,7 @@
color
:
$gl-text-color-light
;
color
:
$gl-text-color-light
;
.build-content
{
.build-content
{
padding
:
3px
7px
6
px
;
padding
:
4px
7px
8
px
;
}
}
.ci-action-icon-container
{
.ci-action-icon-container
{
...
...
app/views/projects/stage/_in_stage_group.html.haml
View file @
f3a5409c
-
group_status
=
CommitStatus
.
where
(
id:
subject
).
status
-
group_status
=
CommitStatus
.
where
(
id:
subject
).
status
%button
.dropdown-menu-toggle.build-content.has-tooltip
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%button
.dropdown-menu-toggle.build-content.has-tooltip
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
title:
"#{name} - #{group_status}"
}
}
%span
{
class:
"ci-status-icon ci-status-icon-#{group_status}"
}
%span
{
class:
"ci-status-icon ci-status-icon-#{group_status}"
}
=
ci_icon_for_status
(
group_status
)
=
ci_icon_for_status
(
group_status
)
%span
.ci-status-text
{
'data-toggle'
=>
'tooltip'
,
'data-title'
=>
"#{name} - #{group_status}"
}
%span
.ci-status-text
=
name
=
name
%span
.dropdown-counter-badge
=
subject
.
size
%span
.dropdown-counter-badge
=
subject
.
size
.dropdown-menu.grouped-pipeline-dropdown
.dropdown-menu.grouped-pipeline-dropdown
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment