Skip to content

LMS: revising icon syntax for edX notes UI #6500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
talbs merged 1 commit into from
Jan 8, 2015
Merged

LMS: revising icon syntax for edX notes UI #6500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lms/static/js/edxnotes/views/tabs/course_structure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ define([
tabInfo: {
name: gettext('Location in Course'),
identifier: 'view-course-structure',
icon: 'icon-list-ul'
icon: 'fa fa-list-ul'
}
});

Expand Down
2 changes: 1 addition & 1 deletion lms/static/js/edxnotes/views/tabs/recent_activity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ define([
tabInfo: {
identifier: 'view-recent-activity',
name: gettext('Recent Activity'),
icon: 'icon-time'
icon: 'fa fa-clock-o'
}
});

Expand Down
2 changes: 1 addition & 1 deletion lms/static/js/edxnotes/views/tabs/search_results.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ define([
tabInfo: {
identifier: 'view-search-results',
name: gettext('Search Results'),
icon: 'icon-search',
icon: 'fa fa-search',
is_closable: true
},

Expand Down
4 changes: 2 additions & 2 deletions lms/static/js/fixtures/edxnotes/edxnotes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h1 class="page-title">
<form role="search" action="/search_endpoint" method="GET" id="search-notes-form" class="is-hidden">
<label for="search-notes-input" class="sr">Search notes for:</label>
<input type="search" class="search-notes-input" id="search-notes-input" name="note" placeholder="Search notes for...">
<button type="submit" class="search-notes-submit"><i class="icon-search"></i> Search</button>
<button type="submit" class="search-notes-submit"><i class="icon fa fa-search"></i> Search</button>
</form>
</div>
</div>
Expand All @@ -21,7 +21,7 @@ <h2 id="tab-view" class="tabs-label">View notes by:</h2>
</div>
<div class="inline-error is-hidden" tabindex="-1"></div>
<div class="ui-loading" tabindex="-1">
<p><span class="spin"><i class="icon-refresh"></i></span> <span class="copy">Loading</span></p>
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p>
</div>

</section>
Expand Down
4 changes: 2 additions & 2 deletions lms/templates/edxnotes/edxnotes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h1 class="page-title">${_('Notes')} <small class="page-subtitle">${_("Highlight
<form role="search" action="${search_endpoint}" method="GET" id="search-notes-form" class="is-hidden">
<label for="search-notes-input" class="sr">${_('Search notes for:')}</label>
<input type="search" class="search-notes-input" id="search-notes-input" name="note" placeholder="${_('Search notes for...')}">
<button type="submit" class="search-notes-submit"><i class="icon-search"></i> ${_('Search')}</button>
<button type="submit" class="search-notes-submit"><i class="icon fa fa-search"></i> ${_('Search')}</button>
</form>
</div>
% endif
Expand All @@ -34,7 +34,7 @@ <h2 id="tab-view" class="tabs-label">${_('View notes by:')}</h2>
<div class="inline-error is-hidden" tabindex="-1"></div>
% if notes:
<div class="ui-loading" tabindex="-1">
<p><span class="spin"><i class="icon-refresh"></i></span> <span class="copy">${_("Loading")}</span></p>
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p>
</div>
% else:
<section class="is-empty">
Expand Down
2 changes: 1 addition & 1 deletion lms/templates/edxnotes/toggle_notes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
%>
<div class="wrapper-utility edx-notes-visibility">
<button class="utility-control utility-control-button action-toggle-notes is-disabled ${"is-active" if edxnotes_visibility else ""}" aria-pressed="">
<i class="icon-pencil"></i>
<i class="icon fa fa-pencil"></i>
% if edxnotes_visibility:
<span class="utility-control-label sr">${_("Hide notes")}</span>
% else:
Expand Down