From a15d89c8bfdff198db1f54bc2a42edc67c3e50b2 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Tue, 7 Feb 2017 15:41:30 -0500
Subject: [PATCH] Fix a11y issues.

TNL-6440, TNL-6439
---
 common/test/acceptance/tests/lms/test_lms.py | 21 ++++----------------
 lms/static/sass/course/base/_base.scss       |  1 -
 lms/static/sass/course/wiki/_wiki.scss       | 21 +++++++++++---------
 requirements/edx/github.txt                  |  2 +-
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/common/test/acceptance/tests/lms/test_lms.py b/common/test/acceptance/tests/lms/test_lms.py
index e545a7b52f..259d068973 100644
--- a/common/test/acceptance/tests/lms/test_lms.py
+++ b/common/test/acceptance/tests/lms/test_lms.py
@@ -581,13 +581,6 @@ class CourseWikiTest(UniqueCourseTest):
         self.course_wiki_page.open_editor()
         self.course_wiki_edit_page.wait_for_page()
 
-    def _check_for_accessibility_errors(self, page, custom_rules=None):
-        """ Run accessibility check with custom rules, if provided """
-        if custom_rules is not None:
-            page.a11y_audit.config.set_rules(custom_rules)
-
-        page.a11y_audit.check_for_accessibility_errors()
-
     @attr(shard=1)
     def test_edit_course_wiki(self):
         """
@@ -610,7 +603,7 @@ class CourseWikiTest(UniqueCourseTest):
         """
         Verify the basic accessibility of the wiki page as initially displayed.
         """
-        self._check_for_accessibility_errors(self.course_wiki_page)
+        self.course_wiki_page.a11y_audit.check_for_accessibility_errors()
 
     @attr('a11y')
     def test_edit_a11y(self):
@@ -618,7 +611,7 @@ class CourseWikiTest(UniqueCourseTest):
         Verify the basic accessibility of edit wiki page.
         """
         self._open_editor()
-        self._check_for_accessibility_errors(self.course_wiki_edit_page)
+        self.course_wiki_edit_page.a11y_audit.check_for_accessibility_errors()
 
     @attr('a11y')
     def test_changes_a11y(self):
@@ -628,7 +621,7 @@ class CourseWikiTest(UniqueCourseTest):
         self.course_wiki_page.show_history()
         history_page = CourseWikiHistoryPage(self.browser, self.course_id, self.course_info)
         history_page.wait_for_page()
-        self._check_for_accessibility_errors(history_page)
+        history_page.a11y_audit.check_for_accessibility_errors()
 
     @attr('a11y')
     def test_children_a11y(self):
@@ -638,13 +631,7 @@ class CourseWikiTest(UniqueCourseTest):
         self.course_wiki_page.show_children()
         children_page = CourseWikiChildrenPage(self.browser, self.course_id, self.course_info)
         children_page.wait_for_page()
-        custom_rules = {
-            'ignore': [
-                'label',  # TNL-6440
-                'data-table'  # TNL-6439
-            ]
-        }
-        self._check_for_accessibility_errors(children_page, custom_rules)
+        children_page.a11y_audit.check_for_accessibility_errors()
 
 
 @attr(shard=1)
diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss
index f85b6a5555..2f52924487 100644
--- a/lms/static/sass/course/base/_base.scss
+++ b/lms/static/sass/course/base/_base.scss
@@ -59,7 +59,6 @@ table {
 
 a {
   &:hover, &:focus {
-    color: $pink;
     text-decoration: none !important;
   }
 }
diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss
index 42ecf64c69..72b7ca2add 100644
--- a/lms/static/sass/course/wiki/_wiki.scss
+++ b/lms/static/sass/course/wiki/_wiki.scss
@@ -8,6 +8,11 @@
     float: right;
   }
 
+  .form-search .input-prepend>label {
+    display: inline-block;
+    vertical-align: bottom;
+  }
+
   @include clearfix();
 
   .breadcrumbs-header {
@@ -746,17 +751,9 @@
   }
 
   .filter-clear {
-    margin-right: ($baseline/2);
+    margin-left: ($baseline/2);
     margin-top: ($baseline/2);
     font-size: .9em;
-
-    a {
-      color: $uxpl-gray-base;
-
-      &:hover, &:focus {
-        color: #777;
-      }
-    }
   }
 
   .table.table-striped {
@@ -773,6 +770,12 @@
       margin-left: 3px;
     }
 
+    a {
+      &:hover, &:focus {
+        font-weight: bold;
+      }
+    }
+
     tr:nth-child(even) {
       background: $gray-l6;
     }
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index a1bb0712a1..2d8dc42131 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -47,7 +47,7 @@
 
 # Third-party:
 git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline==1.5.3
-git+https://github.com/edx/django-wiki.git@v0.0.9#egg=django-wiki==0.0.9
+git+https://github.com/edx/django-wiki.git@v0.0.10#egg=django-wiki==0.0.10
 git+https://github.com/edx/django-openid-auth.git@0.8#egg=django-openid-auth==0.8
 git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
 git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6