Commit c355b9ab authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict

Fix css rules conflict between .dark & a.dark classes
parents 4ba5acd2 ea696805
...@@ -47,7 +47,7 @@ a { ...@@ -47,7 +47,7 @@ a {
text-decoration: underline; text-decoration: underline;
} }
&.dark { &.darken {
color: $style_color; color: $style_color;
} }
......
...@@ -100,7 +100,7 @@ ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment