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
Jérome Perrin
gitlab-ce
Commits
c57471dd
Commit
c57471dd
authored
Jul 11, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new stopwatch and commit icons; rename custom icon helper; fix commit pipeline layout
parent
694ab941
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
31 additions
and
15 deletions
+31
-15
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+18
-4
app/helpers/appearances_helper.rb
app/helpers/appearances_helper.rb
+1
-1
app/views/admin/builds/_build.html.haml
app/views/admin/builds/_build.html.haml
+2
-2
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+2
-2
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+2
-2
app/views/projects/commit/_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+1
-3
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+1
-1
app/views/shared/icons/_icon_commit.svg
app/views/shared/icons/_icon_commit.svg
+3
-0
app/views/shared/icons/_icon_timer.svg
app/views/shared/icons/_icon_timer.svg
+1
-0
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
c57471dd
.pipelines
{
.pipelines
{
.stage
{
.stage
{
max-width
:
7
0px
;
max-width
:
8
0px
;
width
:
7
0px
;
width
:
8
0px
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
white-space
:
nowrap
;
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
tr
{
tr
{
th
{
th
{
padding
:
1
8px
10
px
;
padding
:
1
6
px
;
border
:
none
;
border
:
none
;
}
}
}
}
...
@@ -56,8 +56,11 @@
...
@@ -56,8 +56,11 @@
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
}
}
.fa
{
svg
{
margin
:
0
6px
;
margin
:
0
6px
;
height
:
14px
;
width
:
auto
;
vertical-align
:
middle
;
}
}
.commit-id
{
.commit-id
{
...
@@ -88,6 +91,17 @@
...
@@ -88,6 +91,17 @@
margin
:
4px
0
;
margin
:
4px
0
;
.fa
{
.fa
{
font-size
:
12px
;
}
svg
{
height
:
12px
;
width
:
auto
;
vertical-align
:
middle
;
}
.fa
,
svg
{
margin-right
:
5px
;
margin-right
:
5px
;
}
}
}
}
...
...
app/helpers/appearances_helper.rb
View file @
c57471dd
...
@@ -31,7 +31,7 @@ module AppearancesHelper
...
@@ -31,7 +31,7 @@ module AppearancesHelper
end
end
end
end
def
navbar
_icon
(
icon_name
,
size:
16
)
def
custom
_icon
(
icon_name
,
size:
16
)
render
"shared/icons/
#{
icon_name
}
.svg"
,
size:
size
render
"shared/icons/
#{
icon_name
}
.svg"
,
size:
size
end
end
end
end
app/views/admin/builds/_build.html.haml
View file @
c57471dd
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
=
link_to
build
.
ref
,
namespace_project_commits_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
ref
),
class:
"monospace branch-name"
=
link_to
build
.
ref
,
namespace_project_commits_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
ref
),
class:
"monospace branch-name"
-
else
-
else
.light
none
.light
none
=
icon
(
"code-fork
"
)
=
custom_icon
(
"icon_commit
"
)
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"monospace commit-id"
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"monospace commit-id"
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
%td
%td
-
if
build
.
duration
-
if
build
.
duration
%p
.duration
%p
.duration
=
icon
(
"clock-o
"
)
=
custom_icon
(
"icon_timer
"
)
#{
duration_in_words
(
build
.
finished_at
,
build
.
started_at
)
}
#{
duration_in_words
(
build
.
finished_at
,
build
.
started_at
)
}
-
if
build
.
finished_at
-
if
build
.
finished_at
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
c57471dd
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
=
link_to
build
.
ref
,
namespace_project_commits_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
ref
),
class:
"monospace branch-name"
=
link_to
build
.
ref
,
namespace_project_commits_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
ref
),
class:
"monospace branch-name"
-
else
-
else
.light
none
.light
none
=
icon
(
"code-fork
"
)
=
custom_icon
(
"icon_commit
"
)
-
if
defined?
(
commit_sha
)
&&
commit_sha
-
if
defined?
(
commit_sha
)
&&
commit_sha
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"commit-id monospace"
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"commit-id monospace"
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
%td
%td
-
if
build
.
duration
-
if
build
.
duration
%p
.duration
%p
.duration
=
icon
(
"clock-o
"
)
=
custom_icon
(
"icon_timer
"
)
#{
duration_in_words
(
build
.
finished_at
,
build
.
started_at
)
}
#{
duration_in_words
(
build
.
finished_at
,
build
.
started_at
)
}
-
if
build
.
finished_at
-
if
build
.
finished_at
%p
.finished-at
%p
.finished-at
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
c57471dd
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
%span
##{pipeline.id}
%span
##{pipeline.id}
-
if
pipeline
.
ref
-
if
pipeline
.
ref
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
pipeline
.
ref
),
class:
"monospace branch-name"
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
pipeline
.
ref
),
class:
"monospace branch-name"
=
icon
(
"code-fork
"
)
=
custom_icon
(
"icon_commit
"
)
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
),
class:
"commit-id monospace"
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
),
class:
"commit-id monospace"
-
if
pipeline
.
tag?
-
if
pipeline
.
tag?
%span
.label.label-primary
tag
%span
.label.label-primary
tag
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
%td
%td
-
if
pipeline
.
started_at
&&
pipeline
.
finished_at
-
if
pipeline
.
started_at
&&
pipeline
.
finished_at
%p
.duration
%p
.duration
=
icon
(
"clock-o
"
)
=
custom_icon
(
"icon_timer
"
)
=
duration_in_numbers
(
pipeline
.
finished_at
,
pipeline
.
started_at
)
=
duration_in_numbers
(
pipeline
.
finished_at
,
pipeline
.
started_at
)
-
if
pipeline
.
finished_at
-
if
pipeline
.
finished_at
%p
.finished-at
%p
.finished-at
...
...
app/views/projects/commit/_pipeline.html.haml
View file @
c57471dd
...
@@ -42,9 +42,7 @@
...
@@ -42,9 +42,7 @@
%th
Status
%th
Status
%th
Build ID
%th
Build ID
%th
Name
%th
Name
%th
Tags
%th
%th
Duration
%th
Finished at
-
if
pipeline
.
project
.
build_coverage_enabled?
-
if
pipeline
.
project
.
build_coverage_enabled?
%th
Coverage
%th
Coverage
%th
%th
...
...
app/views/projects/issues/index.html.haml
View file @
c57471dd
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
Code, test, and deploy together
Code, test, and deploy together
.blank-state
.blank-state
.blank-state-icon
.blank-state-icon
=
navbar
_icon
(
"issues"
,
size:
50
)
=
custom
_icon
(
"issues"
,
size:
50
)
%h3
.blank-state-title
%h3
.blank-state-title
You don't have any issues right now.
You don't have any issues right now.
%p
.blank-state-text
%p
.blank-state-text
...
...
app/views/shared/icons/_icon_commit.svg
0 → 100644
View file @
c57471dd
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"40"
height=
"40"
viewBox=
"0 0 40 40"
>
<path
fill=
"#8F8F8F"
fill-rule=
"evenodd"
d=
"M28.7769836,18 C27.8675252,13.9920226 24.2831748,11 20,11 C15.7168252,11 12.1324748,13.9920226 11.2230164,18 L4.0085302,18 C2.90195036,18 2,18.8954305 2,20 C2,21.1122704 2.8992496,22 4.0085302,22 L11.2230164,22 C12.1324748,26.0079774 15.7168252,29 20,29 C24.2831748,29 27.8675252,26.0079774 28.7769836,22 L35.9914698,22 C37.0980496,22 38,21.1045695 38,20 C38,18.8877296 37.1007504,18 35.9914698,18 L28.7769836,18 L28.7769836,18 Z M20,25 C22.7614237,25 25,22.7614237 25,20 C25,17.2385763 22.7614237,15 20,15 C17.2385763,15 15,17.2385763 15,20 C15,22.7614237 17.2385763,25 20,25 L20,25 Z"
/>
</svg>
app/views/shared/icons/_icon_timer.svg
0 → 100644
View file @
c57471dd
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"40"
height=
"40"
viewBox=
"0 0 40 40"
><g
fill=
"#8F8F8F"
fill-rule=
"evenodd"
><path
d=
"M29.513 10.134A15.922 15.922 0 0 0 23 7.28V6h2.993C26.55 6 27 5.552 27 5V2a1 1 0 0 0-1.007-1H14.007C13.45 1 13 1.448 13 2v3a1 1 0 0 0 1.007 1H17v1.28C9.597 8.686 4 15.19 4 23c0 8.837 7.163 16 16 16s16-7.163 16-16c0-3.461-1.099-6.665-2.967-9.283l1.327-1.58a2.498 2.498 0 0 0-.303-3.53 2.499 2.499 0 0 0-3.528.315l-1.016 1.212zM20 34c6.075 0 11-4.925 11-11s-4.925-11-11-11S9 16.925 9 23s4.925 11 11 11z"
/><path
d=
"M19 21h-4.002c-.552 0-.998.452-.998 1.01v1.98c0 .567.447 1.01.998 1.01h7.004c.274 0 .521-.111.701-.291a.979.979 0 0 0 .297-.704v-8.01c0-.54-.452-.995-1.01-.995h-1.98a.997.997 0 0 0-1.01.995V21z"
/></g></svg>
\ No newline at end of file
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