Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-08-30 21:01:41 +0300
committerFatih Acet <acetfatih@gmail.com>2016-08-30 21:01:41 +0300
commit90c7a4117a68f5e019fed314076f6fcefbed9ac0 (patch)
treeefca040d08c25242a52de7ecbe82515db808f07c /app
parent4de9e7271d7dbc4a5f3f5f1f22e57ee8c9d9bb5d (diff)
parent47ca2d3202539f759552a277d4342591afd869a9 (diff)
Merge branch '21520-created-pipeline' into 'master'
Add new icon for created pipeline ## What does this MR do? Adds new icon for `created` status ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_11.55.02_AM](/uploads/e062f9eb3b8102374fb92ce209ab69b1/Screen_Shot_2016-08-30_at_11.55.02_AM.png) ## What are the relevant issue numbers? Closes #21520 See merge request !6108
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/status.scss9
-rw-r--r--app/helpers/ci_status_helper.rb2
-rw-r--r--app/views/shared/icons/_icon_status_created.svg1
3 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index 587f2d9f3c1..0ee7ceecae5 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -43,6 +43,15 @@
border-color: $blue-normal;
}
+ &.ci-created {
+ color: $table-text-gray;
+ border-color: $table-text-gray;
+
+ svg {
+ fill: $table-text-gray;
+ }
+ }
+
svg {
height: 13px;
width: 13px;
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index 0327b476d18..00bdb488c9b 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -41,7 +41,7 @@ module CiStatusHelper
when 'play'
'icon_play'
when 'created'
- 'icon_status_pending'
+ 'icon_status_created'
else
'icon_status_cancel'
end
diff --git a/app/views/shared/icons/_icon_status_created.svg b/app/views/shared/icons/_icon_status_created.svg
new file mode 100644
index 00000000000..4a08fd65860
--- /dev/null
+++ b/app/views/shared/icons/_icon_status_created.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14" enable-background="new 0 0 14 14"><path d="M12.5,7 C12.5,4 10,1.5 7,1.5 C4,1.5 1.5,4 1.5,7 C1.5,10 4,12.5 7,12.5 C10,12.5 12.5,10 12.5,7 L12.5,7 Z M0,7 C0,3.1 3.1,0 7,0 C10.9,0 14,3.1 14,7 C14,10.9 10.9,14 7,14 C3.1,14 0,10.9 0,7 L0,7 Z" /><circle cx="7" cy="7" r="3.25"/></svg>