This commit is contained in:
Frederic Hemberger 2011-09-21 14:48:38 +02:00
parent 2a30d9a1eb
commit a9a901c136
12 changed files with 29 additions and 29 deletions

View File

@ -41,7 +41,7 @@ body {
max-width: $max-width; max-width: $max-width;
position: relative; position: relative;
margin: 0 auto; margin: 0 auto;
> header, > nav, > footer, #content > article, #content > div > article, #content > div > section, nav[role=pagination] { > header, > nav, > footer, #content > article, #content > div > article, #content > div > section, nav.pagination {
@extend .group; @extend .group;
padding-left: $pad-min; padding-left: $pad-min;
padding-right: $pad-min; padding-right: $pad-min;
@ -67,7 +67,7 @@ body {
#content { > div, > article { width: 100%; }} #content { > div, > article { width: 100%; }}
aside[role=sidebar] { aside.sidebar {
float: none; float: none;
padding: 0 $pad-min 1px; padding: 0 $pad-min 1px;
background-color: lighten($sidebar-bg, 2); background-color: lighten($sidebar-bg, 2);
@ -88,7 +88,7 @@ aside[role=sidebar] {
body.sidebar-footer { body.sidebar-footer {
@media only screen and (min-width: 750px) { @media only screen and (min-width: 750px) {
aside[role=sidebar]{ @include collapse-sidebar; } aside.sidebar{ @include collapse-sidebar; }
} }
#content { margin-right: 0px; } #content { margin-right: 0px; }
.toggle-sidebar { display: none; } .toggle-sidebar { display: none; }
@ -98,7 +98,7 @@ body.sidebar-footer {
body > header { font-size: 1em; } body > header { font-size: 1em; }
} }
@media only screen and (min-width: 750px) { @media only screen and (min-width: 750px) {
aside[role=sidebar] { @include collapse-sidebar; } aside.sidebar { @include collapse-sidebar; }
} }
@media only screen and (min-width: 768px) { @media only screen and (min-width: 768px) {
body { -webkit-text-size-adjust: auto; } body { -webkit-text-size-adjust: auto; }
@ -120,7 +120,7 @@ body.sidebar-footer {
float: left; float: left;
} }
} }
aside[role=sidebar] { aside.sidebar {
@extend .group; @extend .group;
width: $sidebar-width-medium - $sidebar-pad-medium*2; width: $sidebar-width-medium - $sidebar-pad-medium*2;
padding: 0 $sidebar-pad-medium $sidebar-pad-medium; padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
@ -147,7 +147,7 @@ body.sidebar-footer {
padding-bottom: $pad-wide/2; padding-bottom: $pad-wide/2;
} }
} }
aside[role=sidebar] { aside.sidebar {
width: $sidebar-width-wide - $sidebar-pad-wide*2; width: $sidebar-width-wide - $sidebar-pad-wide*2;
padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide; padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
.collapse-sidebar & { .collapse-sidebar & {

View File

@ -60,7 +60,7 @@ $page-border-bottom: darken($footer-bg, 5) !default;
a { a {
@include link-colors($link-color, $hover: $link-color-hover, $focus: $link-color-hover, $visited: $link-color-visited, $active: $link-color-active); @include link-colors($link-color, $hover: $link-color-hover, $focus: $link-color-hover, $visited: $link-color-visited, $active: $link-color-active);
} }
aside[role=sidebar] a { aside.sidebar a {
@include link-colors($sidebar-link-color, $hover: $sidebar-link-color-hover, $focus: $sidebar-link-color-hover, $active: $sidebar-link-color-active); @include link-colors($sidebar-link-color, $hover: $sidebar-link-color-hover, $focus: $sidebar-link-color-hover, $active: $sidebar-link-color-active);
} }
a { a {

View File

@ -121,7 +121,7 @@ article + article {
display: inline-block; display: inline-block;
} }
#content nav[role=pagination] { #content nav.pagination {
text-align: center; text-align: center;
font-size: .95em; font-size: .95em;
div { div {

View File

@ -31,8 +31,8 @@ body > nav {
} }
} }
} }
fieldset[role=site-search]{ float: right; width: 48%; } fieldset[role=search]{ float: right; width: 48%; }
fieldset[role=mobile-nav]{ float: left; width: 48%; fieldset.mobile-nav{ float: left; width: 48%;
select{ width: 100%; font-size: .8em; border: 1px solid #888;} select{ width: 100%; font-size: .8em; border: 1px solid #888;}
} }
ul { display: none; } ul { display: none; }
@ -85,8 +85,8 @@ body > nav {
width: $sidebar-width-medium - $pad-medium*2 - $sidebar-pad-medium - 58px; width: $sidebar-width-medium - $pad-medium*2 - $sidebar-pad-medium - 58px;
.search { width: 91%; } .search { width: 91%; }
} }
fieldset[role=mobile-nav] { display: none; } fieldset.mobile-nav { display: none; }
fieldset[role=site-search]{ width: 99%; } fieldset[role=search]{ width: 99%; }
} }
@media only screen and (min-width: 992px) { @media only screen and (min-width: 992px) {
form { form {

View File

@ -1,7 +1,7 @@
.side-shadow-border { .side-shadow-border {
@include box-shadow(lighten($sidebar-bg, 5) 0 1px); @include box-shadow(lighten($sidebar-bg, 5) 0 1px);
} }
aside[role=sidebar] { aside.sidebar {
color: $sidebar-color; color: $sidebar-color;
text-shadow: lighten($sidebar-bg, 8) 0 1px; text-shadow: lighten($sidebar-bg, 8) 0 1px;
a { @extend .force-wrap; } a { @extend .force-wrap; }

View File

@ -1,4 +1,4 @@
<ul role=main-navigation> <ul class="main-navigation">
<li><a href="{{ root_url }}/">Blog</a></li> <li><a href="{{ root_url }}/">Blog</a></li>
<li><a href="{{ root_url }}/blog/archives">Archives</a></li> <li><a href="{{ root_url }}/blog/archives">Archives</a></li>
</ul> </ul>

View File

@ -1,11 +1,11 @@
<ul role=subscription data-subscription="rss{% if site.subscribe_email %} email{% endif %}"> <ul class="subscription" data-subscription="rss{% if site.subscribe_email %} email{% endif %}">
<li><a href="{{ site.subscribe_rss }}" rel="subscribe-rss" title="subscribe via RSS">RSS</a></li> <li><a href="{{ site.subscribe_rss }}" rel="subscribe-rss" title="subscribe via RSS">RSS</a></li>
{% if site.subscribe_email %} {% if site.subscribe_email %}
<li><a href="{{ site.subscribe_email }}" rel="subscribe-email" title="subscribe via email">Email</a></li> <li><a href="{{ site.subscribe_email }}" rel="subscribe-email" title="subscribe via email">Email</a></li>
{% endif %} {% endif %}
</ul> </ul>
<form action="{{ site.simple_search }}" method="get"> <form action="{{ site.simple_search }}" method="get">
<fieldset role="site-search"> <fieldset role="search">
<input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}" /> <input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}" />
<input class="search" type="text" name="q" results="0" placeholder="Search"/> <input class="search" type="text" name="q" results="0" placeholder="Search"/>
</fieldset> </fieldset>

View File

@ -1,14 +1,14 @@
{% capture root_url %}{{ site.root | strip_slash }}{% endcapture %} {% capture root_url %}{{ site.root | strip_slash }}{% endcapture %}
{% include head.html %} {% include head.html %}
<body {% if page.body_id %} id="{{ page.body_id }}" {% endif %} {% if page.sidebar == false %} class="no-sidebar" {% endif %}> <body {% if page.body_id %} id="{{ page.body_id }}" {% endif %} {% if page.sidebar == false %} class="no-sidebar" {% endif %}>
<header>{% include header.html %}</header> <header role="banner">{% include header.html %}</header>
<nav role=navigation>{% include navigation.html %}</nav> <nav role="navigation">{% include navigation.html %}</nav>
<div id="main"> <div id="main">
<div id="content"> <div id="content">
{{ content | expand_urls: root_url }} {{ content | expand_urls: root_url }}
</div> </div>
</div> </div>
<footer>{% include footer.html %}</footer> <footer role="contentinfo">{% include footer.html %}</footer>
{% include disqus.html %} {% include disqus.html %}
{% include google_analytics.html %} {% include google_analytics.html %}
{% include google_plus_one.html %} {% include google_plus_one.html %}

View File

@ -3,7 +3,7 @@ layout: default
--- ---
<div> <div>
<article> <article role="article">
{% if page.title %} {% if page.title %}
<header> <header>
<h1 class="entry-title">{{ page.title | titlecase }}</h1> <h1 class="entry-title">{{ page.title | titlecase }}</h1>
@ -32,7 +32,7 @@ layout: default
{% endif %} {% endif %}
</div> </div>
{% unless page.sidebar == false %} {% unless page.sidebar == false %}
<aside role=sidebar> <aside class="sidebar">
{% if site.page_asides.size %} {% if site.page_asides.size %}
{% include_array page_asides %} {% include_array page_asides %}
{% else %} {% else %}

View File

@ -4,7 +4,7 @@ single: true
--- ---
<div> <div>
<article class="hentry"> <article class="hentry" role="article">
{% include article.html %} {% include article.html %}
<footer> <footer>
<p class="meta"> <p class="meta">
@ -25,7 +25,7 @@ single: true
{% endif %} {% endif %}
</div> </div>
{% unless page.sidebar == false %} {% unless page.sidebar == false %}
<aside role=sidebar> <aside class="sidebar">
{% if site.post_asides.size %} {% if site.post_asides.size %}
{% include_array post_asides %} {% include_array post_asides %}
{% else %} {% else %}

View File

@ -10,7 +10,7 @@ layout: default
{% include article.html %} {% include article.html %}
</article> </article>
{% endfor %} {% endfor %}
<nav role="pagination"> <nav class="pagination">
<div> <div>
{% if paginator.next_page %} {% if paginator.next_page %}
<a class="prev" href="{{paginator.next_page}}">&larr; Older</a> <a class="prev" href="{{paginator.next_page}}">&larr; Older</a>
@ -22,7 +22,7 @@ layout: default
</div> </div>
</nav> </nav>
</div> </div>
<aside role=sidebar> <aside class="sidebar">
{% if site.blog_index_asides.size %} {% if site.blog_index_asides.size %}
{% include_array blog_index_asides %} {% include_array blog_index_asides %}
{% else %} {% else %}

View File

@ -1,7 +1,7 @@
function getNav() { function getNav() {
var mobileNav = $('nav[role=navigation] fieldset[role=site-search]').after('<fieldset role="mobile-nav"></fieldset>').next().append('<select></select>'); var mobileNav = $('nav[role=navigation] fieldset[role=search]').after('<fieldset class="mobile-nav"></fieldset>').next().append('<select></select>');
mobileNav.children('select').append('<option value="">Navigate&hellip;</option>'); mobileNav.children('select').append('<option value="">Navigate&hellip;</option>');
$('ul[role=main-navigation] a').each(function(link) { $('ul.main-navigation a').each(function(link) {
mobileNav.children('select').append('<option value="'+link.href+'">&bull; '+link.text+'</option>'); mobileNav.children('select').append('<option value="'+link.href+'">&bull; '+link.text+'</option>');
}); });
mobileNav.children('select').bind('change', function(event) { mobileNav.children('select').bind('change', function(event) {
@ -19,7 +19,7 @@ function addSidebarToggler() {
$('body').addClass('collapse-sidebar'); $('body').addClass('collapse-sidebar');
} }
}); });
var sections = $('aside[role=sidebar] > section'); var sections = $('aside.sidebar > section');
if (sections.length > 1) { if (sections.length > 1) {
sections.each(function(section, index){ sections.each(function(section, index){
if ((sections.length >= 3) && index % 3 === 0) { if ((sections.length >= 3) && index % 3 === 0) {
@ -29,7 +29,7 @@ function addSidebarToggler() {
$(section).addClass(count); $(section).addClass(count);
}); });
} }
if (sections.length >= 3){ $('aside[role=sidebar]').addClass('thirds'); } if (sections.length >= 3){ $('aside.sidebar').addClass('thirds'); }
} }
function testFeatures() { function testFeatures() {