summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-11-23 21:13:57 +1100
committerSimon Knox <psimyn@gmail.com>2017-11-23 22:10:49 +1100
commit1d6f37861ed04201f90b0248fc23e51b529addac (patch)
treef9dce42e0340c9f7f0ff627d574bd73b4489c1f5
parentf19a5e6dc27935c4fed5e736152105a363f5a8f8 (diff)
downloadgitlab-ce-40459-svg-icon-fix.tar.gz
override a:focus styles. fix Commit page pipeline icon40459-svg-icon-fix
-rw-r--r--app/assets/stylesheets/framework/common.scss1
-rw-r--r--app/assets/stylesheets/framework/icons.scss21
-rw-r--r--app/views/projects/commit/_commit_box.html.haml4
3 files changed, 17 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 6baff110187..cb1aad90a9c 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -9,6 +9,7 @@
.text-plain:hover {
color: $gl-text-color;
}
+
.text-secondary {
color: $gl-text-color-secondary;
}
diff --git a/app/assets/stylesheets/framework/icons.scss b/app/assets/stylesheets/framework/icons.scss
index 2fc8a3508d5..9e45ed52163 100644
--- a/app/assets/stylesheets/framework/icons.scss
+++ b/app/assets/stylesheets/framework/icons.scss
@@ -1,14 +1,16 @@
.ci-status-icon-success,
.ci-status-icon-passed {
&,
- &:hover {
+ &:hover,
+ &:focus {
color: $green-500;
}
}
.ci-status-icon-failed {
&,
- &:hover {
+ &:hover,
+ &:focus {
color: $gl-danger;
}
}
@@ -17,14 +19,16 @@
.ci-status-icon-failed_with_warnings,
.ci-status-icon-success_with_warnings {
&,
- &:hover {
+ &:hover,
+ &:focus {
color: $orange-500;
}
}
.ci-status-icon-running {
&,
- &:hover {
+ &:hover,
+ &:focus {
color: $blue-400;
}
}
@@ -33,7 +37,8 @@
.ci-status-icon-disabled,
.ci-status-icon-not-found {
&,
- &:hover {
+ &:hover,
+ &:focus {
color: $gl-text-color;
}
}
@@ -41,14 +46,16 @@
.ci-status-icon-created,
.ci-status-icon-skipped {
&,
- &:hover {
+ &:hover,
+ &:focus {
color: $gray-darkest;
}
}
.ci-status-icon-manual {
&,
- &:hover {
+ &:hover,
+ &:focus {
color: $gl-text-color;
}
}
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 8b9c1bbb602..5f607c2ab25 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -67,8 +67,8 @@
- if @commit.last_pipeline
- last_pipeline = @commit.last_pipeline
.well-segment.pipeline-info
- .status-icon-container{ class: "ci-status-icon-#{last_pipeline.status}" }
- = link_to project_pipeline_path(@project, last_pipeline.id) do
+ .status-icon-container
+ = link_to project_pipeline_path(@project, last_pipeline.id), class: "ci-status-icon-#{last_pipeline.status}" do
= ci_icon_for_status(last_pipeline.status)
#{ _('Pipeline') }
= link_to "##{last_pipeline.id}", project_pipeline_path(@project, last_pipeline.id)