Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix #1863 -- add aria tags to BS3 navbars
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Jul 5, 2015
1 parent f23353b commit f1f9d0a
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 10 deletions.
6 changes: 0 additions & 6 deletions nikola/data/themes/bootstrap3-jinja/assets/css/theme.css
Expand Up @@ -51,12 +51,6 @@ div.figure > a > img {
margin-right: auto;
}

div.sidebar, div.admonition, div.attention, div.caution, div.danger, div.error, div.hint, div.important, div.note, div.tip, div.warning {
/* Issue 277 */
border: 1px solid #aaa;
border-radius: 5px;
}

blockquote p, blockquote {
font-size: 17.5px;
font-weight: 300;
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
Expand Up @@ -16,7 +16,7 @@
<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
<div class="container"><!-- This keeps the margins nice -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
Expand Down
Expand Up @@ -129,7 +129,7 @@ lang="{{ lang }}">
{% macro html_navigation_links() %}
{% for url, text in navigation_links[lang] %}
{% if isinstance(url, tuple) %}
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ text }} <b class="caret"></b></a>
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ text }} <b class="caret"></b></a>
<ul class="dropdown-menu">
{% for suburl, text in url %}
{% if rel_link(permalink, suburl) == "#" %}
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3/templates/base.tmpl
Expand Up @@ -16,7 +16,7 @@ ${template_hooks['extra_head']()}
<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
<div class="container"><!-- This keeps the margins nice -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3/templates/base_helper.tmpl
Expand Up @@ -129,7 +129,7 @@ lang="${lang}">
<%def name="html_navigation_links()">
%for url, text in navigation_links[lang]:
% if isinstance(url, tuple):
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">${text} <b class="caret"></b></a>
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">${text} <b class="caret"></b></a>
<ul class="dropdown-menu">
%for suburl, text in url:
% if rel_link(permalink, suburl) == "#":
Expand Down

0 comments on commit f1f9d0a

Please sign in to comment.