summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-01-25 09:40:41 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-01-25 15:44:45 +0000
commit4983fbaaf457cf434bca83ecbc178723d90a3dd2 (patch)
tree2d71da1d9e968665e74c20b3d4975c4e6004db3b
parentbf7426a416c7019a124cbe5ec24ce0a8fba9c828 (diff)
downloadgitlab-ce-4983fbaaf457cf434bca83ecbc178723d90a3dd2.tar.gz
Remove unneeded 'borderless' from icons name
-rw-r--r--app/views/shared/icons/_icon_action_cancel.svg (renamed from app/views/shared/icons/_icon_action_cancel_borderless.svg)0
-rw-r--r--app/views/shared/icons/_icon_action_play.svg (renamed from app/views/shared/icons/_icon_action_play_borderless.svg)0
-rw-r--r--app/views/shared/icons/_icon_action_retry.svg (renamed from app/views/shared/icons/_icon_action_retry_borderless.svg)0
-rw-r--r--app/views/shared/icons/_icon_action_stop.svg (renamed from app/views/shared/icons/_icon_action_stop_borderless.svg)0
-rw-r--r--lib/gitlab/ci/status/build/cancelable.rb2
-rw-r--r--lib/gitlab/ci/status/build/play.rb2
-rw-r--r--lib/gitlab/ci/status/build/retryable.rb2
-rw-r--r--lib/gitlab/ci/status/build/stop.rb4
8 files changed, 5 insertions, 5 deletions
diff --git a/app/views/shared/icons/_icon_action_cancel_borderless.svg b/app/views/shared/icons/_icon_action_cancel.svg
index a1f700eb0ff..a1f700eb0ff 100644
--- a/app/views/shared/icons/_icon_action_cancel_borderless.svg
+++ b/app/views/shared/icons/_icon_action_cancel.svg
diff --git a/app/views/shared/icons/_icon_action_play_borderless.svg b/app/views/shared/icons/_icon_action_play.svg
index 6ac192cd7e9..6ac192cd7e9 100644
--- a/app/views/shared/icons/_icon_action_play_borderless.svg
+++ b/app/views/shared/icons/_icon_action_play.svg
diff --git a/app/views/shared/icons/_icon_action_retry_borderless.svg b/app/views/shared/icons/_icon_action_retry.svg
index 0fa0243f3c0..0fa0243f3c0 100644
--- a/app/views/shared/icons/_icon_action_retry_borderless.svg
+++ b/app/views/shared/icons/_icon_action_retry.svg
diff --git a/app/views/shared/icons/_icon_action_stop_borderless.svg b/app/views/shared/icons/_icon_action_stop.svg
index 1c8e2fe4156..1c8e2fe4156 100644
--- a/app/views/shared/icons/_icon_action_stop_borderless.svg
+++ b/app/views/shared/icons/_icon_action_stop.svg
diff --git a/lib/gitlab/ci/status/build/cancelable.rb b/lib/gitlab/ci/status/build/cancelable.rb
index f9fa58586f2..67bbc3c4849 100644
--- a/lib/gitlab/ci/status/build/cancelable.rb
+++ b/lib/gitlab/ci/status/build/cancelable.rb
@@ -10,7 +10,7 @@ module Gitlab
end
def action_icon
- 'icon_action_cancel_borderless'
+ 'icon_action_cancel'
end
def action_path
diff --git a/lib/gitlab/ci/status/build/play.rb b/lib/gitlab/ci/status/build/play.rb
index c5c408f0e3e..b0549b3473c 100644
--- a/lib/gitlab/ci/status/build/play.rb
+++ b/lib/gitlab/ci/status/build/play.rb
@@ -26,7 +26,7 @@ module Gitlab
end
def action_icon
- 'icon_action_play_borderless'
+ 'icon_action_play'
end
def action_title
diff --git a/lib/gitlab/ci/status/build/retryable.rb b/lib/gitlab/ci/status/build/retryable.rb
index 7544df022a4..6b362af7634 100644
--- a/lib/gitlab/ci/status/build/retryable.rb
+++ b/lib/gitlab/ci/status/build/retryable.rb
@@ -10,7 +10,7 @@ module Gitlab
end
def action_icon
- 'icon_action_retry_borderless'
+ 'icon_action_retry'
end
def action_title
diff --git a/lib/gitlab/ci/status/build/stop.rb b/lib/gitlab/ci/status/build/stop.rb
index 45d1e80aa35..90401cad0d2 100644
--- a/lib/gitlab/ci/status/build/stop.rb
+++ b/lib/gitlab/ci/status/build/stop.rb
@@ -14,7 +14,7 @@ module Gitlab
end
def icon
- 'icon_action_stop_borderless'
+ 'icon_status_manual'
end
def group
@@ -26,7 +26,7 @@ module Gitlab
end
def action_icon
- 'stop'
+ 'icon_action_stop'
end
def action_title