Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
9eca5577
Commit
9eca5577
authored
Jun 14, 2013
by
marco
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated flag icons to be font-awesome based
parent
646ff9ea
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
lms/static/sass/_discussion.scss
+15
-0
lms/templates/discussion/_underscore_templates.html
+0
-0
No files found.
lms/static/sass/_discussion.scss
View file @
9eca5577
...
@@ -2691,20 +2691,35 @@ display:none;
...
@@ -2691,20 +2691,35 @@ display:none;
}
}
}
}
<<<<<<<
HEAD
.notflagged
.icon
.notflagged
.icon
{
{
display
:
block
;
display
:
block
;
=======
}
.notflagged
.icon
{
display
:
block
;
>>>>>>>
updated
flag
icons
to
be
font-awesome
based
float
:
left
;
float
:
left
;
margin
:
3px
;
margin
:
3px
;
width
:
10px
;
width
:
10px
;
height
:
14px
;
height
:
14px
;
padding-right
:
3px
;
padding-right
:
3px
;
<<<<<<<
HEAD
}
}
.flagged
.icon
.flagged
.icon
{
{
display
:
block
;
display
:
block
;
color
:
$gray-l2
;
color
:
$gray-l2
;
=======
color
:
$gray-l2
;
}
.flagged
.icon
{
display
:
block
;
>>>>>>>
updated
flag
icons
to
be
font-awesome
based
float
:
left
;
float
:
left
;
margin
:
3px
;
margin
:
3px
;
width
:
10px
;
width
:
10px
;
...
...
lms/templates/discussion/_underscore_templates.html
View file @
9eca5577
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