Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
c355b9ab
Commit
c355b9ab
authored
May 11, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict
Fix css rules conflict between .dark & a.dark classes
parents
4ba5acd2
ea696805
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/assets/stylesheets/generic/typography.scss
app/assets/stylesheets/generic/typography.scss
+1
-1
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/typography.scss
View file @
c355b9ab
...
@@ -47,7 +47,7 @@ a {
...
@@ -47,7 +47,7 @@ a {
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
&
.dark
{
&
.dark
en
{
color
:
$style_color
;
color
:
$style_color
;
}
}
...
...
app/views/projects/milestones/show.html.haml
View file @
c355b9ab
...
@@ -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:
"dark
en
"
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment