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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
1d6f3786
Commit
1d6f3786
authored
Nov 23, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
override a:focus styles. fix Commit page pipeline icon
parent
f19a5e6d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
9 deletions
+17
-9
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-0
app/assets/stylesheets/framework/icons.scss
app/assets/stylesheets/framework/icons.scss
+14
-7
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/common.scss
View file @
1d6f3786
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
.text-plain
:hover
{
.text-plain
:hover
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
}
}
.text-secondary
{
.text-secondary
{
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
}
}
...
...
app/assets/stylesheets/framework/icons.scss
View file @
1d6f3786
.ci-status-icon-success
,
.ci-status-icon-success
,
.ci-status-icon-passed
{
.ci-status-icon-passed
{
&
,
&
,
&
:hover
{
&
:hover
,
&
:focus
{
color
:
$green-500
;
color
:
$green-500
;
}
}
}
}
.ci-status-icon-failed
{
.ci-status-icon-failed
{
&
,
&
,
&
:hover
{
&
:hover
,
&
:focus
{
color
:
$gl-danger
;
color
:
$gl-danger
;
}
}
}
}
...
@@ -17,14 +19,16 @@
...
@@ -17,14 +19,16 @@
.ci-status-icon-failed_with_warnings
,
.ci-status-icon-failed_with_warnings
,
.ci-status-icon-success_with_warnings
{
.ci-status-icon-success_with_warnings
{
&
,
&
,
&
:hover
{
&
:hover
,
&
:focus
{
color
:
$orange-500
;
color
:
$orange-500
;
}
}
}
}
.ci-status-icon-running
{
.ci-status-icon-running
{
&
,
&
,
&
:hover
{
&
:hover
,
&
:focus
{
color
:
$blue-400
;
color
:
$blue-400
;
}
}
}
}
...
@@ -33,7 +37,8 @@
...
@@ -33,7 +37,8 @@
.ci-status-icon-disabled
,
.ci-status-icon-disabled
,
.ci-status-icon-not-found
{
.ci-status-icon-not-found
{
&
,
&
,
&
:hover
{
&
:hover
,
&
:focus
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
}
}
}
}
...
@@ -41,14 +46,16 @@
...
@@ -41,14 +46,16 @@
.ci-status-icon-created
,
.ci-status-icon-created
,
.ci-status-icon-skipped
{
.ci-status-icon-skipped
{
&
,
&
,
&
:hover
{
&
:hover
,
&
:focus
{
color
:
$gray-darkest
;
color
:
$gray-darkest
;
}
}
}
}
.ci-status-icon-manual
{
.ci-status-icon-manual
{
&
,
&
,
&
:hover
{
&
:hover
,
&
:focus
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
}
}
}
}
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
1d6f3786
...
@@ -67,8 +67,8 @@
...
@@ -67,8 +67,8 @@
-
if
@commit
.
last_pipeline
-
if
@commit
.
last_pipeline
-
last_pipeline
=
@commit
.
last_pipeline
-
last_pipeline
=
@commit
.
last_pipeline
.well-segment.pipeline-info
.well-segment.pipeline-info
.status-icon-container
{
class:
"ci-status-icon-#{last_pipeline.status}"
}
.status-icon-container
=
link_to
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
do
=
link_to
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
,
class:
"ci-status-icon-
#{
last_pipeline
.
status
}
"
do
=
ci_icon_for_status
(
last_pipeline
.
status
)
=
ci_icon_for_status
(
last_pipeline
.
status
)
#{
_
(
'Pipeline'
)
}
#{
_
(
'Pipeline'
)
}
=
link_to
"#
#{
last_pipeline
.
id
}
"
,
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
=
link_to
"#
#{
last_pipeline
.
id
}
"
,
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
...
...
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