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
bab98d29
Commit
bab98d29
authored
Nov 07, 2016
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
17492 Update link color for more accessible contrast
parent
6be0c160
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
16 deletions
+16
-16
app/assets/stylesheets/framework/selects.scss
app/assets/stylesheets/framework/selects.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-2
app/views/notify/pipeline_failed_email.html.haml
app/views/notify/pipeline_failed_email.html.haml
+7
-7
app/views/notify/pipeline_success_email.html.haml
app/views/notify/pipeline_success_email.html.haml
+6
-6
No files found.
app/assets/stylesheets/framework/selects.scss
View file @
bab98d29
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
}
}
.select2-highlighted
{
.select2-highlighted
{
background
:
#3084bb
!
important
;
background
:
$gl-link-color
!
important
;
}
}
.select2-results
li
.select2-result-with-children
>
.select2-result-label
{
.select2-results
li
.select2-result-with-children
>
.select2-result-label
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
bab98d29
...
@@ -103,7 +103,7 @@ $gl-text-color-light: #8c8c8c;
...
@@ -103,7 +103,7 @@ $gl-text-color-light: #8c8c8c;
$gl-text-green
:
#4a2
;
$gl-text-green
:
#4a2
;
$gl-text-red
:
#d12f19
;
$gl-text-red
:
#d12f19
;
$gl-text-orange
:
#d90
;
$gl-text-orange
:
#d90
;
$gl-link-color
:
#3
084bb
;
$gl-link-color
:
#3
777b0
;
$gl-dark-link-color
:
#333
;
$gl-dark-link-color
:
#333
;
$gl-placeholder-color
:
#8f8f8f
;
$gl-placeholder-color
:
#8f8f8f
;
$gl-icon-color
:
$gl-placeholder-color
;
$gl-icon-color
:
$gl-placeholder-color
;
...
@@ -197,7 +197,7 @@ $line-number-new: #ddfbe6;
...
@@ -197,7 +197,7 @@ $line-number-new: #ddfbe6;
$line-number-select
:
#fbf2da
;
$line-number-select
:
#fbf2da
;
$match-line
:
$gray-light
;
$match-line
:
$gray-light
;
$table-border-gray
:
#f0f0f0
;
$table-border-gray
:
#f0f0f0
;
$line-target-blue
:
#
eaf3fc
;
$line-target-blue
:
#
f6faff
;
$line-select-yellow
:
#fcf8e7
;
$line-select-yellow
:
#fcf8e7
;
$line-select-yellow-dark
:
#f0e2bd
;
$line-select-yellow-dark
:
#f0e2bd
;
...
...
app/views/notify/pipeline_failed_email.html.haml
View file @
bab98d29
...
@@ -103,11 +103,11 @@
...
@@ -103,11 +103,11 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;"
}
%img
{
height:
"13"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'
),
style:
"display:block;"
,
width:
"13"
}
/
%img
{
height:
"13"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'
),
style:
"display:block;"
,
width:
"13"
}
/
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;"
}
%a
{
href:
commit_url
(
@pipeline
),
style:
"color:#3
084bb
;text-decoration:none;"
}
%a
{
href:
commit_url
(
@pipeline
),
style:
"color:#3
777b0
;text-decoration:none;"
}
=
@pipeline
.
short_sha
=
@pipeline
.
short_sha
-
if
@merge_request
-
if
@merge_request
in
in
%a
{
href:
merge_request_url
(
@merge_request
),
style:
"color:#3
084bb
;text-decoration:none;"
}
%a
{
href:
merge_request_url
(
@merge_request
),
style:
"color:#3
777b0
;text-decoration:none;"
}
=
@merge_request
.
to_reference
=
@merge_request
.
to_reference
.commit
{
style:
"color:#5c5c5c;font-weight:300;"
}
.commit
{
style:
"color:#5c5c5c;font-weight:300;"
}
=
@pipeline
.
git_commit_message
.
truncate
(
50
)
=
@pipeline
.
git_commit_message
.
truncate
(
50
)
...
@@ -134,7 +134,7 @@
...
@@ -134,7 +134,7 @@
%tr
.pre-section
%tr
.pre-section
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 0;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 0;"
}
Pipeline
Pipeline
%a
{
href:
pipeline_url
(
@pipeline
),
style:
"color:#3
084bb
;text-decoration:none;"
}
%a
{
href:
pipeline_url
(
@pipeline
),
style:
"color:#3
777b0
;text-decoration:none;"
}
=
"
\#
#{
@pipeline
.
id
}
"
=
"
\#
#{
@pipeline
.
id
}
"
had
had
=
failed
.
size
=
failed
.
size
...
@@ -158,7 +158,7 @@
...
@@ -158,7 +158,7 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;"
}
=
build
.
stage
=
build
.
stage
%td
{
align:
"right"
,
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;"
}
%td
{
align:
"right"
,
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;"
}
%a
{
href:
pipeline_build_url
(
@pipeline
,
build
),
style:
"color:#3
084bb
;text-decoration:none;"
}
%a
{
href:
pipeline_build_url
(
@pipeline
,
build
),
style:
"color:#3
777b0
;text-decoration:none;"
}
=
build
.
name
=
build
.
name
%tr
.build-log
%tr
.build-log
%td
{
colspan:
"2"
,
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;"
}
%td
{
colspan:
"2"
,
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;"
}
...
@@ -168,10 +168,10 @@
...
@@ -168,10 +168,10 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"
}
%img
{
alt:
"GitLab"
,
height:
"33"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'
),
style:
"display:block;margin:0 auto 1em;"
,
width:
"90"
}
/
%img
{
alt:
"GitLab"
,
height:
"33"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'
),
style:
"display:block;margin:0 auto 1em;"
,
width:
"90"
}
/
%div
%div
%a
{
href:
profile_notifications_url
,
style:
"color:#3
084bb
;text-decoration:none;"
}
Manage all notifications
%a
{
href:
profile_notifications_url
,
style:
"color:#3
777b0
;text-decoration:none;"
}
Manage all notifications
·
·
%a
{
href:
help_url
,
style:
"color:#3
084bb
;text-decoration:none;"
}
Help
%a
{
href:
help_url
,
style:
"color:#3
777b0
;text-decoration:none;"
}
Help
%div
%div
You're receiving this email because of your account on
You're receiving this email because of your account on
=
succeed
"."
do
=
succeed
"."
do
%a
{
href:
root_url
,
style:
"color:#3
084bb
;text-decoration:none;"
}=
Gitlab
.
config
.
gitlab
.
host
%a
{
href:
root_url
,
style:
"color:#3
777b0
;text-decoration:none;"
}=
Gitlab
.
config
.
gitlab
.
host
app/views/notify/pipeline_success_email.html.haml
View file @
bab98d29
...
@@ -103,11 +103,11 @@
...
@@ -103,11 +103,11 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;"
}
%img
{
height:
"13"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'
),
style:
"display:block;"
,
width:
"13"
}
/
%img
{
height:
"13"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'
),
style:
"display:block;"
,
width:
"13"
}
/
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;"
}
%a
{
href:
commit_url
(
@pipeline
),
style:
"color:#3
084bb
;text-decoration:none;"
}
%a
{
href:
commit_url
(
@pipeline
),
style:
"color:#3
777b0
;text-decoration:none;"
}
=
@pipeline
.
short_sha
=
@pipeline
.
short_sha
-
if
@merge_request
-
if
@merge_request
in
in
%a
{
href:
merge_request_url
(
@merge_request
),
style:
"color:#3
084bb
;text-decoration:none;"
}
%a
{
href:
merge_request_url
(
@merge_request
),
style:
"color:#3
777b0
;text-decoration:none;"
}
=
@merge_request
.
to_reference
=
@merge_request
.
to_reference
.commit
{
style:
"color:#5c5c5c;font-weight:300;"
}
.commit
{
style:
"color:#5c5c5c;font-weight:300;"
}
=
@pipeline
.
git_commit_message
.
truncate
(
50
)
=
@pipeline
.
git_commit_message
.
truncate
(
50
)
...
@@ -135,7 +135,7 @@
...
@@ -135,7 +135,7 @@
-
build_count
=
@pipeline
.
statuses
.
latest
.
size
-
build_count
=
@pipeline
.
statuses
.
latest
.
size
-
stage_count
=
@pipeline
.
stages
.
size
-
stage_count
=
@pipeline
.
stages
.
size
Pipeline
Pipeline
%a
{
href:
pipeline_url
(
@pipeline
),
style:
"color:#3
084bb
;text-decoration:none;"
}
%a
{
href:
pipeline_url
(
@pipeline
),
style:
"color:#3
777b0
;text-decoration:none;"
}
=
"
\#
#{
@pipeline
.
id
}
"
=
"
\#
#{
@pipeline
.
id
}
"
successfully completed
successfully completed
=
"
#{
build_count
}
#{
'build'
.
pluralize
(
build_count
)
}
"
=
"
#{
build_count
}
#{
'build'
.
pluralize
(
build_count
)
}
"
...
@@ -145,10 +145,10 @@
...
@@ -145,10 +145,10 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"
}
%img
{
alt:
"GitLab"
,
height:
"33"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'
),
style:
"display:block;margin:0 auto 1em;"
,
width:
"90"
}
/
%img
{
alt:
"GitLab"
,
height:
"33"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'
),
style:
"display:block;margin:0 auto 1em;"
,
width:
"90"
}
/
%div
%div
%a
{
href:
profile_notifications_url
,
style:
"color:#3
084bb
;text-decoration:none;"
}
Manage all notifications
%a
{
href:
profile_notifications_url
,
style:
"color:#3
777b0
;text-decoration:none;"
}
Manage all notifications
·
·
%a
{
href:
help_url
,
style:
"color:#3
084bb
;text-decoration:none;"
}
Help
%a
{
href:
help_url
,
style:
"color:#3
777b0
;text-decoration:none;"
}
Help
%div
%div
You're receiving this email because of your account on
You're receiving this email because of your account on
=
succeed
"."
do
=
succeed
"."
do
%a
{
href:
root_url
,
style:
"color:#3
084bb
;text-decoration:none;"
}=
Gitlab
.
config
.
gitlab
.
host
%a
{
href:
root_url
,
style:
"color:#3
777b0
;text-decoration:none;"
}=
Gitlab
.
config
.
gitlab
.
host
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