Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict

Fix css rules conflict between .dark & a.dark classes
2014-05-11 20:36:16 +03:00 · 2014-05-11 20:36:16 +03:00 · c355b9abfe
parent 4ba5acd238 ea696805a7
commit c355b9abfe
2 changed files with 2 additions and 2 deletions
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@ -47,7 +47,7 @@ a {
    text-decoration: underline;
  }

-  &.dark {
+  &.darken {
    color: $style_color;
  }

--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@ -100,7 +100,7 @@
    %ul.bordered-list
      - @users.each do |user|
        %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"
            %strong= truncate(user.name, lenght: 40)
            %br