summaryrefslogtreecommitdiff
path: root/app/helpers/projects_helper.rb
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-15 20:29:50 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-15 20:29:50 +0000
commitbb1c0e88ae893eca7a7a9c7b39beeed04e1991aa (patch)
tree60a32a7456b862d08ca2aa522d840ad4b7593c06 /app/helpers/projects_helper.rb
parent3e4d740d2853ba495a89dc07987b72133178bc2c (diff)
parenta99d25b174e07bf58ae8d0c5055291065038f81a (diff)
downloadgitlab-ce-bb1c0e88ae893eca7a7a9c7b39beeed04e1991aa.tar.gz
Merge branch 'issuable-sidebar-bold' into 'master'
Fixed issue with bold in issuable sidebar ## What does this MR do? ~~The sidebar contained both normal font weight & bold font weight, so this standardises them to bold.~~ After looking at the designs, i've updated the font weights & colors throughout the sidebar to correctly match them ## Screenshots (if relevant) ![Screen_Shot_2016-06-02_at_11.03.40](/uploads/0a3eb6a67ce5722c77f6adf2fe883017/Screen_Shot_2016-06-02_at_11.03.40.png) See merge request !4398
Diffstat (limited to 'app/helpers/projects_helper.rb')
-rw-r--r--app/helpers/projects_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 3b4e431a491..d91e3332e48 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -41,7 +41,7 @@ module ProjectsHelper
author_html = author_html.html_safe
if opts[:name]
- link_to(author_html, user_path(author), class: "author_link #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
+ link_to(author_html, user_path(author), class: "author_link #{"#{opts[:extra_class]}" if opts[:extra_class]} #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
else
title = opts[:title].sub(":name", sanitize(author.name))
link_to(author_html, user_path(author), class: "author_link has-tooltip", title: title, data: { container: 'body' } ).html_safe