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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9edef45a
Commit
9edef45a
authored
Dec 19, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict
Fix tooltips in dropdown
parent
1b449ba0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
77 deletions
+10
-77
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+4
-71
app/views/ci/status/_graph_badge.html.haml
app/views/ci/status/_graph_badge.html.haml
+6
-6
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
9edef45a
...
@@ -463,15 +463,11 @@
...
@@ -463,15 +463,11 @@
white-space
:
normal
;
white-space
:
normal
;
color
:
$gl-text-color-light
;
color
:
$gl-text-color-light
;
<<<<<<<
HEAD
.dropdown-menu-toggle
{
.dropdown-menu-toggle
{
background-color
:
transparent
;
background-color
:
transparent
;
border
:
none
;
border
:
none
;
padding
:
0
;
padding
:
0
;
color
:
$gl-text-color-light
;
color
:
$gl-text-color-light
;
flex-grow
:
1
;
&
:focus
{
&
:focus
{
outline
:
none
;
outline
:
none
;
...
@@ -486,10 +482,6 @@
...
@@ -486,10 +482,6 @@
}
}
}
}
&
:hover
{
background-color
:
$stage-hover-bg
;
border
:
1px
solid
$stage-hover-border
;
=======
>
.build-content
{
>
.build-content
{
display
:
inline-block
;
display
:
inline-block
;
padding
:
8px
10px
9px
;
padding
:
8px
10px
9px
;
...
@@ -497,8 +489,7 @@
...
@@ -497,8 +489,7 @@
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
border-radius
:
30px
;
border-radius
:
30px
;
background-color
:
$white-light
;
background-color
:
$white-light
;
>>>>>>>
master
&
:hover
{
&
:hover
{
background-color
:
$stage-hover-bg
;
background-color
:
$stage-hover-bg
;
border
:
1px
solid
$stage-hover-border
;
border
:
1px
solid
$stage-hover-border
;
...
@@ -603,22 +594,7 @@
...
@@ -603,22 +594,7 @@
}
}
}
}
}
}
// Position in the pipeline graph
.grouped-pipeline-dropdown
{
<<<<<<<
HEAD
right
:
-206px
;
top
:
-11px
;
}
}
}
=======
padding
:
0
;
width
:
191px
;
left
:
auto
;
right
:
-195px
;
top
:
-4px
;
box-shadow
:
0
1px
5px
$black-transparent
;
>>>>>>>
master
.dropdown-counter-badge
{
.dropdown-counter-badge
{
float
:
right
;
float
:
right
;
...
@@ -632,8 +608,8 @@
...
@@ -632,8 +608,8 @@
padding
:
0
;
padding
:
0
;
width
:
191px
;
width
:
191px
;
left
:
auto
;
left
:
auto
;
right
:
-
206
px
;
right
:
-
195
px
;
top
:
-
11
px
;
top
:
-
4
px
;
box-shadow
:
0
1px
5px
$black-transparent
;
box-shadow
:
0
1px
5px
$black-transparent
;
a
{
a
{
...
@@ -644,53 +620,10 @@
...
@@ -644,53 +620,10 @@
}
}
}
}
<<<<<<<
HEAD
ul
{
ul
{
max-height
:
245px
;
max-height
:
245px
;
overflow
:
auto
;
overflow
:
auto
;
margin
:
5px
0
;
margin
:
5px
0
;
=======
.dropdown-build
{
color
:
$gl-text-color-light
;
.build-content
{
width
:
100%
;
}
.ci-action-icon-container
{
font-size
:
11px
;
position
:
absolute
;
right
:
4px
;
i
{
width
:
25px
;
height
:
25px
;
font-size
:
11px
;
margin-top
:
0
;
&
:
:
before
{
top
:
1px
;
left
:
1px
;
}
}
}
&
:hover
{
background-color
:
$stage-hover-bg
;
border-radius
:
3px
;
color
:
$gl-text-color
;
}
.stage
{
max-width
:
100px
;
width
:
100px
;
}
.ci-status-icon
svg
{
height
:
18px
;
width
:
18px
;
}
>>>>>>>
master
li
{
li
{
padding-top
:
2px
;
padding-top
:
2px
;
...
@@ -747,7 +680,7 @@
...
@@ -747,7 +680,7 @@
.dropdown-build
{
.dropdown-build
{
color
:
$gl-text-color-light
;
color
:
$gl-text-color-light
;
a
.ci-action-icon-container
{
.ci-action-icon-container
{
padding
:
0
;
padding
:
0
;
font-size
:
11px
;
font-size
:
11px
;
float
:
right
;
float
:
right
;
...
...
app/views/ci/status/_graph_badge.html.haml
View file @
9edef45a
...
@@ -3,18 +3,18 @@
...
@@ -3,18 +3,18 @@
-
subject
=
local_assigns
.
fetch
(
:subject
)
-
subject
=
local_assigns
.
fetch
(
:subject
)
-
status
=
subject
.
detailed_status
(
current_user
)
-
status
=
subject
.
detailed_status
(
current_user
)
-
klass
=
"ci-status-icon ci-status-icon-
#{
status
.
group
}
"
-
klass
=
"ci-status-icon ci-status-icon-
#{
status
.
group
}
"
-
tooltip
=
"
#{
subject
.
name
}
-
#{
status
.
label
}
"
-
if
status
.
has_details?
-
if
status
.
has_details?
=
link_to
status
.
details_path
,
class:
'build-content
'
do
=
link_to
status
.
details_path
,
class:
'build-content
has-tooltip'
,
data:
{
toggle:
'tooltip'
,
title:
tooltip
}
do
%span
{
class:
klass
}=
custom_icon
(
status
.
icon
)
%span
{
class:
klass
}=
custom_icon
(
status
.
icon
)
.ci-status-text
{
'data-toggle'
=>
'tooltip'
,
'data-title'
=>
"#{subject.name} - #{status.label}"
}
=
subject
.
name
.ci-status-text
=
subject
.
name
-
else
-
else
.build-content
.build-content
.has-tooltip
{
data:
{
toggle:
'tooltip'
,
title:
tooltip
}
}
%span
{
class:
klass
}=
custom_icon
(
status
.
icon
)
%span
{
class:
klass
}=
custom_icon
(
status
.
icon
)
.ci-status-text
{
'data-toggle'
=>
'tooltip'
,
'data-title'
=>
"#{subject.name} - #{status.label}"
}
=
subject
.
name
.ci-status-text
=
subject
.
name
-
if
status
.
has_action?
-
if
status
.
has_action?
=
link_to
status
.
action_path
,
method:
status
.
action_method
,
=
link_to
status
.
action_path
,
class:
'ci-action-icon-container has-tooltip'
,
method:
status
.
action_method
,
data:
{
toggle:
'tooltip'
,
title:
status
.
action_title
}
do
title:
status
.
action_title
,
class:
'ci-action-icon-container'
do
%i
.ci-action-icon-wrapper
%i
.ci-action-icon-wrapper
=
icon
(
status
.
action_icon
,
class:
status
.
action_class
)
=
icon
(
status
.
action_icon
,
class:
status
.
action_class
)
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