Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated flag icons to be font-awesome based

Browse Source
This commit is contained in:
marco
2013-06-14 15:04:39 -04:00
parent 646ff9ea75
commit 9eca557761
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/static/sass/_discussion.scss
View File

@@ -2691,20 +2691,35 @@ display:none;
}
}
<<<<<<< HEAD
.notflagged .icon
{
display: block;
=======
}
.notflagged .icon {
display: block;
>>>>>>> updated flag icons to be font-awesome based
float: left;
margin: 3px;
width: 10px;
height: 14px;
padding-right: 3px;
<<<<<<< HEAD
}
.flagged .icon
{
display: block;
color: $gray-l2;
=======
color: $gray-l2;
}
.flagged .icon {
display: block;
>>>>>>> updated flag icons to be font-awesome based
float: left;
margin: 3px;
width: 10px;

12
lms/templates/discussion/_underscore_templates.html
View File

@@ -47,18 +47,18 @@
</header>
<div class="post-body">${'<%- body %>'}</div>
<div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="Report Misuse">
<i class="icon icon-flag"></i><span class="flag-label">Report Misuse</span></div>
<div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="Report Misuse">
<i class="icon icon-flag"></i><span class="flag-label">Report Misuse</span></div>
% if course and has_permission(user, 'openclose_thread', course.id):
<div class="admin-pin discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
<i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div>
<div class="admin-pin discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
<i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div>
%else:
${"<% if (pinned) { %>"}
<div class="discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
<i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div>
<div class="discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
<i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div>
${"<% } %>"}
% endif