diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-11 20:36:16 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-11 20:36:16 +0300 |
| commit | c355b9abfe441da1d164cb1a27a8e6dbee266bb2 (patch) | |
| tree | 93c382befd108155f1a33bcbb416487da0e34250 | |
| parent | 4ba5acd23826831d5db52e66db5238a9030264a3 (diff) | |
| parent | ea696805a7a82ec6a70da1dd7d5bc010f035ea26 (diff) | |
| download | gitlab-ce-c355b9abfe441da1d164cb1a27a8e6dbee266bb2.tar.gz | |
Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict
Fix css rules conflict between .dark & a.dark classes
| -rw-r--r-- | app/assets/stylesheets/generic/typography.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss index a4419551738..8cc72d7f07a 100644 --- 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; } diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 06cf9946784..5c5df46d33d 100644 --- 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 |