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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
506836a6
Commit
506836a6
authored
Jul 13, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
unify commit signature colors with pipeline status
parent
027309eb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
24 deletions
+31
-24
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+26
-0
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+4
-4
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+1
-20
No files found.
app/assets/stylesheets/framework/mixins.scss
View file @
506836a6
...
@@ -118,3 +118,29 @@
...
@@ -118,3 +118,29 @@
@content
;
@content
;
}
}
}
}
/*
* Mixin for status badges, as used for pipelines and commit signatures
*/
@mixin
status-color
(
$color-light
,
$color-main
,
$color-dark
)
{
color
:
$color-main
;
border-color
:
$color-main
;
&
:not
(
span
)
:hover
{
background-color
:
$color-light
;
color
:
$color-dark
;
border-color
:
$color-dark
;
svg
{
fill
:
$color-dark
;
}
}
svg
{
fill
:
$color-main
;
}
}
@mixin
green-status-color
{
@include
status-color
(
$green-50
,
$green-500
,
$green-700
);
}
app/assets/stylesheets/pages/commits.scss
View file @
506836a6
...
@@ -284,15 +284,15 @@
...
@@ -284,15 +284,15 @@
}
}
}
}
.gpg-status-box
{
.gpg-status-box
{
&
.valid
{
&
.valid
{
color
:
$brand-success
;
@include
green-status-color
;
border
:
1px
solid
$brand-success
;
}
}
&
.invalid
{
&
.invalid
{
color
:
$gray
;
@include
status-color
(
$gray-dark
,
$gray
,
$common-gray-dark
)
;
border
:
1px
solid
$common-gray-light
;
border
-color
:
$common-gray-light
;
}
}
}
}
...
...
app/assets/stylesheets/pages/status.scss
View file @
506836a6
@mixin
status-color
(
$color-light
,
$color-main
,
$color-dark
)
{
color
:
$color-main
;
border-color
:
$color-main
;
&
:not
(
span
)
:hover
{
background-color
:
$color-light
;
color
:
$color-dark
;
border-color
:
$color-dark
;
svg
{
fill
:
$color-dark
;
}
}
svg
{
fill
:
$color-main
;
}
}
.ci-status
{
.ci-status
{
padding
:
2px
7px
4px
;
padding
:
2px
7px
4px
;
border
:
1px
solid
$gray-darker
;
border
:
1px
solid
$gray-darker
;
...
@@ -41,7 +22,7 @@
...
@@ -41,7 +22,7 @@
}
}
&
.ci-success
{
&
.ci-success
{
@include
status-color
(
$green-50
,
$green-500
,
$green-700
)
;
@include
green-status-color
;
}
}
&
.ci-canceled
,
&
.ci-canceled
,
...
...
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