kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict 

Fix css rules conflict between .dark & a.dark classes
This commit is contained in:
Dmitriy Zaporozhets 2014-05-11 20:36:16 +03:00
parent 4ba5acd238 ea696805a7
commit c355b9abfe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/generic/typography.scss
View File

@ -47,7 +47,7 @@ a {
text-decoration: underline; text-decoration: underline;
} }
&.dark { &.darken {
color: $style_color; color: $style_color;
} }

2
app/views/projects/milestones/show.html.haml
View File

@ -100,7 +100,7 @@
%ul.bordered-list %ul.bordered-list
- @users.each do |user| - @users.each do |user|
%li %li
= link_to user, title: user.name, class: "dark" do = link_to user, title: user.name, class: "darken" do
= image_tag avatar_icon(user.email, 32), class: "avatar s32" = image_tag avatar_icon(user.email, 32), class: "avatar s32"
%strong= truncate(user.name, lenght: 40) %strong= truncate(user.name, lenght: 40)
%br %br