diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-23 08:14:24 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-23 08:14:24 +0000 |
| commit | 2ad0999b59c3bf33b9458da3072ca73b8ec08381 (patch) | |
| tree | fcf71603823e4a7ecc0af22fd8b2ae6d40dcf955 | |
| parent | f964eb4ba1383f02ca32e4ea702a9e80024cace8 (diff) | |
| parent | e009a00e799c856788211033746c6cc39552cc87 (diff) | |
| download | gitlab-ce-2ad0999b59c3bf33b9458da3072ca73b8ec08381.tar.gz | |
Merge branch '61049-links-activity-stream' into 'master'
Use blue for activity stream links; use monospace font for commit sha
Closes #61049
See merge request gitlab-org/gitlab-ce!28558
| -rw-r--r-- | app/assets/stylesheets/pages/events.scss | 4 | ||||
| -rw-r--r-- | app/views/events/event/_push.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/61049-links-activity-stream.yml | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index 618f23d81b1..e34628002ac 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -156,6 +156,10 @@ &:hover { background: none; } + + a { + color: $blue-600; + } } } } diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 69914fccc48..21c418cb0e4 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -32,7 +32,8 @@ - from_label = from = link_to project_compare_path(project, from: from, to: event.commit_to) do - Compare #{from_label}...#{truncate_sha(event.commit_to)} + %span Compare + %span.commit-sha #{from_label}...#{truncate_sha(event.commit_to)} - if create_mr %span diff --git a/changelogs/unreleased/61049-links-activity-stream.yml b/changelogs/unreleased/61049-links-activity-stream.yml new file mode 100644 index 00000000000..3aac84adc31 --- /dev/null +++ b/changelogs/unreleased/61049-links-activity-stream.yml @@ -0,0 +1,5 @@ +--- +title: Use blue for activity stream links; use monospace font for commit sha +merge_request: +author: +type: other |