Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict

Fix css rules conflict between .dark & a.dark classes

Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict
Fix css rules conflict between .dark & a.dark classes
Dmitriy Zaporozhets
2 parents 4ba5acd2 ea696805
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
app/assets/stylesheets/generic/typography.scss
app/views/projects/milestones/show.html.haml
@@ -47,7 +47,7 @@ a {
     text-decoration: underline;
   }
-  &.dark {
+  &.darken {
     color: $style_color;
   }
@@ -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
	@@ -47,7 +47,7 @@ a {		@@ -47,7 +47,7 @@ a {
47	text-decoration: underline;	47	text-decoration: underline;
48	}	48	}
49		49
50	- &.dark {	50	+ &.darken {
51	color: $style_color;	51	color: $style_color;
52	}	52	}
53		53
	@@ -100,7 +100,7 @@		@@ -100,7 +100,7 @@
100	%ul.bordered-list	100	%ul.bordered-list
101	- @users.each do \|user\|	101	- @users.each do \|user\|
102	%li	102	%li
103	- = link_to user, title: user.name, class: "dark" do	103	+ = link_to user, title: user.name, class: "darken" do
104	= image_tag avatar_icon(user.email, 32), class: "avatar s32"	104	= image_tag avatar_icon(user.email, 32), class: "avatar s32"
105	%strong= truncate(user.name, lenght: 40)	105	%strong= truncate(user.name, lenght: 40)
106	%br	106	%br