BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
c3c9122d
Commit
c3c9122d
authored
Dec 05, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds new hover state
Fixes the line that connects the dots Adds style for the badge Add new style for status text Fix badge style Adjust font weight
parent
e7b045ea
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
10 deletions
+33
-10
variables.scss
app/assets/stylesheets/framework/variables.scss
+7
-0
pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+25
-9
_pipeline_status_group.html.haml
app/views/projects/commit/_pipeline_status_group.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
c3c9122d
...
@@ -571,3 +571,10 @@ $body-text-shadow: rgba(255,255,255,0.01);
...
@@ -571,3 +571,10 @@ $body-text-shadow: rgba(255,255,255,0.01);
*/
*/
$ui-dev-kit-example-color
:
#bbb
;
$ui-dev-kit-example-color
:
#bbb
;
$ui-dev-kit-example-border
:
#ddd
;
$ui-dev-kit-example-border
:
#ddd
;
/*
Pipeline Graph
*/
$stage-hover-bg
:
#eaf3fc
;
$stage-hover-border
:
#d1e7fc
;
$stage-bagde-text
:
#d4d4d4
;
app/assets/stylesheets/pages/pipelines.scss
View file @
c3c9122d
...
@@ -363,15 +363,22 @@
...
@@ -363,15 +363,22 @@
.build
{
.build
{
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
border-radius
:
30px
;
background-color
:
$white-light
;
background-color
:
$white-light
;
color
:
$gl-text-color
;
position
:
relative
;
position
:
relative
;
padding
:
7px
10px
8px
;
padding
:
7px
10px
8px
;
border-radius
:
30px
;
width
:
186px
;
width
:
186px
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
&
:hover
{
&
:hover
{
background-color
:
$gray-lighter
;
background-color
:
$stage-hover-bg
;
border
:
1px
solid
$stage-hover-border
;
.ci-status-text
,
.dropdown-counter-bagde
{
color
:
$gl-text-color
;
}
}
}
&
.playable
{
&
.playable
{
...
@@ -411,14 +418,14 @@
...
@@ -411,14 +418,14 @@
}
}
.ci-status-text
{
.ci-status-text
{
width
:
135
px
;
max-width
:
110
px
;
white-space
:
nowrap
;
white-space
:
nowrap
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
vertical-align
:
middle
;
vertical-align
:
bottom
;
display
:
inline-block
;
display
:
inline-block
;
position
:
relative
;
position
:
relative
;
top
:
-1px
;
font-weight
:
100
;
}
}
a
{
a
{
...
@@ -435,7 +442,7 @@
...
@@ -435,7 +442,7 @@
flex-grow
:
1
;
flex-grow
:
1
;
.ci-status-text
{
.ci-status-text
{
max-width
:
11
2
px
;
max-width
:
11
0
px
;
width
:
auto
;
width
:
auto
;
}
}
}
}
...
@@ -480,7 +487,7 @@
...
@@ -480,7 +487,7 @@
}
}
.ci-status-text
{
.ci-status-text
{
width
:
11
2
px
;
width
:
11
0
px
;
}
}
.arrow
{
.arrow
{
...
@@ -520,9 +527,18 @@
...
@@ -520,9 +527,18 @@
}
}
}
}
.dropdown-counter-bagde
{
float
:
right
;
color
:
$stage-bagde-text
;
font-weight
:
100
;
font-size
:
13px
;
margin-top
:
1px
;
margin-right
:
2px
;
}
svg
{
svg
{
vertical-align
:
middle
;
vertical-align
:
middle
;
margin-right
:
5
px
;
margin-right
:
3
px
;
}
}
// Connect first build in each stage with right horizontal line
// Connect first build in each stage with right horizontal line
...
@@ -531,7 +547,7 @@
...
@@ -531,7 +547,7 @@
content
:
''
;
content
:
''
;
position
:
absolute
;
position
:
absolute
;
top
:
48%
;
top
:
48%
;
right
:
-4
8
px
;
right
:
-4
9
px
;
border-top
:
2px
solid
$border-color
;
border-top
:
2px
solid
$border-color
;
width
:
48px
;
width
:
48px
;
height
:
1px
;
height
:
1px
;
...
...
app/views/projects/commit/_pipeline_status_group.html.haml
View file @
c3c9122d
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
ci_icon_for_status
(
group_status
)
=
ci_icon_for_status
(
group_status
)
%span
.ci-status-text
%span
.ci-status-text
=
name
=
name
%span
.
badg
e
=
subject
.
size
%span
.
dropdown-counter-bagd
e
=
subject
.
size
.dropdown-menu.grouped-pipeline-dropdown
.dropdown-menu.grouped-pipeline-dropdown
.arrow
.arrow
%ul
%ul
...
...
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