Permalink
Browse files

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

  • Loading branch information...
obenland committed Feb 27, 2013
1 parent 3236571 commit ebe5c56c420fc50a8e9bbcd0846ba65d15df914c
@@ -3,24 +3,19 @@ Theme Name: _s
Layout: Content-Sidebar-Sidebar
*/
-#primary {
+.content-area {
float: left;
width: 100%;
}
-#content {
+.site-content {
margin: 0 40% 0 0;
}
-#main .widget-area {
+.site-main .widget-area {
float: left;
+ margin: 0 0 0 -40%;
overflow: hidden;
width: 20%;
}
-#secondary { /* Sidebar 1 */
- margin: 0 0 0 -40%;
-}
-#tertiary { /* Sidebar 2 */
- margin: 0 0 0 -20%;
-}
.site-footer {
clear: both;
width: 100%;
@@ -3,22 +3,19 @@ Theme Name: _s
Layout: Content-Sidebar
*/
-#primary {
+.content-area {
float: left;
margin: 0 -25% 0 0;
width: 100%;
}
-#content {
+.site-content {
margin: 0 25% 0 0;
}
-#secondary { /* Sidebar 1 */
+.site-main .widget-area {
float: right;
overflow: hidden;
width: 25%;
}
-#tertiary { /* Sidebar 2 */
- clear: right;
-}
.site-footer {
clear: both;
width: 100%;
@@ -3,24 +3,19 @@ Theme Name: _s
Layout: Sidebar-Content-Sidebar
*/
-#primary {
+.content-area {
float: left;
width: 100%;
}
-#content {
+.site-content {
margin: 0 20%;
}
-#main .widget-area {
+.site-main .widget-area {
float: left;
+ margin: 0 0 0 -100%;
overflow: hidden;
width: 20%;
}
-#secondary { /* Sidebar 1 */
- margin: 0 0 0 -100%;
-}
-#tertiary { /* Sidebar 2 */
- margin: 0 0 0 -20%;
-}
.site-footer {
clear: both;
width: 100%;
@@ -3,22 +3,19 @@ Theme Name: _s
Layout: Sidebar-Content
*/
-#primary {
+.content-area {
float: right;
margin: 0 0 0 -25%;
width: 100%;
}
-#content {
+.site-content {
margin: 0 0 0 25%;
}
-#secondary { /* Sidebar 1 */
+.site-main .widget-area {
float: left;
overflow: hidden;
width: 25%;
}
-#tertiary { /* Sidebar 2 */
- clear: left;
-}
.site-footer {
clear: both;
width: 100%;
@@ -3,15 +3,15 @@ Theme Name: _s
Layout: Sidebar-Sidebar-Content
*/
-#primary {
+.content-area {
float: right;
margin: 0 0 0 -40%;
width: 100%;
}
-#content {
+.site-content {
margin: 0 0 0 40%;
}
-#main .widget-area {
+.site-main .widget-area {
float: left;
overflow: hidden;
width: 20%;
View
@@ -554,21 +554,20 @@ object {
}
/* Search widget */
-#searchsubmit {
+.widget_search .submit {
display: none;
}
/* =Infinite Scroll
----------------------------------------------- */
/* Globally hidden elements when Infinite Scroll is supported and in use. */
-.infinite-scroll #nav-above, /* Older / Newer Posts Navigation (always hidden) */
-.infinite-scroll #nav-below,
-.infinite-scroll.neverending #colophon { /* Theme Footer (when set to scrolling) */
+.infinite-scroll .paging-navigation, /* Older / Newer Posts Navigation (always hidden) */
+.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
display: none;
}
/* 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;
}

0 comments on commit ebe5c56

Please sign in to comment.