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

Merge pull request #12611 from edx/ssemenova/icon2

Browse Source 
Changing icon tags from i to span 

TNL-4692
This commit is contained in:
Sofiya Semenova
2016-06-07 13:36:57 -04:00
parent df2f347ac2 c1f793172f
commit 1cda718f8f
109 changed files with 248 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/lib/capa/capa/templates/clarification.html
View File

@@ -1,5 +1,5 @@
<span class="clarification" tabindex="0" role="note" aria-label="Clarification">
<i data-tooltip="${clarification | h}" data-tooltip-show-on-click="true"
class="fa fa-info-circle" aria-hidden="true"></i>
<span data-tooltip="${clarification | h}" data-tooltip-show-on-click="true"
class="fa fa-info-circle" aria-hidden="true"></span>
<span class="sr">(${clarification})</span>
</span>

4
common/static/common/templates/discussion/thread.underscore
View File

@@ -33,7 +33,7 @@
</div>
</div>
<div class="post-tools">
<a href="javascript:void(0)" class="forum-thread-expand"><span class="icon fa fa-plus"/><%- gettext("Expand discussion") %></a>
<a href="javascript:void(0)" class="forum-thread-collapse"><span class="icon fa fa-minus"/><%- gettext("Collapse discussion") %></a>
<a href="javascript:void(0)" class="forum-thread-expand"><span class="icon fa fa-plus" aria-hidden="true"/><%- gettext("Expand discussion") %></a>
<a href="javascript:void(0)" class="forum-thread-collapse"><span class="icon fa fa-minus" aria-hidden="true"/><%- gettext("Collapse discussion") %></a>
</div>
</article>

4
common/templates/license.html
View File

@@ -48,9 +48,9 @@ def parse_license(lic):
</a>
% else:
## <span> must come before <i> icon or else spacing gets messed up
<span class="sr">${_("Creative Commons licensed content, with terms as follow:")}&nbsp;</span><i aria-hidden="true" class="icon-cc"></i>
<span class="sr">${_("Creative Commons licensed content, with terms as follow:")}&nbsp;</span><span aria-hidden="true" class="icon-cc"></span>
% for option in enabled:
<span class="sr">${names[option]}&nbsp;</span><i aria-hidden="true" class="icon-cc-${option}"></i>
<span class="sr">${names[option]}&nbsp;</span><span aria-hidden="true" class="icon-cc-${option}"></span>
% endfor
<span class="license-text">${_("Some Rights Reserved")}</span>
% endif

2
common/test/acceptance/pages/lms/problem.py
View File

@@ -190,7 +190,7 @@ class ProblemPage(PageObject):
Problem <clarification>clarification text hidden by an icon in rendering</clarification> Text
"""
self.q(css='div.problem .clarification:nth-child({index}) i[data-tooltip]'.format(index=index + 1)).click()
self.q(css='div.problem .clarification:nth-child({index}) span[data-tooltip]'.format(index=index + 1)).click()
@property
def visible_tooltip_text(self):

2
common/test/acceptance/pages/studio/container.py
View File

@@ -179,7 +179,7 @@ class ContainerPage(PageObject):
@property
def is_staff_locked(self):
""" Returns True if staff lock is currently enabled, False otherwise """
for attr in self.q(css='a.action-staff-lock>i').attrs('class'):
for attr in self.q(css='a.action-staff-lock>.fa').attrs('class'):
if 'fa-check-square-o' in attr:
return True
return False

2
common/test/acceptance/pages/studio/overview.py
View File

@@ -264,7 +264,7 @@ class CourseOutlineContainer(CourseOutlineItem):
currently_expanded = subsection_expanded()
# Need to click slightly off-center in order for the click to be recognized.
ele = self.browser.find_element_by_css_selector(self._bounded_selector('.ui-toggle-expansion i'))
ele = self.browser.find_element_by_css_selector(self._bounded_selector('.ui-toggle-expansion .fa'))
ActionChains(self.browser).move_to_element_with_offset(ele, 4, 4).click().perform()
self.wait_for_element_presence(self._bounded_selector(self.ADD_BUTTON_SELECTOR), 'Subsection is expanded')