diff --git a/404.php b/404.php index 3d46156083..33ac3e8179 100644 --- a/404.php +++ b/404.php @@ -1,24 +1,15 @@ - - -
- -
-
-

-
-
- × -

-
-

- - -
- -
- - \ No newline at end of file + + +
+ × +

+
+ +

+ + + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ec8b604250..1004ddbb90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +### HEAD +* Implement scribu's [Theme Wrapper](http://scribu.net/wordpress/theme-wrappers.html) (see `base.php`) +* Move templates, `comments.php`, and `searchform.php` to `templates/` folder +* Rename `loop-` files to `content-` +* Remove all hooks except `roots_head` and `roots_footer` +* Use `templates/page-header.php` for page titles +* Use `head.php` for everything in `` + ### 5.2.0: August 18th, 2012 * Update to jQuery 1.8.0 and Modernizr 2.6.1 * Fix duplicate active class in `wp_nav_menu` items diff --git a/archive.php b/archive.php deleted file mode 100644 index ff21e72531..0000000000 --- a/archive.php +++ /dev/null @@ -1,44 +0,0 @@ - - -
- -
-
-

- name; - } elseif (is_post_type_archive()) { - echo get_queried_object()->labels->name; - } elseif (is_day()) { - printf(__('Daily Archives: %s', 'roots'), get_the_date()); - } elseif (is_month()) { - printf(__('Monthly Archives: %s', 'roots'), get_the_date('F Y')); - } elseif (is_year()) { - printf(__('Yearly Archives: %s', 'roots'), get_the_date('Y')); - } elseif (is_author()) { - global $post; - $author_id = $post->post_author; - printf(__('Author Archives: %s', 'roots'), get_the_author_meta('display_name', $author_id)); - } else { - single_cat_title(); - } - ?> -

-
- - - -
- - - - -
- - \ No newline at end of file diff --git a/base.php b/base.php new file mode 100644 index 0000000000..b7b4b9e1ea --- /dev/null +++ b/base.php @@ -0,0 +1,31 @@ + +> + + + + + +
+
+
+ +
+ + + +
+
+ + + + + \ No newline at end of file diff --git a/css/app.css b/css/app.css index 8581d535eb..e0759054bc 100644 --- a/css/app.css +++ b/css/app.css @@ -1,4 +1,4 @@ -/* ============================================================================= +/* ========================================================================== Base ========================================================================== */ @@ -18,7 +18,7 @@ body.admin-bar .navbar-fixed-top { top: 28px; } -/* ============================================================================= +/* ========================================================================== Content ========================================================================== */ @@ -26,7 +26,7 @@ body.admin-bar .navbar-fixed-top { top: 28px; } -/* ============================================================================= +/* ========================================================================== Primary Content ========================================================================== */ @@ -34,7 +34,7 @@ body.admin-bar .navbar-fixed-top { top: 28px; } -/* ============================================================================= +/* ========================================================================== Sidebar ========================================================================== */ @@ -42,7 +42,7 @@ body.admin-bar .navbar-fixed-top { top: 28px; } -/* ============================================================================= +/* ========================================================================== Posts ========================================================================== */ @@ -54,7 +54,7 @@ body.admin-bar .navbar-fixed-top { top: 28px; } -/* ============================================================================= +/* ========================================================================== Footer ========================================================================== */ @@ -62,7 +62,7 @@ body.admin-bar .navbar-fixed-top { top: 28px; } -/* ============================================================================= +/* ========================================================================== WordPress Generated Classes See: http://codex.wordpress.org/CSS#WordPress_Generated_Classes ========================================================================== */ @@ -74,7 +74,7 @@ figure.alignnone { margin-left: 0; margin-right: 0; } -/* ============================================================================= +/* ========================================================================== Media Queries ========================================================================== */ diff --git a/css/main.css b/css/main.css deleted file mode 100644 index 5ad9a63091..0000000000 --- a/css/main.css +++ /dev/null @@ -1,134 +0,0 @@ -/* - * HTML5 Boilerplate - * - * What follows is the result of much research on cross-browser styling. - * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, - * Kroc Camen, and the H5BP dev community and team. - * - * Detailed information about this CSS: h5bp.com/css - * - * ==|== normalize ========================================================== - */ - -article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; } -audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; } -audio:not([controls]) { display: none; } -[hidden] { display: none; } - -html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } -html, button, input, select, textarea { font-family: sans-serif; color: #222; } -body { margin: 0; font-size: 1em; line-height: 1.4; } - -::-moz-selection { background: #b3d4fc; text-shadow: none; } -::selection { background: #b3d4fc; text-shadow: none; } - -a { color: #00e; } -a:visited { color: #551a8b; } -a:hover { color: #06e; } -a:focus { outline: thin dotted; } -a:hover, a:active { outline: 0; } - -abbr[title] { border-bottom: 1px dotted; } -b, strong { font-weight: bold; } -blockquote { margin: 1em 40px; } -dfn { font-style: italic; } -hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; } -ins { background: #ff9; color: #000; text-decoration: none; } -mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; } -pre, code, kbd, samp { font-family: monospace, serif; _font-family: 'courier new', monospace; font-size: 1em; } -pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; } -q { quotes: none; } -q:before, q:after { content: ""; content: none; } -small { font-size: 85%; } -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } -sup { top: -0.5em; } -sub { bottom: -0.25em; } -ul, ol { margin: 1em 0; padding: 0 0 0 40px; } -dd { margin: 0 0 0 40px; } -nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0; } -img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; } -svg:not(:root) { overflow: hidden; } -figure { margin: 0; } - -form { margin: 0; } -fieldset { border: 0; margin: 0; padding: 0; } -label { cursor: pointer; } -legend { border: 0; *margin-left: -7px; padding: 0; white-space: normal; } -button, input, select, textarea { font-size: 100%; margin: 0; vertical-align: baseline; *vertical-align: middle; } -button, input { line-height: normal; } -button, input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; *overflow: visible; } -button[disabled], input[disabled] { cursor: default; } -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; *width: 13px; *height: 13px; } -input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; } -input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; } -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } -textarea { overflow: auto; vertical-align: top; resize: vertical; } -input:valid, textarea:valid { } -input:invalid, textarea:invalid { background-color: #f0dddd; } - -table { border-collapse: collapse; border-spacing: 0; } -td { vertical-align: top; } - -.chromeframe { margin: 0.2em 0; background: #ccc; color: black; padding: 0.2em 0; } - - -/* ==|== primary styles ===================================================== - Author: - ========================================================================== */ - - - - - - - - - - - - - - - - -/* ==|== media queries ====================================================== - EXAMPLE Media Query for Responsive Design. - This example overrides the primary ('mobile first') styles - Modify as content requires. - ========================================================================== */ - -@media only screen and (min-width: 35em) { - /* Style adjustments for viewports that meet the condition */ -} - - - -/* ==|== non-semantic helper classes ======================================== */ - -.ir { border: 0; font: 0/0 a; text-shadow: none; color: transparent; background-color: transparent; } -.hidden { display: none !important; visibility: hidden; } -.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; } -.visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; } -.invisible { visibility: hidden; } -.clearfix:before, .clearfix:after { content: ""; display: table; } -.clearfix:after { clear: both; } -.clearfix { *zoom: 1; } - - - -/* ==|== print styles ======================================================= */ - -@media print { - * { background: transparent !important; color: black !important; box-shadow:none !important; text-shadow: none !important; } - a, a:visited { text-decoration: underline; } - a[href]:after { content: " (" attr(href) ")"; } - abbr[title]:after { content: " (" attr(title) ")"; } - .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } - pre, blockquote { border: 1px solid #999; page-break-inside: avoid; } - thead { display: table-header-group; } - tr, img { page-break-inside: avoid; } - img { max-width: 100% !important; } - @page { margin: 0.5cm; } - p, h2, h3 { orphans: 3; widows: 3; } - h2, h3 { page-break-after: avoid; } -} \ No newline at end of file diff --git a/footer.php b/footer.php deleted file mode 100644 index b1f7dc03d3..0000000000 --- a/footer.php +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/front-page.php b/front-page.php deleted file mode 100644 index fdb9d80395..0000000000 --- a/front-page.php +++ /dev/null @@ -1,20 +0,0 @@ - - -
- -
- - - -
- - - - -
- - \ No newline at end of file diff --git a/header.php b/header.php deleted file mode 100644 index b340bfc914..0000000000 --- a/header.php +++ /dev/null @@ -1,38 +0,0 @@ - - - - - > - - - - <?php wp_title('|', true, 'right'); bloginfo('name'); ?> - - - - - - - - - - - - - -> - - - - - - - - -
\ No newline at end of file diff --git a/inc/cleanup.php b/inc/cleanup.php index db10623948..05f9ccd8cf 100644 --- a/inc/cleanup.php +++ b/inc/cleanup.php @@ -435,11 +435,7 @@ function check_current($classes) { } function start_lvl(&$output, $depth) { - if (current_theme_supports('bootstrap-top-navbar')) { - $output .= "\n