Commit 29b719f3 by Christine Lytwynec

Merge pull request #10527 from edx/clytwynec/ac-230

Navigation dropdown link should be button 
parents 6a92d4cb c6f4afc9
...@@ -461,7 +461,7 @@ class AccountSettingsA11yTest(AccountSettingsTestMixin, WebAppTest): ...@@ -461,7 +461,7 @@ class AccountSettingsA11yTest(AccountSettingsTestMixin, WebAppTest):
self.visit_account_settings_page() self.visit_account_settings_page()
self.account_settings_page.a11y_audit.config.set_rules({ self.account_settings_page.a11y_audit.config.set_rules({
'ignore': [ 'ignore': [
'link-href', # TODO: AC-233, AC-230 'link-href', # TODO: AC-233, AC-238
'skip-link', # TODO: AC-179 'skip-link', # TODO: AC-179
], ],
}) })
......
...@@ -236,7 +236,7 @@ class LmsDashboardA11yTest(BaseLmsDashboardTest): ...@@ -236,7 +236,7 @@ class LmsDashboardA11yTest(BaseLmsDashboardTest):
self.dashboard_page.a11y_audit.config.set_rules({ self.dashboard_page.a11y_audit.config.set_rules({
"ignore": [ "ignore": [
'skip-link', # TODO: AC-179 'skip-link', # TODO: AC-179
'link-href', # TODO: AC-230 'link-href', # TODO: AC-238, AC-179
], ],
}) })
......
$(document).ready(function () { $(document).ready(function () {
'use strict';
// define variables for code legibility // define variables for code legibility
var dropdownMenuToggle = $('a.dropdown'); var dropdownMenuToggle = $('.dropdown');
var dropdownMenu = $('ul.dropdown-menu'); var dropdownMenu = $('.dropdown-menu');
var menuItems = dropdownMenu.find('a'); var menuItems = dropdownMenu.find('a');
// bind menu toggle click for later use // bind menu toggle click for later use
......
...@@ -191,6 +191,16 @@ header.global { ...@@ -191,6 +191,16 @@ header.global {
} }
} }
.dropdown {
font-size: $body-font-size;
padding: 0 ($baseline/2);
color: $base-font-color;
border: none;
background: $white;
box-shadow: none;
text-shadow: none;
}
.dropdown-menu { .dropdown-menu {
background: $white; background: $white;
border-radius: 4px; border-radius: 4px;
...@@ -534,6 +544,16 @@ header.global-new { ...@@ -534,6 +544,16 @@ header.global-new {
} }
} }
.dropdown {
font-size: $body-font-size;
padding: 0 ($baseline/2);
color: $base-font-color;
border: none;
background: $white;
box-shadow: none;
text-shadow: none;
}
.dropdown-menu { .dropdown-menu {
background: $border-color-4; background: $border-color-4;
border-radius: 4px; border-radius: 4px;
......
...@@ -83,7 +83,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -83,7 +83,7 @@ site_status_msg = get_site_status_msg(course_id)
</a> </a>
</li> </li>
<li class="primary"> <li class="primary">
<a href="#" class="dropdown" aria-haspopup="true" aria-expanded="false"><span class="sr">${_("More options dropdown")}</span> &#9662;</a> <button class="dropdown" aria-haspopup="true" aria-expanded="false"><span class="sr">${_("More options dropdown")}</span> &#9662;</button>
<ul class="dropdown-menu" aria-label="More Options" role="menu"> <ul class="dropdown-menu" aria-label="More Options" role="menu">
<%block name="navigation_dropdown_menu_links" > <%block name="navigation_dropdown_menu_links" >
<li><a href="${reverse('dashboard')}">${_("Dashboard")}</a></li> <li><a href="${reverse('dashboard')}">${_("Dashboard")}</a></li>
......
...@@ -86,7 +86,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -86,7 +86,7 @@ site_status_msg = get_site_status_msg(course_id)
</a> </a>
</li> </li>
<li class="primary"> <li class="primary">
<a href="#" class="dropdown" aria-haspopup="true" aria-expanded="false"><span class="sr">${_("More options dropdown")}</span><i class="fa fa-sort-desc" aria-hidden="true"></i></a> <button class="dropdown" aria-haspopup="true" aria-expanded="false"><span class="sr">${_("More options dropdown")}</span><span class="fa fa-sort-desc" aria-hidden="true"></span></button>
<ul class="dropdown-menu" aria-label="More Options" role="menu"> <ul class="dropdown-menu" aria-label="More Options" role="menu">
<%block name="navigation_dropdown_menu_links" > <%block name="navigation_dropdown_menu_links" >
<li><a href="${reverse('dashboard')}">${_("Dashboard")}</a></li> <li><a href="${reverse('dashboard')}">${_("Dashboard")}</a></li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment