Download as
Browse Code »

Commit c355b9abfe441da1d164cb1a27a8e6dbee266bb2

Authored by Dmitriy Zaporozhets
2 parents 4ba5acd2 ea696805
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict 

Fix css rules conflict between .dark & a.dark classes
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/assets/stylesheets/generic/typography.scss
  Diff comments   View file @c355b9a
... ... @@ -47,7 +47,7 @@ a {
47 47 text-decoration: underline;
48 48 }
49 49  
50   - &.dark {
  50 + &.darken {
51 51 color: $style_color;
52 52 }
53 53  
... ...
app/views/projects/milestones/show.html.haml
  Diff comments   View file @c355b9a
... ... @@ -100,7 +100,7 @@
100 100 %ul.bordered-list
101 101 - @users.each do |user|
102 102 %li
103   - = link_to user, title: user.name, class: "dark" do
  103 + = link_to user, title: user.name, class: "darken" do
104 104 = image_tag avatar_icon(user.email, 32), class: "avatar s32"
105 105 %strong= truncate(user.name, lenght: 40)
106 106 %br
... ...