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
Tatuya Kamada
gitlab-ce
Commits
b6c670cf
Commit
b6c670cf
authored
Aug 17, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style build container box; add check mark to active build
parent
162ef4b0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
3 deletions
+31
-3
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+4
-0
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+25
-3
app/views/projects/builds/_sidebar.html.haml
app/views/projects/builds/_sidebar.html.haml
+2
-0
No files found.
app/assets/stylesheets/framework/sidebar.scss
View file @
b6c670cf
...
@@ -222,3 +222,7 @@ header.header-pinned-nav {
...
@@ -222,3 +222,7 @@ header.header-pinned-nav {
padding-right
:
$sidebar_collapsed_width
;
padding-right
:
$sidebar_collapsed_width
;
}
}
}
}
.right-sidebar
{
border-left
:
1px
solid
$border-color
;
}
app/assets/stylesheets/pages/builds.scss
View file @
b6c670cf
...
@@ -101,7 +101,6 @@
...
@@ -101,7 +101,6 @@
.right-sidebar.build-sidebar
{
.right-sidebar.build-sidebar
{
padding
:
$gl-padding
0
;
padding
:
$gl-padding
0
;
border-left
:
1px
solid
$border-color
;
&
.right-sidebar-collapsed
{
&
.right-sidebar-collapsed
{
display
:
none
;
display
:
none
;
...
@@ -133,13 +132,19 @@
...
@@ -133,13 +132,19 @@
.build-dropdown
{
.build-dropdown
{
padding
:
0
$gl-padding
;
padding
:
0
$gl-padding
;
.dropdown-menu-toggle
{
margin-top
:
8px
;
}
}
}
.builds-container
{
.builds-container
{
margin
:
$gl-padding
0
;
margin
-top
:
$gl-padding
;
background-color
:
$white-light
;
background-color
:
$white-light
;
border-top
:
1px
solid
$border-color
;
border-top
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
max-height
:
300px
;
overflow
:
scroll
;
svg
{
svg
{
position
:
relative
;
position
:
relative
;
...
@@ -150,7 +155,11 @@
...
@@ -150,7 +155,11 @@
a
{
a
{
display
:
block
;
display
:
block
;
padding
:
$gl-padding
10px
;
padding
:
$gl-padding
10px
$gl-padding
40px
;
width
:
270px
;
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
&
:hover
{
&
:hover
{
background-color
:
$row-hover
;
background-color
:
$row-hover
;
...
@@ -159,8 +168,21 @@
...
@@ -159,8 +168,21 @@
}
}
.build-job
{
.build-job
{
position
:
relative
;
.fa
{
position
:
absolute
;
left
:
15px
;
top
:
20px
;
display
:
none
;
}
&
.active
{
&
.active
{
font-weight
:
bold
;
font-weight
:
bold
;
.fa
{
display
:
block
;
}
}
}
}
}
}
}
...
...
app/views/projects/builds/_sidebar.html.haml
View file @
b6c670cf
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
-
statuses
=
[
"failed"
,
"pending"
,
"running"
,
"canceled"
,
"success"
,
"skipped"
]
-
statuses
=
[
"failed"
,
"pending"
,
"running"
,
"canceled"
,
"success"
,
"skipped"
]
-
if
builds
.
size
>
1
-
if
builds
.
size
>
1
.dropdown.build-dropdown
.dropdown.build-dropdown
.build-light-text
Stage
%button
.dropdown-menu-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-menu-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.stage-selection
More
%span
.stage-selection
More
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
...
@@ -28,6 +29,7 @@
...
@@ -28,6 +29,7 @@
-
builds
.
select
{
|
build
|
build
.
status
==
build_status
}.
each
do
|
build
|
-
builds
.
select
{
|
build
|
build
.
status
==
build_status
}.
each
do
|
build
|
.build-job
{
class:
(
'active'
if
build
==
@build
),
data:
{
stage:
build
.
stage
}}
.build-job
{
class:
(
'active'
if
build
==
@build
),
data:
{
stage:
build
.
stage
}}
=
link_to
namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
)
do
=
link_to
namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
)
do
=
icon
(
'check'
)
=
ci_icon_for_status
(
build
.
status
)
=
ci_icon_for_status
(
build
.
status
)
%span
%span
-
if
build
.
name
-
if
build
.
name
...
...
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