rayelliott
/
_s
Archived
forked from mirror/_s
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

_s: Update layouts to use classes when appropriate. Fixes #55.

This commit is contained in:
obenland 2013-02-27 13:35:28 -08:00
parent 3236571996
commit ebe5c56c42
6 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layouts/content-sidebar-sidebar.css
View File

@ -3,24 +3,19 @@ Theme Name: _s
Layout: Content-Sidebar-Sidebar Layout: Content-Sidebar-Sidebar
*/ */
#primary { .content-area {
float: left; float: left;
width: 100%; width: 100%;
} }
#content { .site-content {
margin: 0 40% 0 0; margin: 0 40% 0 0;
} }
#main .widget-area { .site-main .widget-area {
float: left; float: left;
margin: 0 0 0 -40%;
overflow: hidden; overflow: hidden;
width: 20%; width: 20%;
} }
#secondary { /* Sidebar 1 */
margin: 0 0 0 -40%;
}
#tertiary { /* Sidebar 2 */
margin: 0 0 0 -20%;
}
.site-footer { .site-footer {
clear: both; clear: both;
width: 100%; width: 100%;

9
layouts/content-sidebar.css
View File

@ -3,22 +3,19 @@ Theme Name: _s
Layout: Content-Sidebar Layout: Content-Sidebar
*/ */
#primary { .content-area {
float: left; float: left;
margin: 0 -25% 0 0; margin: 0 -25% 0 0;
width: 100%; width: 100%;
} }
#content { .site-content {
margin: 0 25% 0 0; margin: 0 25% 0 0;
} }
#secondary { /* Sidebar 1 */ .site-main .widget-area {
float: right; float: right;
overflow: hidden; overflow: hidden;
width: 25%; width: 25%;
} }
#tertiary { /* Sidebar 2 */
clear: right;
}
.site-footer { .site-footer {
clear: both; clear: both;
width: 100%; width: 100%;

13
layouts/sidebar-content-sidebar.css
View File

@ -3,24 +3,19 @@ Theme Name: _s
Layout: Sidebar-Content-Sidebar Layout: Sidebar-Content-Sidebar
*/ */
#primary { .content-area {
float: left; float: left;
width: 100%; width: 100%;
} }
#content { .site-content {
margin: 0 20%; margin: 0 20%;
} }
#main .widget-area { .site-main .widget-area {
float: left; float: left;
margin: 0 0 0 -100%;
overflow: hidden; overflow: hidden;
width: 20%; width: 20%;
} }
#secondary { /* Sidebar 1 */
margin: 0 0 0 -100%;
}
#tertiary { /* Sidebar 2 */
margin: 0 0 0 -20%;
}
.site-footer { .site-footer {
clear: both; clear: both;
width: 100%; width: 100%;

9
layouts/sidebar-content.css
View File

@ -3,22 +3,19 @@ Theme Name: _s
Layout: Sidebar-Content Layout: Sidebar-Content
*/ */
#primary { .content-area {
float: right; float: right;
margin: 0 0 0 -25%; margin: 0 0 0 -25%;
width: 100%; width: 100%;
} }
#content { .site-content {
margin: 0 0 0 25%; margin: 0 0 0 25%;
} }
#secondary { /* Sidebar 1 */ .site-main .widget-area {
float: left; float: left;
overflow: hidden; overflow: hidden;
width: 25%; width: 25%;
} }
#tertiary { /* Sidebar 2 */
clear: left;
}
.site-footer { .site-footer {
clear: both; clear: both;
width: 100%; width: 100%;

6
layouts/sidebar-sidebar-content.css
View File

@ -3,15 +3,15 @@ Theme Name: _s
Layout: Sidebar-Sidebar-Content Layout: Sidebar-Sidebar-Content
*/ */
#primary { .content-area {
float: right; float: right;
margin: 0 0 0 -40%; margin: 0 0 0 -40%;
width: 100%; width: 100%;
} }
#content { .site-content {
margin: 0 0 0 40%; margin: 0 0 0 40%;
} }
#main .widget-area { .site-main .widget-area {
float: left; float: left;
overflow: hidden; overflow: hidden;
width: 20%; width: 20%;

9
style.css
View File

@ -554,7 +554,7 @@ object {
} }
/* Search widget */ /* Search widget */
#searchsubmit { .widget_search .submit {
display: none; display: none;
} }
@ -562,13 +562,12 @@ object {
----------------------------------------------- */ ----------------------------------------------- */
/* Globally hidden elements when Infinite Scroll is supported and in use. */ /* Globally hidden elements when Infinite Scroll is supported and in use. */
.infinite-scroll #nav-above, /* Older / Newer Posts Navigation (always hidden) */ .infinite-scroll .paging-navigation, /* Older / Newer Posts Navigation (always hidden) */
.infinite-scroll #nav-below, .infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
.infinite-scroll.neverending #colophon { /* Theme Footer (when set to scrolling) */
display: none; display: none;
} }
/* When Infinite Scroll has reached its end we need to re-display elements that were hidden (via .neverending) before */ /* When Infinite Scroll has reached its end we need to re-display elements that were hidden (via .neverending) before */
.infinity-end.neverending #colophon { .infinity-end.neverending .site-footer {
display: block; display: block;
} }