Commit c2c0b468 authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflict in app/assets/stylesheets/framework/icons.scss

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 848890b0
.ci-status-icon-success, .ci-status-icon-success,
.ci-status-icon-passed { .ci-status-icon-passed {
<<<<<<< HEAD
&,
&:hover,
&:focus {
color: $green-500;
=======
svg { svg {
fill: $green-500; fill: $green-500;
>>>>>>> origin/master
} }
} }
.ci-status-icon-failed { .ci-status-icon-failed {
<<<<<<< HEAD
&,
&:hover,
&:focus {
color: $gl-danger;
=======
svg { svg {
fill: $gl-danger; fill: $gl-danger;
>>>>>>> origin/master
} }
} }
.ci-status-icon-pending, .ci-status-icon-pending,
.ci-status-icon-failed_with_warnings, .ci-status-icon-failed_with_warnings,
.ci-status-icon-success_with_warnings { .ci-status-icon-success_with_warnings {
<<<<<<< HEAD
&,
&:hover,
&:focus {
color: $orange-500;
=======
svg { svg {
fill: $orange-500; fill: $orange-500;
>>>>>>> origin/master
} }
} }
.ci-status-icon-running { .ci-status-icon-running {
<<<<<<< HEAD
&,
&:hover,
&:focus {
color: $blue-400;
=======
svg { svg {
fill: $blue-400; fill: $blue-400;
>>>>>>> origin/master
} }
} }
.ci-status-icon-canceled, .ci-status-icon-canceled,
.ci-status-icon-disabled, .ci-status-icon-disabled,
.ci-status-icon-not-found { .ci-status-icon-not-found {
<<<<<<< HEAD
&,
&:hover,
&:focus {
color: $gl-text-color;
=======
svg { svg {
fill: $gl-text-color; fill: $gl-text-color;
>>>>>>> origin/master
} }
} }
.ci-status-icon-created, .ci-status-icon-created,
.ci-status-icon-skipped { .ci-status-icon-skipped {
<<<<<<< HEAD
&,
&:hover,
&:focus {
color: $gray-darkest;
=======
svg { svg {
fill: $gray-darkest; fill: $gray-darkest;
>>>>>>> origin/master
} }
} }
.ci-status-icon-manual { .ci-status-icon-manual {
<<<<<<< HEAD
&,
&:hover,
&:focus {
color: $gl-text-color;
=======
svg { svg {
fill: $gl-text-color; fill: $gl-text-color;
>>>>>>> origin/master
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment