From d9b6688819a57e799bd5dfb465aa16a2511a9adf Mon Sep 17 00:00:00 2001 From: greenshady Date: Tue, 28 Dec 2010 05:21:40 +0000 Subject: [PATCH] Updates galore. Still bringing this thing up to Hybrid Core standards. git-svn-id: http://svn.locallylost.com/themes/hybrid/trunk@546 dba0f204-706d-4bc1-bc29-8b92e0485636 --- 404.php | 4 +- archive.php | 6 +- attachment-application.php | 8 +- attachment-audio.php | 8 +- attachment-image.php | 6 +- attachment-text.php | 8 +- attachment-video.php | 8 +- attachment.php | 8 +- comment.php | 2 +- comments.php | 12 +- css/2c-l-fixed.css | 65 ++++ css/2c-r-fixed.css | 63 ++++ css/3c-c-fixed.css | 87 ++++++ css/3c-l-fixed.css | 64 ++++ css/holy-grail-fluid.css | 5 + css/plugins.css | 5 + css/print.css | 1 + css/screen.css | 611 +++++++++++++++++++++++++++++++++++++ date.php | 6 +- day.php | 6 +- functions.php | 466 ++++++++-------------------- header.php | 13 +- home.php | 6 +- hour.php | 6 +- minute.php | 8 +- month.php | 4 +- navigation-links.php | 8 +- page-archives.php | 10 +- page-authors.php | 4 +- page-biography.php | 14 +- page-blog.php | 7 +- page-bookmarks.php | 4 +- page-categories.php | 6 +- page-daily.php | 4 +- page-logged-in.php | 8 +- page-monthly.php | 4 +- page-no-widgets.php | 4 +- page-post_tag-cloud.php | 4 +- page-sitemap.php | 38 +-- page-weekly.php | 4 +- page-widgets.php | 4 +- page-yearly.php | 4 +- page.php | 4 +- post-no-widgets.php | 4 +- post.php | 4 +- search.php | 4 +- searchform.php | 4 +- singular.php | 4 +- style.css | 574 ++++++++++++++++++++++++++++++++-- taxonomy-category.php | 2 +- taxonomy-post_tag.php | 2 +- taxonomy.php | 2 +- time.php | 4 +- week.php | 6 +- year.php | 6 +- 55 files changed, 1725 insertions(+), 508 deletions(-) create mode 100644 css/2c-l-fixed.css create mode 100644 css/2c-r-fixed.css create mode 100644 css/3c-c-fixed.css create mode 100644 css/3c-l-fixed.css create mode 100644 css/holy-grail-fluid.css create mode 100644 css/plugins.css create mode 100644 css/print.css create mode 100644 css/screen.css diff --git a/404.php b/404.php index 0d1ef5a..7ecba75 100644 --- a/404.php +++ b/404.php @@ -32,12 +32,12 @@
-

+

- ' . site_url( esc_url( $_SERVER['REQUEST_URI'] ) ) . '' ); ?> + ' . site_url( esc_url( $_SERVER['REQUEST_URI'] ) ) . '' ); ?>

diff --git a/archive.php b/archive.php index 33734de..65bb7fd 100644 --- a/archive.php +++ b/archive.php @@ -18,11 +18,11 @@
-

+

- +

@@ -49,7 +49,7 @@

- +

diff --git a/attachment-application.php b/attachment-application.php index 898bde7..3199ac5 100644 --- a/attachment-application.php +++ b/attachment-application.php @@ -26,13 +26,13 @@ - +

- ', '', false) ); ?> + ', '', false) ); ?>

- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -49,7 +49,7 @@

- +

diff --git a/attachment-audio.php b/attachment-audio.php index 7cb0579..610f3ac 100644 --- a/attachment-audio.php +++ b/attachment-audio.php @@ -27,14 +27,14 @@
- +

- ', '', false) ); ?> + ', '', false) ); ?>

- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -51,7 +51,7 @@

- +

diff --git a/attachment-image.php b/attachment-image.php index 9dd96c0..d6ccf70 100644 --- a/attachment-image.php +++ b/attachment-image.php @@ -30,9 +30,9 @@ <?php the_title_attribute(); ?>

- + - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -54,7 +54,7 @@

- +

diff --git a/attachment-text.php b/attachment-text.php index c677d21..953a5fa 100644 --- a/attachment-text.php +++ b/attachment-text.php @@ -26,13 +26,13 @@ - +

- ', '', false) ); ?> + ', '', false) ); ?>

- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?> @@ -49,7 +49,7 @@

- +

diff --git a/attachment-video.php b/attachment-video.php index 2466a90..34c3961 100644 --- a/attachment-video.php +++ b/attachment-video.php @@ -26,13 +26,13 @@ - +

- ', '', false) ); ?> + ', '', false) ); ?>

- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?> @@ -49,7 +49,7 @@

- +

diff --git a/attachment.php b/attachment.php index 82f2b26..49939b8 100644 --- a/attachment.php +++ b/attachment.php @@ -28,13 +28,13 @@ - +

- ', '', false) ); ?> + ', '', false) ); ?>

- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?> @@ -51,7 +51,7 @@

- +

diff --git a/comment.php b/comment.php index ffa6378..ffa100b 100644 --- a/comment.php +++ b/comment.php @@ -19,7 +19,7 @@
comment_approved ) : ?> -

+

comment_ID ); ?> diff --git a/comments.php b/comments.php index 903459f..ac55532 100644 --- a/comments.php +++ b/comments.php @@ -9,17 +9,17 @@ * @subpackage Template */ if ( 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) ) - die( __( 'Please do not load this page directly. Thanks!', 'hybrid' ) ); + die( __( 'Please do not load this page directly. Thanks!', hybrid_get_textdomain() ) ); if ( !post_type_supports( get_post_type(), 'comments' ) || ( !have_comments() && !comments_open() && !pings_open() ) ) return; if ( post_password_required() ) : ?> -

+

- +

@@ -30,7 +30,7 @@
-

+

@@ -53,13 +53,13 @@

- trackbacks and pingbacks are open.', 'hybrid' ), trackback_url( '0' ) ); ?> + trackbacks and pingbacks are open.', hybrid_get_textdomain() ), trackback_url( '0' ) ); ?>

- +

diff --git a/css/2c-l-fixed.css b/css/2c-l-fixed.css new file mode 100644 index 0000000..d44fed6 --- /dev/null +++ b/css/2c-l-fixed.css @@ -0,0 +1,65 @@ +/** + * Two columns with content floated left. + * + * @deprecated 0.9.1 - This file is for backwards compatibility with the Hybrid parent theme. It will + * be removed in a future version. + * + * @since 0.6 + * @package Hybrid + * @subpackage CSS + */ + +#body-container { + overflow: hidden; + width: 960px; + margin: 0 auto; + } + +#container { + overflow: hidden; + float: left; + width: 960px; + } + +.content { + overflow: hidden; + float: left; + width: 620px; + } +.no-widgets .content, .no-default-widgets .content { + width: 960px; + } + +#primary { + position: relative; + float: right; + width: 300px; + } + +#secondary { + position: relative; + clear: right; + float: right; + width: 300px; + } + +#subsidiary { + overflow: hidden; + } + +#subsidiary .widget { + overflow: hidden; + float: left; + width: 300px; + margin: 0 20px 0 0; + } + +#footer-container { + clear: both; + overflow: hidden; + } + +#footer { + clear: both; + overflow: hidden; + } \ No newline at end of file diff --git a/css/2c-r-fixed.css b/css/2c-r-fixed.css new file mode 100644 index 0000000..583aa03 --- /dev/null +++ b/css/2c-r-fixed.css @@ -0,0 +1,63 @@ +/** + * Two columns with content floated right. + * + * @deprecated 0.9.1 - This file is for backwards compatibility with the Hybrid parent theme. It will + * be removed in a future version. + * + * @since 0.6 + * @package Hybrid + * @subpackage CSS + */ + +#body-container { + overflow: hidden; + width: 960px; + margin: 0 auto; + } + +#container { + overflow: hidden; + float: left; + width: 960px; + } + +.content { + overflow: hidden; + float: right; + width: 620px; + } +.no-widgets .content, .no-default-widgets .content { + width: 960px; + } + +#primary { + float: left; + width: 300px; + } + +#secondary { + clear: left; + float: left; + width: 300px; + } + +#subsidiary { + overflow: hidden; + } + +#subsidiary .widget { + overflow: hidden; + float: left; + width: 300px; + margin: 0 20px 0 0; + } + +#footer-container { + clear: both; + overflow: hidden; + } + +#footer { + clear: both; + overflow: hidden; + } \ No newline at end of file diff --git a/css/3c-c-fixed.css b/css/3c-c-fixed.css new file mode 100644 index 0000000..dba50a0 --- /dev/null +++ b/css/3c-c-fixed.css @@ -0,0 +1,87 @@ +/** + * Holy Grail Stylesheet. + * Creates the Holy Grail (fixed width) of three-column layouts. + * Primary / Content / Secondary + * + * @deprecated 0.9.1 - This file is for backwards compatibility with the Hybrid parent theme. It will + * be removed in a future version. + * + * @link http://www.alistapart.com/articles/holygrail + * @author Matthew Levine + * + * @since 0.6 + * @package Hybrid + * @subpackage CSS + */ + +body { + min-width: 600px; /* 2x LC width + RC width */ + } +#body-container { + overflow: hidden; + width: 960px; + margin: 0 auto; + } +#primary-menu { + position: relative; + z-index: 100; + } +#container { + position: relative; + clear: both; + overflow: hidden; + padding-left: 240px; /* LC width */ + padding-right: 240px; /* RC width */ + z-index: 1; + } +.no-widgets #container, .no-default-widgets #container { + width: 960px; + padding-left: 0; + padding-right: 0; + } +.content, #primary, #secondary { + position: relative; + float: left; + z-index: 1; + } +.content { + width: 100%; + } +.no-widgets .content, .no-default-widgets .content { + width: 960px; + } +#primary { + width: 220px; /* LC width */ + right: 240px; /* LC width */ + margin-left: -100%; + } +#secondary { + width: 220px; /* RC width */ + margin-right: -240px; /* RC width */ + margin-left: 20px; + } + +/*** IE6 Fix ***/ +* html #secondary { + left: 240px; /* RC width */ + } + +#subsidiary { + overflow: hidden; + } + +#subsidiary .widget { + overflow: hidden; + float: left; + width: 300px; + margin: 0 20px 0 0; + } + +#footer-container { + clear: both; + overflow: hidden; + } + +#footer { + clear: both; + } \ No newline at end of file diff --git a/css/3c-l-fixed.css b/css/3c-l-fixed.css new file mode 100644 index 0000000..fbf7583 --- /dev/null +++ b/css/3c-l-fixed.css @@ -0,0 +1,64 @@ +/** + * Three columns with content floated left. + * + * @deprecated 0.9.1 - This file is for backwards compatibility with the Hybrid parent theme. It will + * be removed in a future version. + * + * @since 0.6 + * @package Hybrid + * @subpackage CSS + */ + +#body-container { + overflow: hidden; + width: 960px; + margin: 0 auto; + } + +#container { + overflow: hidden; + float: left; + width: 960px; + } + +.content { + overflow: hidden; + float: left; + width: 520px; + } +.no-widgets .content, .no-default-widgets .content { + width: 960px; + } + +#primary { + overflow: hidden; + float: right; + width: 190px; + } + +#secondary { + overflow: hidden; + float: right; + width: 190px; + margin-right: 20px; + } + +#subsidiary { + overflow: hidden; + } + +#subsidiary .widget { + overflow: hidden; + float: left; + width: 300px; + margin: 0 20px 0 0; + } + +#footer-container { + clear: both; + overflow: hidden; + } + +#footer { + clear: both; + } \ No newline at end of file diff --git a/css/holy-grail-fluid.css b/css/holy-grail-fluid.css new file mode 100644 index 0000000..96df011 --- /dev/null +++ b/css/holy-grail-fluid.css @@ -0,0 +1,5 @@ +/** + * @deprecated 0.9.1 - This file is for backwards compatibility with the Hybrid parent theme. It will + * be removed in a future version. +*/ +body{min-width:600px}#container{overflow:hidden;padding-left:200px; padding-right:200px}.content,#primary,#secondary{position:relative;float:left;padding-bottom:20010px; margin-bottom:-20000px}.content{width:100%}#primary{width:200px; right:200px; margin-left:-100%}#secondary{width:200px; margin-right:-200px}#footer{clear:both}* html #secondary{left:200px} \ No newline at end of file diff --git a/css/plugins.css b/css/plugins.css new file mode 100644 index 0000000..e96f5e4 --- /dev/null +++ b/css/plugins.css @@ -0,0 +1,5 @@ +/** + * @deprecated 0.9.1 - This file is for backwards compatibility with the Hybrid parent theme. It will + * be removed in a future version. +*/ +.wp-pagenavi .pages{margin:2px 3px 2px 0;font-style:italic}.wp-pagenavi .current{margin:2px;padding:1px 6px;font-weight:bold}.wp-pagenavi .extend{margin:2px}.wp-pagenavi a{margin:0 2px;padding:1px 6px;font-style:italic;border:1px solid #ccc}.WP-EmailIcon{padding:0;margin:0;border:none}.comment_license{font-style:italic}img#wpstats{overflow:hidden !important;width:0 !important;height:0 !important;padding:0 !important;margin:0 !important}.contact-form{margin-bottom:21px}.contact-form legend{display:none}.contact-form .form-input input{display:block;margin-bottom:6px;padding:3px 6px;width:300px}.contact-form label{font-size:.9em}.contact-form textarea{width:97%;margin-bottom:6px;padding:6px}.contact-form .form-option{margin-bottom:6px}.contact-form .button{width:100px;margin-right:9px;padding:6px 9px}.contact-form .button:hover{cursor:pointer} \ No newline at end of file diff --git a/css/print.css b/css/print.css new file mode 100644 index 0000000..9cf8c7f --- /dev/null +++ b/css/print.css @@ -0,0 +1 @@ +@import url('18px.css');body{font:11pt Cambria,Georgia,Times,'Times New Roman',serif}#body-container{margin:0 auto;padding:0}a,a:visited {color:#3C738C;text-decoration:none}h1,h2,h3,h4,h5,h6{font-family:Georgia,Times,"Times New Roman",serif;color:#444}.post ul{margin-left:27px}blockquote{overflow:hidden;font-style:italic;color:#444;margin:0 0 18px 0;padding:18px 18px 0 18px;border:1px solid #999;background:#ddd}blockquote em{font-style:normal}blockquote.pullquote{width:210px;margin-top:6px;margin-bottom:3px;padding:6px 9px;font-size:18px;text-align:center;color:#333;background:transparent;border-top:3px double #ccc;border-bottom:3px double #ccc}.pullquote p{margin:0}code{padding:0 3px;background:#eee}pre{overflow:auto;padding:9px;background:#eee;border:1px solid #ddd}pre code{padding:0;background:transparent}table{width:100%;background:#5F97B1;border:1px solid #eee}caption{font-size:.8em;font-style:italic;text-align:right;color:#666}td{padding:.3em;border:1px solid #35667c}tr{color:#fff;background:#3e7690}tr.alt,tr.even{background:#437f9b}th{padding:.3em;color:#fff;background:#274958;border:1px solid #35667c}td a,th a{font-weight:bold;color:#eee}.drop-cap{float:left;line-height:33px;margin-right:3px;font-size:42px;font-family:"Warnock Pro","Goudy Old Style",Palatino,"Book Antiqua",Cambria,Georgia,serif;color:#666}.note{padding:6px 9px;background:#eee;border:1px solid #ccc}.warning,.alert{padding:6px 9px;background:#fffbbc;border:1px solid #E6DB55}.error{padding:6px 9px;background:#ffebe8;border:1px solid #C00}.download{padding:6px 9px;background:#EDF2F4;border:1px solid #adbabf}.left,.alignleft{float:left;margin:0 18px 0 0}.right,.alignright{float:right;margin:0 0 0 18px}.center,.aligncenter{display:block;margin:0 auto 18px auto}.block,.alignnone{display:block;margin:0 0 18px 0}.clear{clear:both}span.pullquote{float:none;margin:0}img,a img{padding:5px}.post img{max-width:99%}img.wp-smiley{max-height:12px;margin:0;padding:0;border:none}.wp-caption{padding:6px 1px 0 1px;background:#eee;border:1px solid #ddd;text-align:center}.wp-caption .wp-caption-text{margin:0;padding:0 5px;text-align:right;font-size:.8em;color:#666}.wp-caption img{margin:0 auto;padding:0;border:1px solid #666}.gallery{display:block;text-align:center;margin-bottom:18px !important}.gallery img{border:1px solid #3c738c}.avatar{float:left;width:100px;height:100px;margin-right:18px;background:#3c738c;border:1px solid #999}.thumbnail{float:left;width:100px;height:100px;margin-right:18px;background:#3c738c}#container{margin:0;padding:0}#content{margin:0 auto;padding:0}a:link,a:visited{border-bottom:#999}.entry-title{margin:0 0 5px 0;padding:0}.byline{font-size:10pt;font-style:italic;padding-bottom:10px}.byline .separator{display:none}.entry-meta{font-size:10pt;font-style:italic;color:#333}#footer{padding-top:9px;font-size:9pt;color:#666;border-top:1px solid #eee}.edit{display:none}#footer .credit{display:none}.wp-pagenavi,.navigation-links{display:none}.breadcrumb{display:none}#header{display:none}#navigation{display:none}#primary{display:none}#secondary{display:none}#tertiary{display:none}#subsidiary{display:none}.utility{display:none}.widget{display:none}#comments-template{display:none}.query-count{display:none} \ No newline at end of file diff --git a/css/screen.css b/css/screen.css new file mode 100644 index 0000000..cf1465d --- /dev/null +++ b/css/screen.css @@ -0,0 +1,611 @@ +/** + * Screen Stylesheet + * + * @deprecated 0.9.1 - This file is for backwards compatibility with the Hybrid parent theme. It will + * be removed in a future version. + * + * @since 0.3 + * @package Hybrid + * @subpackage CSS + */ + +/* Body */ +body { + font: normal normal normal 15px/21px Georgia, Times, "Times New Roman", serif; + color: #000; + } + +/* Body container */ +#body-container { + margin: 90px auto 21px auto; + } + +/* Links */ +a { + color: #21759b; + text-decoration: none; + } +a:visited { + color: #551a8b; + } +a:hover, a:active { + color: #d54e21; + text-decoration: underline; + } + +/* Headers */ +h2, h3, h4, h5, h6 { + font-family: Georgia, Times, "Times New Roman", serif; + color: #000; + font-weight: bold; + } +h2 { + font-size: 21px; + } +h3 { + font-size: 19px; + } +h4 { + font-size: 17px; + } +h5 { + font-size: 15px; + } +h6 { + font-size: 13px; + } + +/* Lists */ +ul { + list-style: square; + } + +/* Blockquotes */ +blockquote { + font-style: italic; + color: #555; + } +blockquote blockquote { + color: #777; + } +blockquote em { + font-style: normal; + } + +/* Code */ +pre { + padding: 9px; + background: #f9f9f9; + border: 1px solid #ccc; + } +code { + padding: 0 3px; + background: #eee; + } +pre code { + background: transparent; + } + +/* Tables */ +table { + width: 100%; + border-collapse: separate; + border-top: 1px solid #ccc; + border-left: 1px solid #ccc; + } +caption { + font-size: .9em; + font-style: italic; + text-align: right; + } +td, th { + padding: 3px 6px; + border-bottom: 1px solid #ccc; + border-right: 1px solid #ccc; + } +th { + background: #eee; + } + +/* Drop caps */ +.drop-cap { + float: left; + margin: 3px 3px 0 0; + font: normal normal normal 47px/35px "Warnock Pro", "Goudy Old Style", Palatino,"Book Antiqua", Georgia, serif; + color: #333; + } + +/* Notes */ +.note { + padding: 6px 9px; + background: #eee; + border: 1px solid #ccc; + } + +/* Warnings/Alerts */ +.warning, .alert { + padding: 6px 9px; + background: #fffbbc; + border: 1px solid #E6DB55; + } + +/* Errors */ +.error { + padding: 6px 9px; + background: #ffebe8; + border: 1px solid #C00; + } + +/* Downloads */ +.download { + padding: 6px 9px; + background: #e7f7d3; + border: 1px solid #6c3; + } + +/* Breadcrumb */ +.breadcrumb { + margin: 0 0 30px 0; + font-size: .9em; + font-style: italic; + color: #666; + } +.breadcrumb a { + color: #111; + text-decoration: none; + } +.breadcrumb a:hover { + color: #d54e21; + text-decoration: underline; + } + +/* Images */ +.post img { + max-width: 568px; + padding: 5px; + border: 1px solid #ccc; + } + +.thumbnail { + float: left; + width: 100px; + height: 100px; + margin: 5px 15px 0 0; + } + +/* Captions [caption] */ +.wp-caption { + max-width: 576px; + margin-top: 6px; + padding: 6px 1px 0 1px; + border: 1px solid #ccc; + text-align: center; + } +.wp-caption .wp-caption-text { + margin: 0; + padding: 0 5px; + text-align: right; + font-size: .9em; + font-style: italic; + color: #666; + } +.wp-caption img { + max-width: 564px; + margin: 0 auto; + padding: 0; + border: 1px solid #666; + } + +/* Gallery [gallery] */ +.gallery img { + border: 1px solid #ccc; + } + +/* Avatars */ +.avatar { + float: left; + width: 100px; + height: 100px; + margin: 5px 15px 0 0; + padding: 5px; + border: 1px solid #ccc; + } + +/* Header */ +#header { + margin: 0 0 40px 0; + } + +/* Blog title */ +#site-title { + font: italic normal normal 35px/35px Georgia, Times, "Times New Roman", serif; + margin: 0 0 10px 0; + } +#site-title a { + color: #000; + } + +/* Blog description */ +#site-description { + font: normal normal normal 16px/20px Georgia, Times, "Times New Roman", serif; + margin: 0; + color: #666; + } + +/* Navigation */ +#primary-menu, #navigation { + overflow: visible; + height: 34px; + margin: 0 0 60px 0; + z-index: 100; + } +#primary-menu li, #page-nav li { + margin-right: 15px; + } +#primary-menu li li, #page-nav li li { + margin-right: 0; + } +#primary-menu li a, #page-nav li a { + padding: 8px 15px 8px 15px; + color: #111; + background: #fff; + border: 1px solid #ccc; + } + +/* Drop-downs style */ +#primary-menu li:hover ul, #primary-menu li.sfHover ul, #page-nav li:hover ul, #page-nav li.sfHover ul { + top: 32px; + } +#primary-menu li li a, #page-nav li li a { + border-top: none; + margin-right: 0; + } +#primary-menu li ul, #page-nav li ul { + background: #fff; + border-top: 1px solid #ccc; + } +#primary-menu li li:hover ul, #primary-menu li li.sfHover ul, #primary-menu li li li:hover ul, #primary-menu li li li.sfHover ul, +#page-nav li li:hover ul, #page-nav li li.sfHover ul , #page-nav li li li:hover ul, #page-nav li li li.sfHover ul { + top: -1px; + } +#primary-menu li li li, #page-nav li li li { + margin-left: -1px; + } + +/* Container (wraps content, primary, and secondary) */ +#container { + margin-bottom: 21px; + } + +/* Main content */ +.content { + margin: 0 0 21px 0; + } +.no-widgets .content, .page-template-no-widgets .content { + width: 960px; + } + +/* Posts */ +.post { + overflow: hidden; + margin: 0 0 40px 0; + } +.single .post, .attachment .post, .page .post { + margin: 0; + } + +/* Archive information */ +.author-info, .search-info { + overflow: hidden; + margin: 0 0 40px 0; + } + +/* Entry title */ +.entry-title { + font-size: 24px; + margin: 0 0 12px 0; + font-weight: normal; + font-style: italic; + } +.archive .entry-title, .search .entry-title { + font-size: 21px; + margin: 0; + } +.page-title, .attachment-title { + margin: 0 0 21px 0; + } +.entry-title a { + color: #000; + } + +/* Byline */ +.byline { + margin: 0 0 30px 0; + font-style: italic; + color: #666; + } +.archive .byline, .search .byline { + margin: 0; + } +.byline .byline-prep { + text-transform: lowercase; + } + +/* Entry content */ +.entry-content { + overflow: hidden; + margin: 0 0 10px 0; + } + +/* Entry metadata */ +.entry-meta { + clear: both; + font-style: italic; + color: #666; + } + +/* Page links (multiple-paged posts) */ +p.page-links a { + margin: 0 3px; + padding: 3px 9px 3px 9px; + border: 1px solid #ccc; + } + +/* Navigation links */ +.navigation-links { + margin-bottom: 21px; + font-style: italic; + } +.navigation-links .previous { + float: left; + max-width: 50%; + } +.navigation-links .next { + float: right; + max-width: 50%; + text-align: right; + } +.navigation-attachment { + overflow: hidden; + } + +/* WP Pagenavi plugin */ +.wp-pagenavi { + margin-bottom: 21px; + } +.wp-pagenavi .pages, .wp-pagenavi .current, .wp-pagenavi .extend, .wp-pagenavi a { + margin-right: 6px; + padding: 3px 9px 3px 9px; + border: 1px solid #ccc; + } + +/* Widgets */ +.widget { + overflow: hidden; + margin: 0 0 15px 0; + color: #464646; + } +.widget a { + color: #464646; + text-decoration: underline; + } +.widget a:hover { + color: #d54e21; + text-decoration: none; + } + +/* Widget titles */ +.widget-title { + font-size: 18px; + font-weight: normal; + font-style: italic; + color: #111; + } + +/* Utility widget areas */ +#utility-before-content, #utility-after-content, #utility-after-page, #utility-after-single { + margin: 0 0 21px 0; + padding: 20px 20px 0 20px; + border: 1px solid #ccc; + } + +/* Comments template */ +#comments-template { + clear: both; + } + +/* Comment headers */ +.comments-header { + font-size: 1.2em; + } + +/* Comments are closed */ +.comments-closed { + font-style: italic; + } + +/* Comment list */ +#comments-template ol { + list-style: none; + margin: 0 0 21px 0; + } +#comments li, #comments li li li, #comments li li li li li { + overflow: hidden; + margin: 0 0 15px 0; + padding: 15px 15px 0 15px; + background: #fff; + border: 1px solid #ccc; + } +#comments li li, #comments li li li li { + background: #f9f9f9; + } + +/* Avatar */ +#comments-template .avatar { + width: 40px; + height: 40px; + float: left; + margin-right: 15px; + padding: 0; + border: 1px solid #666; + } + +/* Comment metadata */ +.comment-meta { + margin: 10px 0 21px 0; + font-size: 13px; + color: #666; + } +.comment-author { + font-size: 15px; + color: #000; + } +.comment-reply-link, .permalink, .comment-edit-link { + font-style: italic; + color: #666; + } + +/* Comment text */ +.comment-text { + clear: left; + margin: 0 15px; + } + +/* Form */ +.text-input { + display: block; + padding: 3px 6px; + width: 97%; + } +#comments-template label { + font-size: .9em; + } + +/* Respond textarea */ +textarea { + width: 98%; + } + +/* Submit and rest buttons */ +.button, .submit, .reset { + width: 100px; + margin-right: 15px; + padding: 7px 15px 8px 15px; + background: #fff; + border: 1px solid #ccc; + } +.button:hover, .submit:hover, .reset:hover { + cursor: pointer; + background: #f9f9f9; + } + +/* Footer container */ +#footer-container { + clear: both; + margin: 0 0 21px 0; + } + +/* Subsidiary */ +#subsidiary { + margin: 0 0 21px 0; + } + +/* Footer */ +#footer { + font-style: italic; + color: #444; + } +#footer .copyright { + display: inline; + float: left; + margin-right: 9px; + } + +/* Post Layouts */ +.layout-1c .content { + width: 960px; + } +.layout-1c #primary { + clear: left; + float: left; + width: 470px; + } +.layout-1c #secondary { + clear: none; + float: right; + width: 470px; + } +.layout-2c-r .content { + float: right; + width: 620px; + } +.layout-2c-r #primary { + float: left; + width: 300px; + } +.layout-2c-r #secondary { + clear: left; + float: left; + width: 300px; + } +.layout-2c-l .content { + float: left; + width: 620px; + } +.layout-2c-l #primary { + float: right; + width: 300px; + } +.layout-2c-l #secondary { + clear: right; + float: right; + width: 300px; + } +.layout-3c-r .content { + float: right !important; + width: 520px !important; + } +.layout-3c-r #primary { + float: left !important; + width: 190px !important; + } +.layout-3c-r #secondary { + clear: none; + float: left !important; + width: 190px !important; + margin-left: 20px; + } +.layout-3c-l .content { + float: left; + width: 520px; + } +.layout-3c-l #primary { + float: right; + width: 190px; + } +.layout-3c-l #secondary { + clear: none; + float: right; + width: 190px; + margin-right: 20px; + } +.layout-3c-c #container { + padding-left: 240px; + padding-right: 240px; + } +.layout-3c-c .content { + width: 480px; + float: left; + } +.layout-3c-c #primary { + float: left; + width: 220px; + position: relative; + right: 720px; + } +.layout-3c-c #secondary { + float: left; + width: 220px; + position: relative; + margin-left: -220px; + } \ No newline at end of file diff --git a/date.php b/date.php index bb5debf..722d558 100644 --- a/date.php +++ b/date.php @@ -17,11 +17,11 @@
-

+

- +

@@ -48,7 +48,7 @@

- +

diff --git a/day.php b/day.php index c8c322c..6a28435 100644 --- a/day.php +++ b/day.php @@ -16,11 +16,11 @@
-

+

- +

@@ -47,7 +47,7 @@

- +

diff --git a/functions.php b/functions.php index 43bdc34..15c7d41 100644 --- a/functions.php +++ b/functions.php @@ -1,105 +1,86 @@ + * @copyright Copyright (c) 2008 - 2011, Justin Tadlock + * @link http://themehybrid.com/themes/retro_fitted + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ -/* Load the Hybrid class. */ -require_once( TEMPLATEPATH . '/library/hybrid.php' ); - -/* Initialize the Hybrid framework. */ -$hybrid = new Hybrid(); +/* Load the core theme framework. */ +require_once( trailingslashit( TEMPLATEPATH ) . 'library/hybrid.php' ); +$theme = new Hybrid(); /* Do theme setup on the 'after_setup_theme' hook. */ -add_action( 'after_setup_theme', 'hybrid_setup_theme' ); +add_action( 'after_setup_theme', 'hybrid_theme_setup_theme' ); /** - * Function for setting up all the Hybrid parent theme default actions and supported features. This structure - * should be followed when creating custom parent themes with the Hybrid Core framework. + * Theme setup function. This function adds support for theme features and defines the default theme + * actions and filters. * * @since 0.9 */ -function hybrid_setup_theme() { +function hybrid_theme_setup_theme() { + global $content_width; /* Get the theme prefix. */ $prefix = hybrid_get_prefix(); - /* Add support for automatic feed links. */ - add_theme_support( 'automatic-feed-links' ); - - /* Add support for the core template hierarchy. */ - add_theme_support( 'hybrid-core-template-hierarchy' ); - - /* Add support for deprecated functions. */ - add_theme_support( 'hybrid-core-deprecated' ); - - /* Add support for the core sidebars. */ - add_theme_support( 'hybrid-core-sidebars' ); - - /* Add support for the core widgets. */ + /* Add support for framework features. */ + add_theme_support( 'hybrid-core-menus', array( 'primary' ) ); + add_theme_support( 'hybrid-core-sidebars', array( 'primary', 'secondary', 'subsidiary', 'before-content', 'after-content', 'after-singular' ) ); add_theme_support( 'hybrid-core-widgets' ); - - /* Add support for the core shortcodes. */ add_theme_support( 'hybrid-core-shortcodes' ); - - /* Add support for the core menus. */ - if ( hybrid_get_setting( 'use_menus' ) ) - add_theme_support( 'hybrid-core-menus' ); - - /* Add support for the core post meta box. */ add_theme_support( 'hybrid-core-post-meta-box' ); - - /* Add support for the core SEO feature. */ - if ( !hybrid_get_setting( 'seo_plugin' ) ) - add_theme_support( 'hybrid-core-seo' ); - - /* Add support for the core drop-downs script. */ - if ( hybrid_get_setting( 'superfish_js' ) ) - add_theme_support( 'hybrid-core-drop-downs' ); - - /* Add support for the core print stylesheet. */ - if ( hybrid_get_setting( 'print_style' ) ) - add_action( 'template_redirect', 'hybrid_theme_enqueue_style' ); - - /* Add support for core theme settings meta boxes. */ add_theme_support( 'hybrid-core-theme-settings' ); - add_theme_support( 'hybrid-core-meta-box-general' ); add_theme_support( 'hybrid-core-meta-box-footer' ); + add_theme_support( 'hybrid-core-drop-downs' ); + add_theme_support( 'hybrid-core-seo' ); + add_theme_support( 'hybrid-core-template-hierarchy' ); + add_theme_support( 'hybrid-core-deprecated' ); - /* Add support for the breadcrumb trail extension. */ + /* Add support for framework extensions. */ add_theme_support( 'breadcrumb-trail' ); - - /* Add support for the custom field series extension. */ add_theme_support( 'custom-field-series' ); - - /* Add support for the Get the Image extension. */ add_theme_support( 'get-the-image' ); - - /* Add support for the Post Stylesheets extension. */ add_theme_support( 'post-stylesheets' ); + add_theme_support( 'cleaner-gallery' ); - /* If no child theme is active, add support for the Post Layouts and Pagination extensions. */ - if ( 'hybrid' == get_stylesheet() ) { - add_theme_support( 'post-layouts' ); - add_theme_support( 'loop-pagination' ); - } + /* Add support for WordPress features. */ + add_theme_support( 'automatic-feed-links' ); /* Register sidebars. */ - add_action( 'init', 'hybrid_theme_register_sidebars' ); + add_action( 'init', 'hybrid_theme_register_sidebars', 11 ); + + /* Disables widget areas. */ + add_filter( 'sidebars_widgets', 'hybrid_theme_remove_sidebars' ); /* Header actions. */ add_action( "{$prefix}_header", 'hybrid_site_title' ); add_action( "{$prefix}_header", 'hybrid_site_description' ); - /* Load the correct menu. */ - if ( hybrid_get_setting( 'use_menus' ) ) - add_action( "{$prefix}_after_header", 'hybrid_get_primary_menu' ); - else - add_action( "{$prefix}_after_header", 'hybrid_page_nav' ); + /* Load the primary menu. */ + add_action( "{$prefix}_after_header", 'hybrid_get_primary_menu' ); /* Add the primary and secondary sidebars after the container. */ add_action( "{$prefix}_after_container", 'hybrid_get_primary' ); @@ -133,130 +114,27 @@ function hybrid_setup_theme() { /* Add Hybrid theme-specific body classes. */ add_filter( 'body_class', 'hybrid_theme_body_class' ); - /* Add elements to the area. */ - //add_action( "{$prefix}_head", 'hybrid_meta_content_type' ); - //add_action( 'wp_head', 'hybrid_favicon' ); - - /* Feed links. */ - add_filter( 'feed_link', 'hybrid_feed_link', 1, 2 ); - add_filter( 'category_feed_link', 'hybrid_other_feed_link' ); - add_filter( 'author_feed_link', 'hybrid_other_feed_link' ); - add_filter( 'tag_feed_link', 'hybrid_other_feed_link' ); - add_filter( 'search_feed_link', 'hybrid_other_feed_link' ); - - /* Remove WP and plugin functions. */ - add_action( 'wp_print_styles', 'hybrid_disable_styles' ); - - add_action( "load-appearance_page_theme-settings", 'hybrid_theme_create_settings_meta_boxes', 11 ); - - /* Add same filters to user description as term descriptions. */ - add_filter( 'get_the_author_description', 'wptexturize' ); - add_filter( 'get_the_author_description', 'convert_chars' ); - add_filter( 'get_the_author_description', 'wpautop' ); - - //add_action( 'wp_head', 'hybrid_head_pingback' ); -} - -/** - * Function to load CSS at an appropriate time. Adds print.css if user chooses to use it. - * Users should load their own CSS using wp_enqueue_style() in their child theme's - * functions.php file. - * - * @since 0.9 - * @link http://codex.wordpress.org/Function_Reference/wp_enqueue_style - */ -function hybrid_theme_enqueue_style() { - global $wp_query; - - /* If is admin, don't load styles. */ - if ( is_admin() ) - return; - - /* Get the theme prefix. */ - $prefix = hybrid_get_prefix(); - - /* Load the print stylesheet. */ - wp_enqueue_style( "{$prefix}-print", esc_url( apply_atomic( 'print_style', THEME_URI . '/css/print.css' ) ), false, 0.7, 'print' ); -} - -function hybrid_theme_create_settings_meta_boxes() { - $domain = hybrid_get_textdomain(); - $prefix = hybrid_get_prefix(); - /* Creates a meta box for the general theme settings. */ - add_meta_box( "{$prefix}-general-settings-meta-box", __( 'General settings', $domain ), 'hybrid_general_settings_meta_box', 'appearance_page_theme-settings', 'normal', 'high' ); -} - -/** - * Adds a general settings suite suitable for the average theme, which includes a print stylesheet, - * drop-downs JavaScript option, and the ability to change the feed URL. - * - * @since 0.7 - */ -function hybrid_general_settings_meta_box() { - $domain = hybrid_get_textdomain(); ?> - - - - - - - - - - - - - - - - - - - - - - - - - - -
- value="true" /> - -
- value="true" /> - -
- value="true" /> - -
-
- Feedburner, you can enter it here to have the theme redirect your feed links.', $domain ); ?>

- value="true" /> - -
- value="true" /> - -
__( 'Widgets Template', $domain ), 'id' => 'widgets-template', 'description' => __( 'Used as the content of the Widgets page template.', $domain ), 'before_widget' => '
', 'after_widget' => '
', 'before_title' => '

', 'after_title' => '

' ) ); - register_sidebar( array( 'name' => __( '404 Template', $domain ), 'id' => 'error-404-template', 'description' => __( 'Replaces the default 404 error page content.', $domain ), 'before_widget' => '
', 'after_widget' => '
', 'before_title' => '

', 'after_title' => '

' ) ); + register_sidebar( array( 'id' => 'widgets-template', 'name' => __( 'Widgets Template', hybrid_get_textdomain() ), 'description' => __( 'Used as the content of the Widgets page template.', hybrid_get_textdomain() ), 'before_widget' => '
', 'after_widget' => '
', 'before_title' => '

', 'after_title' => '

' ) ); + register_sidebar( array( 'id' => 'error-404-template', 'name' => __( '404 Template', hybrid_get_textdomain() ), 'description' => __( 'Replaces the default 404 error page content.', hybrid_get_textdomain() ), 'before_widget' => '
', 'after_widget' => '
', 'before_title' => '

', 'after_title' => '

' ) ); } /** * Function for adding Hybrid theme classes. * - * @since 0.9 + * @since 0.9.0 */ function hybrid_theme_body_class( $classes ) { global $wp_query, $is_lynx, $is_gecko, $is_IE, $is_opera, $is_NS4, $is_safari, $is_chrome; @@ -270,11 +148,6 @@ function hybrid_theme_body_class( $classes ) { elseif ( is_singular( 'post' ) ) $classes[] = "single-{$wp_query->post->ID}"; // Use singular-post-ID } - elseif ( is_tax() || is_category() || is_tag() ) { - $term = $wp_query->get_queried_object(); - $classes[] = "taxonomy-{$term->taxonomy}"; - $classes[] = "taxonomy-{$term->taxonomy}-" . sanitize_html_class( $term->slug, $term->term_id ); - } /* Browser detection. */ $browsers = array( 'gecko' => $is_gecko, 'opera' => $is_opera, 'lynx' => $is_lynx, 'ns4' => $is_NS4, 'safari' => $is_safari, 'chrome' => $is_chrome, 'msie' => $is_IE ); @@ -296,15 +169,11 @@ function hybrid_theme_body_class( $classes ) { } /** - * Displays the breadcrumb trail. Calls the get_the_breadcrumb() function. - * Use the get_the_breadcrumb_args filter hook. The hybrid_breadcrumb_args - * filter is deprecated. - * - * @deprecated 0.5 Theme still needs this function. - * @todo Find an elegant way to transition to breadcrumb_trail() - * in child themes and filter breadcrumb_trail_args instead. + * Displays the breadcrumb trail. * - * @since 0.1 + * @since 0.1.0 + * @deprecated 0.5.0 + * @todo Find an elegant way to transition to breadcrumb_trail(). */ function hybrid_breadcrumb() { if ( current_theme_supports( 'breadcrumb-trail' ) ) @@ -312,184 +181,84 @@ function hybrid_breadcrumb() { } /** - * Filters main feed links for the site. This changes the feed links to the user's - * alternate feed URL. This change only happens if the user chooses it from the - * theme settings. - * - * @since 0.4 - * @param string $output - * @param string $feed - * @return string $output - */ -function hybrid_feed_link( $output, $feed ) { - - $url = esc_url( hybrid_get_setting( 'feed_url' ) ); - - if ( $url ) { - $outputarray = array( 'rss' => $url, 'rss2' => $url, 'atom' => $url, 'rdf' => $url, 'comments_rss2' => '' ); - $outputarray[$feed] = $url; - $output = $outputarray[$feed]; - } - - return $output; -} - -/** - * Filters the category, author, and tag feed links. This changes all of these feed - * links to the user's alternate feed URL. This change only happens if the user chooses - * it from the theme settings. - * - * @since 0.4 - * @param string $link - * @return string $link - */ -function hybrid_other_feed_link( $link ) { - - if ( hybrid_get_setting( 'feeds_redirect' ) && $url = hybrid_get_setting( 'feed_url' ) ) - $link = esc_url( $url ); - - return $link; -} - -/** - * Displays the default entry title. Wraps the title in the appropriate header tag. - * Use the hybrid_entry_title filter to customize. + * Displays the post title. * - * @since 0.5 + * @since 0.5.0 */ -function hybrid_entry_title( $title = '' ) { - if ( !$title ) - $title = hybrid_entry_title_shortcode(); - - echo apply_atomic_shortcode( 'entry_title', $title ); +function hybrid_entry_title() { + echo apply_atomic_shortcode( 'entry_title', '[entry-title]' ); } /** - * Default entry byline for posts. Shows the author, date, and edit link. Use the - * hybrid_byline filter to customize. + * Default entry byline for posts. * - * @since 0.5 + * @since 0.5.0 */ -function hybrid_byline( $byline = '' ) { - global $post; +function hybrid_byline() { - if ( $byline ) - $byline = '

' . $byline . '

'; + $byline = ''; - elseif ( 'post' == $post->post_type && 'link_category' !== get_query_var( 'taxonomy' ) ) - $byline = '

' . __( 'By [entry-author] on [entry-published] [entry-edit-link before="| "]', hybrid_get_textdomain() ) . '

'; + if ( 'post' == get_post_type() && 'link_category' !== get_query_var( 'taxonomy' ) ) + $byline = '

' . __( 'By [entry-author] on [entry-published] [entry-edit-link before=" | "]', hybrid_get_textdomain() ) . '

'; echo apply_atomic_shortcode( 'byline', $byline ); } /** - * Displays the default entry metadata. Shows the category, tag, and comments - * link. Use the hybrid_entry_meta filter to customize. + * Displays the default entry metadata. * - * @since 0.5 + * @since 0.5.0 */ -function hybrid_entry_meta( $metadata = '' ) { - global $post; +function hybrid_entry_meta() { - $domain = hybrid_get_textdomain(); + $meta = ''; - if ( $metadata ) - $metadata = '

' . $metadata . '

'; + if ( 'post' == get_post_type() ) + $meta = '

' . __( '[entry-terms taxonomy="category" before="Posted in "] [entry-terms taxonomy="post_tag" before="| Tagged "] [entry-comments-link before="| "]', hybrid_get_textdomain() ) . '

'; - elseif ( 'post' == $post->post_type ) - $metadata = '

[entry-terms taxonomy="category" before="' . __( 'Posted in', $domain ) . ' "] [entry-terms taxonomy="post_tag" before="| ' . __( 'Tagged', $domain ) . ' "] [entry-comments-link before="| "]

'; + elseif ( is_page() && current_user_can( 'edit_page', get_the_ID() ) ) + $meta = '

[entry-edit-link]

'; - elseif ( is_page() && current_user_can( 'edit_pages' ) ) - $metadata = '

[entry-edit-link]

'; - - echo apply_atomic_shortcode( 'entry_meta', $metadata, $post->ID ); + echo apply_atomic_shortcode( 'entry_meta', $meta ); } /** * Function for displaying a comment's metadata. * * @since 0.7.0 - * @param string $metadata Custom metadata to use. - * @global $comment The global comment object. - * @global $post The global post object. - */ -function hybrid_comment_meta( $metadata = '' ) { - global $comment, $post; - - if ( !$metadata ) - $metadata = '[comment-author] [comment-published] [comment-permalink before="| "] [comment-edit-link before="| "] [comment-reply-link before="| "]'; - - $metadata = '
' . $metadata . '
'; - - echo do_shortcode( apply_filters( hybrid_get_prefix() . '_comment_meta', $metadata ) ); -} - -/** - * Disables stylesheets for particular plugins to allow the theme to easily write its own - * styles for the plugins' features. - * - * @since 0.7 - * @link http://wordpress.org/extend/plugins/wp-pagenavi - */ -function hybrid_disable_styles() { - /* Deregister the WP PageNavi plugin style. */ - wp_deregister_style( 'wp-pagenavi' ); -} - -/** - * Checks for a user-uploaded favicon in the child theme's /images folder. If it - * exists, display the element for it. - * - * @since 0.4 */ -function hybrid_favicon() { - $favicon = ''; - - if ( file_exists( CHILD_THEME_DIR . '/images/favicon.ico' ) ) - $favicon = '' . "\n"; - echo apply_atomic( 'favicon', $favicon ); +function hybrid_comment_meta() { + echo apply_atomic_shortcode( 'comment_meta', '
[comment-author] [comment-published] [comment-permalink before="| "] [comment-edit-link before="| "] [comment-reply-link before="| "]
' ); } /** - * Loads the navigation-links.php template file for use on archives, single posts, - * and attachments. Developers can overwrite this individual template within - * their custom child themes. + * Loads the loop-nav.php template with backwards compability for navigation-links.php. * - * @since 0.2 - * @uses get_template_part() Checks for template in child and parent theme. + * @since 0.2.0 + * @uses locate_template() Checks for template in child and parent theme. */ function hybrid_navigation_links() { - get_template_part( 'navigation-links' ); + locate_template( array( 'navigation-links.php', 'loop-nav.php' ), true ); } /** - * Displays the footer insert from the theme settings page. Users can also use shortcodes in their footer - * area, which will be displayed with this function. + * Displays the footer insert from the theme settings page. * * @since 0.2.1 - * @uses do_shortcode() Allows users to add shortcodes to their footer. - * @uses stripslashes() Strips any slashes added from the admin form. - * @uses hybrid_get_setting() Grabs the 'footer_insert' theme setting. */ function hybrid_footer_insert() { - $footer_insert = do_shortcode( hybrid_get_setting( 'footer_insert' ) ); + $footer_insert = hybrid_get_setting( 'footer_insert' ); if ( !empty( $footer_insert ) ) - echo '
' . $footer_insert . '
'; + echo '
' . do_shortcode( $footer_insert ) . '
'; } -/* Disables widget areas. */ -add_filter( 'sidebars_widgets', 'remove_sidebars' ); - /** - * Removes all widget areas on the No Widgets page template. We're only going to run - * it on the No Widgets template. Users that need additional templates without widgets - * should create a simliar function in their child theme. + * Removes all widget areas on the No Widgets page template. * - * @since 0.5.0 - * @uses sidebars_widgets Filter to remove all widget areas + * @since 0.9.0 */ -function remove_sidebars( $sidebars_widgets ) { +function hybrid_theme_remove_sidebars( $sidebars_widgets ) { global $wp_query; if ( is_singular() ) { @@ -501,7 +270,7 @@ function remove_sidebars( $sidebars_widgets ) { } /** - * Loads the Primary widget area. Users can overwrite 'sidebar-primary.php'. + * Loads the sidebar-primary.php template. * * @since 0.2.2 * @uses get_sidebar() Checks for the template in the child and parent theme. @@ -511,7 +280,7 @@ function hybrid_get_primary() { } /** - * Loads the Secondary widget area. Users can overwrite 'sidebar-secondary.php'. + * Loads the sidebar-secondary.php template. * * @since 0.2.2 * @uses get_sidebar() Checks for the template in the child and parent theme. @@ -521,7 +290,7 @@ function hybrid_get_secondary() { } /** - * Loads the Subsidiary widget area. Users can overwrite 'sidebar-subsidiary.php'. + * Loads the sidebar-subsidiary.php template. * * @since 0.3.1 * @uses get_sidebar() Checks for the template in the child and parent theme. @@ -531,8 +300,7 @@ function hybrid_get_subsidiary() { } /** - * Loads the Utility: Before Content widget area. Users can overwrite - * 'sidebar-before-content.php' in child themes. + * Loads the sidebar-before-content.php template. * * @since 0.4.0 * @uses get_sidebar() Checks for the template in the child and parent theme. @@ -542,8 +310,7 @@ function hybrid_get_utility_before_content() { } /** - * Loads the Utility: After Content widget area. Users can overwrite - * 'sidebar-after-content.php' in child themes. + * Loads the sidebar-after-content.php template. * * @since 0.4.0 * @uses get_sidebar() Checks for the template in the child and parent theme. @@ -553,8 +320,7 @@ function hybrid_get_utility_after_content() { } /** - * Loads the Utility: After Singular widget area. Users can overwrite - * 'sidebar-after-singular.php' in child themes. + * Loads the sidebar-after-singular.php template. * * @since 0.7.0 * @uses get_sidebar() Checks for the template in the child and parent theme. @@ -564,15 +330,47 @@ function hybrid_get_utility_after_singular() { } /** - * Loads the 'Primary Menu' template file. Users can overwrite menu-primary.php in their child - * theme folder. + * Loads the menu-primary.php template. * * @since 0.8.0 * @uses get_template_part() Checks for template in child and parent theme. - * @link http://codex.wordpress.org/Function_Reference/get_template_part */ function hybrid_get_primary_menu() { get_template_part( 'menu', 'primary' ); } +/** + * @since 0.7.0 + * @deprecated 0.9.0 + */ +function hybrid_disable_styles() { + _deprecated_function( __FUNCTION__, '0.9.0' ); +} + +/** + * @since 0.4.0 + * @deprecated 0.9.0 + */ +function hybrid_favicon() { + _deprecated_function( __FUNCTION__, '0.9.0' ); +} + +/** + * @since 0.4.0 + * @deprecated 0.9.0 + */ +function hybrid_feed_link( $output, $feed ) { + _deprecated_function( __FUNCTION__, '0.9.0' ); + return $output; +} + +/** + * @since 0.4.0 + * @deprecated 0.9.0 + */ +function hybrid_other_feed_link( $link ) { + _deprecated_function( __FUNCTION__, '0.9.0' ); + return $link; +} + ?> \ No newline at end of file diff --git a/header.php b/header.php index 77efa76..65d475c 100644 --- a/header.php +++ b/header.php @@ -11,14 +11,15 @@ * @subpackage Template */ ?> - -> - - + +> + + <?php hybrid_document_title(); ?> - - + + + diff --git a/home.php b/home.php index e6ad25c..0b1567c 100644 --- a/home.php +++ b/home.php @@ -21,8 +21,8 @@
- - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -34,7 +34,7 @@

- +

diff --git a/hour.php b/hour.php index f770949..e280b7f 100644 --- a/hour.php +++ b/hour.php @@ -15,11 +15,11 @@
-

+

- +

@@ -46,7 +46,7 @@

- +

diff --git a/minute.php b/minute.php index 36bcb0e..32701aa 100644 --- a/minute.php +++ b/minute.php @@ -15,14 +15,14 @@
-

+

- + - +

@@ -50,7 +50,7 @@

- +

diff --git a/month.php b/month.php index dafe9c1..3580fe3 100644 --- a/month.php +++ b/month.php @@ -20,7 +20,7 @@

- +

@@ -47,7 +47,7 @@

- +

diff --git a/navigation-links.php b/navigation-links.php index 5b34b28..d3c0b43 100644 --- a/navigation-links.php +++ b/navigation-links.php @@ -14,21 +14,21 @@
- ' . __( '« Return to entry', 'hybrid' ) . '' ); ?> + ' . __( '« Return to entry', hybrid_get_textdomain() ) . '' ); ?>
- ' . __( '« Previous', 'hybrid' ) . '' ); ?> - ' . __( 'Next »', 'hybrid' ) . '' ); ?> + ' . __( '« Previous', hybrid_get_textdomain() ) . '' ); ?> + ' . __( 'Next »', hybrid_get_textdomain() ) . '' ); ?>
- '', 'prelabel' => '' . __( '« Previous', 'hybrid' ) . '', 'nxtlabel' => '' . __( 'Next »', 'hybrid' ) . '' ) ) ) : ?> + '', 'prelabel' => '' . __( '« Previous', hybrid_get_textdomain() ) . '', 'nxtlabel' => '' . __( 'Next »', hybrid_get_textdomain() ) . '' ) ) ) : ?>
diff --git a/page-archives.php b/page-archives.php index d72abe9..d04b3f1 100644 --- a/page-archives.php +++ b/page-archives.php @@ -38,13 +38,13 @@ -

+

    - __( 'RSS', 'hybrid' ), 'show_count' => true, 'use_desc_for_title' => false, 'title_li' => false ) ); ?> + __( 'RSS', hybrid_get_textdomain() ), 'show_count' => true, 'use_desc_for_title' => false, 'title_li' => false ) ); ?>
-

+

    true, 'type' => 'monthly' ) ); ?> @@ -52,7 +52,7 @@ - '

    ' . __( 'Pages:', 'hybrid' ), 'after' => '

    ' ) ); ?> + '

    ' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

    ' ) ); ?>
@@ -69,7 +69,7 @@

- +

diff --git a/page-authors.php b/page-authors.php index 7448b12..cdc13cd 100644 --- a/page-authors.php +++ b/page-authors.php @@ -50,7 +50,7 @@ - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -67,7 +67,7 @@

- +

diff --git a/page-biography.php b/page-biography.php index a29b123..81354ca 100644 --- a/page-biography.php +++ b/page-biography.php @@ -39,23 +39,23 @@
    -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
@@ -65,7 +65,7 @@ - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -82,7 +82,7 @@

- +

diff --git a/page-blog.php b/page-blog.php index 79c0c3f..ef63c85 100644 --- a/page-blog.php +++ b/page-blog.php @@ -8,6 +8,7 @@ * * @package Hybrid * @subpackage Template + * @deprecated 0.9.0 Users should no longer be using this template. 'home.php' is used to show posts. */ get_header(); ?> @@ -29,8 +30,8 @@
- - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -44,7 +45,7 @@

- +

diff --git a/page-bookmarks.php b/page-bookmarks.php index 7342d70..82ca89f 100644 --- a/page-bookmarks.php +++ b/page-bookmarks.php @@ -40,7 +40,7 @@ ); ?> - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -57,7 +57,7 @@

- +

diff --git a/page-categories.php b/page-categories.php index e46f0fc..6f9081e 100644 --- a/page-categories.php +++ b/page-categories.php @@ -27,10 +27,10 @@
    - __( 'RSS', 'hybrid' ), 'show_count' => true, 'use_desc_for_title' => false, 'title_li' => false ) ); ?> + __( 'RSS', hybrid_get_textdomain() ), 'show_count' => true, 'use_desc_for_title' => false, 'title_li' => false ) ); ?>
- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -47,7 +47,7 @@

- +

diff --git a/page-daily.php b/page-daily.php index 8a1004e..bdb6875 100644 --- a/page-daily.php +++ b/page-daily.php @@ -29,7 +29,7 @@ 'daily', 'show_post_count' => true ) ); ?> - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -46,7 +46,7 @@

- +

diff --git a/page-logged-in.php b/page-logged-in.php index 2edd7a4..c5daa52 100644 --- a/page-logged-in.php +++ b/page-logged-in.php @@ -26,7 +26,7 @@
- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -48,9 +48,9 @@

- logged in to view the content of this page.', 'hybrid' ), wp_login_url( get_permalink() ) ); ?> + logged in to view the content of this page.', hybrid_get_textdomain() ), wp_login_url( get_permalink() ) ); ?> - register.', 'hybrid' ), site_url( 'wp-login.php?action=register', 'login' ) ); ?> + register.', hybrid_get_textdomain() ), site_url( 'wp-login.php?action=register', 'login' ) ); ?>

@@ -64,7 +64,7 @@

- +

diff --git a/page-monthly.php b/page-monthly.php index 177c5c6..5cc28b7 100644 --- a/page-monthly.php +++ b/page-monthly.php @@ -29,7 +29,7 @@ 'monthly', 'show_post_count' => true ) ); ?> - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -46,7 +46,7 @@

- +

diff --git a/page-no-widgets.php b/page-no-widgets.php index acf56ca..560df8a 100644 --- a/page-no-widgets.php +++ b/page-no-widgets.php @@ -23,7 +23,7 @@
- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -39,7 +39,7 @@

- +

diff --git a/page-post_tag-cloud.php b/page-post_tag-cloud.php index 76cf776..cb6ba65 100644 --- a/page-post_tag-cloud.php +++ b/page-post_tag-cloud.php @@ -30,7 +30,7 @@ 0 ) ); ?>

- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?> @@ -47,7 +47,7 @@

- +

diff --git a/page-sitemap.php b/page-sitemap.php index f179dc5..731f3ba 100644 --- a/page-sitemap.php +++ b/page-sitemap.php @@ -26,71 +26,71 @@ -

+

-

+

-

+

-

+

-

+

-

+

-

+

-

+

-

+

0 ) ); ?>

-

+

- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?> @@ -107,7 +107,7 @@

- +

diff --git a/page-weekly.php b/page-weekly.php index 7390f50..d9a2838 100644 --- a/page-weekly.php +++ b/page-weekly.php @@ -29,7 +29,7 @@ 'weekly', 'show_post_count' => true ) ); ?> - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?> @@ -46,7 +46,7 @@

- +

diff --git a/page-widgets.php b/page-widgets.php index 771d2e6..4e284f0 100644 --- a/page-widgets.php +++ b/page-widgets.php @@ -22,7 +22,7 @@ - ', '

' ); ?> + ', '

' ); ?> @@ -33,7 +33,7 @@

- +

diff --git a/page-yearly.php b/page-yearly.php index ce5e338..f8a1b8b 100644 --- a/page-yearly.php +++ b/page-yearly.php @@ -29,7 +29,7 @@ 'yearly', 'show_post_count' => true ) ); ?> - '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?> @@ -46,7 +46,7 @@

- +

diff --git a/page.php b/page.php index ddc54ae..7578cf2 100644 --- a/page.php +++ b/page.php @@ -24,7 +24,7 @@
- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -40,7 +40,7 @@

- +

diff --git a/post-no-widgets.php b/post-no-widgets.php index 1434cdd..6cd63dc 100644 --- a/post-no-widgets.php +++ b/post-no-widgets.php @@ -22,7 +22,7 @@
- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -38,7 +38,7 @@

- +

diff --git a/post.php b/post.php index e52f626..0128d56 100644 --- a/post.php +++ b/post.php @@ -23,7 +23,7 @@
- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -39,7 +39,7 @@

- +

diff --git a/search.php b/search.php index 657a459..47a6358 100644 --- a/search.php +++ b/search.php @@ -20,7 +20,7 @@

-

+

@@ -46,7 +46,7 @@

- +

diff --git a/searchform.php b/searchform.php index 825d5c2..7e5d021 100644 --- a/searchform.php +++ b/searchform.php @@ -15,8 +15,8 @@
- - + +
diff --git a/singular.php b/singular.php index 68d8575..68d7679 100644 --- a/singular.php +++ b/singular.php @@ -26,7 +26,7 @@
- '

' . __( 'Pages:', 'hybrid' ), 'after' => '

' ) ); ?> + '

' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '

' ) ); ?>
@@ -42,7 +42,7 @@

- +

diff --git a/style.css b/style.css index 6b579a4..aa976d4 100644 --- a/style.css +++ b/style.css @@ -2,44 +2,560 @@ * Theme Name: Hybrid * Theme URI: http://themehybrid.com/themes/hybrid * Description: A user-friendly, search-engine optimized theme framework, featuring 15 custom page templates and multiple widget-ready areas, allowing you to create any type of site you want. - * Version: 0.9 Alpha-1 + * Version: 0.9 Beta-1 * Author: Justin Tadlock * Author URI: http://justintadlock.com * Tags: theme-options, threaded-comments, sticky-post, microformats, translation-ready, rtl-language-support, one-column, two-columns, three-columns, fixed-width - * Status: publish + * License: GNU General Public License v2.0 + * License URI: http://www.gnu.org/licenses/gpl-2.0.html * - * Copyright (c) 2008 - 2010 Justin Tadlock. All rights reserved. + * Copyright (c) 2008 - 2011 Justin Tadlock. All rights reserved. * http://justintadlock.com - * - * Hybrid is released under the GNU General Public License, version 2 (GPL). - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ /* Get base CSS */ -@import url('library/css/21px.css'); +html,body,div,span,object,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,samp,small,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;vertical-align:baseline;outline:none;font-size:100%;background:transparent;border:none;text-decoration:none}b,i,hr,u,center,menu,layer,s,strike,font,xmp{margin:0;padding:0;vertical-align:baseline;outline:none;font-size:100%;font-weight:normal;font-style:normal;background:transparent;border:none;text-decoration:none}font{color:#333}center{text-align:left}body{line-height:24px;font-family:Georgia,Times,"Times New Roman",serif;color:#333;background:#fff}h1,h2,h3,h4,h5,h6{font-style:normal;font-weight:normal;margin:0 0 21px 0}h1{font-size:1.8em}h2{font-size:1.7em}h3{font-size:1.55em;}h4{font-size:1.4em}h5{font-size:1.25em}h6{font-size:1.1em}p{margin:0 0 21px 0}ol,ul{list-style:none}ul{list-style:disc;margin:0 0 21px 2.5em}ol{list-style-type:decimal;margin:0 0 21px 3em}ol ol{list-style:upper-roman}ol ol ol{list-style:lower-roman}ol ol ol ol{list-style:upper-alpha}ol ol ol ol ol{list-style:lower-alpha}ul ul,ol ol,ul ol,ol ul{margin-bottom:0}dl{margin:0 0 18px 3px}dl dt{font-weight:bold;margin:12px 0 0 0}dl dd{margin:6px 0 0 1.5em}strong{font-weight:bold}strong strong{font-weight:normal}em,cite{font-style:italic}em em,cite cite{font-style:normal}abbr{cursor:help}acronym{text-transform:uppercase;border-bottom:1px dashed #666;cursor:help}big{font-size:120%}small,sup,sub{font-size:80%}sup{vertical-align:baseline;position:relative;bottom:0.3em}sub{vertical-align:baseline;position:relative;top:0.3em}address{font-style:italic;margin:0 0 21px 0}li address,dd address{margin:0}blockquote{margin:0 2.5em;font-style:normal}blockquote em,blockquote cite{font-style:italic}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}a{cursor:pointer}a img{border:none}pre{overflow:auto;font:.9em Monaco,monospace,Courier,"Courier New";line-height:21px;margin-bottom:21px;padding:9px}code{font:.9em Monaco,monospace,Courier,"Courier New"}pre code{font-size:1em}ins,dfn{font-style:italic;text-decoration:none;border-bottom:1px solid #666}del{text-decoration:line-through}object{margin-bottom:21px}input,textarea{font-size:1em;font-family:Georgia,Times,"Times New Roman",serif;padding:3px}:focus{outline:none}form label{cursor:pointer}option{padding:1px 3px}table{border-collapse:collapse;border-spacing:0;margin-bottom:21px}th,td{text-align:left}hr{margin-bottom:21px}img.wp-smiley{max-height:12px;margin:0;padding:0;border:none}.gallery{display:block;text-align:center;margin-bottom:21px !important}.alignleft,.left{float:left;margin-right:15px}.alignright,.right{float:right;margin-left:15px}.aligncenter,.center{display:block;margin:0 auto 21px auto}.alignnone,.block{clear:both;margin:0 0 21px 0}.clear{clear:both}img.alignleft,img.alignright{display:inline}blockquote.alignleft,blockquote .alignright{width:33%} /* Get layout CSS */ -@import url('library/css/2c-l-fixed.css'); - -/* Get plugins CSS */ -@import url('library/css/plugins.css'); +#body-container{overflow:hidden;width:960px;margin:0 auto}#container{overflow:hidden;float:left;width:960px}.content{overflow:hidden;float:left;width:620px}.no-widgets .content,.no-default-widgets .content{width:960px}#primary{position:relative;float:right;width:300px}#secondary{position:relative;clear:right;float:right;width:300px}#subsidiary{overflow:hidden}#subsidiary .widget{overflow:hidden;float:left;width:300px;margin:0 20px 0 0}#footer-container{clear:both;overflow:hidden}#footer{clear:both;overflow:hidden} /* Get drop-downs CSS */ -@import url('library/css/drop-downs.css'); - -/* Get default CSS */ -@import url('library/css/screen.css'); - -/* Make sure theme clears WP.org theme repository checklist */ -.alignright {} -.alignleft {} -.alignnone {} -.aligncenter {} -.avatar {} -.wp-caption {} -.gallery {} -.wp-smiley {} \ No newline at end of file +#page-nav ul{margin:0;padding:0;list-style:none}#page-nav ul{line-height:1.0}#page-nav .menu ul{position:absolute;top:-999em;width:10em}#page-nav ul ul li{width:100%}#page-nav li:hover{visibility:inherit}#page-nav li{float:left;position:relative}#page-nav a{display:block;position:relative}#page-nav li:hover ul,li.sfHover ul{left:0;top:2em;z-index:99}#page-nav li:hover li ul,li.sfHover li ul{top:-999em}#page-nav li li:hover ul,li li.sfHover ul{left:10em;top:0}#page-nav li li:hover li ul,li li.sfHover li ul{top:-999em}#page-nav li li li:hover ul,li li li.sfHover ul{left:10em;top:0}#cat-nav ul{margin:0;padding:0;list-style:none}#cat-nav ul{line-height:1.0}#cat-nav .menu ul{position:absolute;top:-999em;width:10em}#cat-nav ul ul li{width:100%}#cat-nav li:hover{visibility:inherit}#cat-nav li{float:left;position:relative}#cat-nav a{display:block;position:relative}#cat-nav li:hover ul,li.sfHover ul{left:0;top:2em;z-index:99}#cat-nav li:hover li ul,li.sfHover li ul{top:-999em}#cat-nav li li:hover ul,li li.sfHover ul{left:10em;top:0}#cat-nav li li:hover li ul,li li.sfHover li ul{top:-999em}#cat-nav li li li:hover ul,li li li.sfHover ul{left:10em;top:0}div.menu ul{margin:0;padding:0;list-style:none;line-height:1.0}div.menu ul ul{position:absolute;top:-999em;width:10em}div.menu ul ul li{width:100%}div.menu li:hover{visibility:inherit}div.menu li{float:left;position:relative}div.menu a{display:block;position:relative}div.menu li:hover ul,li.sfHover ul{left:0;top:2em;z-index:99}div.menu li:hover li ul,li.sfHover li ul{top:-999em}div.menu li li:hover ul,li li.sfHover ul{left:10em;top:0}div.menu li li:hover li ul,li li.sfHover li ul{top:-999em}div.menu li li li:hover ul,li li li.sfHover ul{left:10em;top:0} + +/* Get gallery CSS */ +.gallery{display:block;clear:both;overflow:hidden;margin:0 auto}.gallery .gallery-row{display:block;clear:both;overflow:hidden;margin:0}.gallery .gallery-item{overflow:hidden;float:left;margin:0;text-align:center;list-style:none;padding:0}.gallery .gallery-item img,.gallery .gallery-item img.thumbnail{max-width:89%;height:auto;padding:1%;margin:0 auto}.gallery-caption{margin-left:0}.col-0{width:100%}.col-1{width:100%}.col-2{width:50%}.col-3{width:33.33%}.col-4{width:25%}.col-5{width:20%}.col-6{width:16.66%}.col-7{width:14.28%}.col-8{width:12.5%}.col-9{width:11.11%}.col-10{width:10%}.col-11{width:9.09%}.col-12{width:8.33%}.col-13{width:7.69%}.col-14{width:7.14%}.col-15{width:6.66%}.col-16{width:6.25%}.col-17{width:5.88%}.col-18{width:5.55%}.col-19{width:5.26%}.col-20{width:5%}.col-21{width:4.76%}.col-22{width:4.54%}.col-23{width:4.34%}.col-24{width:4.16%}.col-25{width:4%}.col-26{width:3.84%}.col-27{width:3.7%}.col-28{width:3.57%}.col-29{width:3.44%}.col-30{width:3.33%} + +/* WP.org theme repository requirements. */ +.sticky, .bypostauthor {} + +/* Body */ +body { + font: normal normal normal 15px/21px Georgia, Times, "Times New Roman", serif; + color: #000; + } + +/* Body container */ +#body-container { + margin: 90px auto 21px auto; + } + +/* Links */ +a { + color: #21759b; + text-decoration: none; + } +a:visited { + color: #551a8b; + } +a:hover, a:active { + color: #d54e21; + text-decoration: underline; + } + +/* Headers */ +h2, h3, h4, h5, h6 { + font-family: Georgia, Times, "Times New Roman", serif; + color: #000; + font-weight: bold; + } +h2 { + font-size: 21px; + } +h3 { + font-size: 19px; + } +h4 { + font-size: 17px; + } +h5 { + font-size: 15px; + } +h6 { + font-size: 13px; + } + +/* Lists */ +ul { + list-style: square; + } + +/* Blockquotes */ +blockquote { + font-style: italic; + color: #555; + } +blockquote blockquote { + color: #777; + } +blockquote em { + font-style: normal; + } + +/* Code */ +pre { + padding: 9px; + background: #f9f9f9; + border: 1px solid #ccc; + } +code { + padding: 0 3px; + background: #eee; + } +pre code { + background: transparent; + } + +/* Tables */ +table { + width: 100%; + border-collapse: separate; + border-top: 1px solid #ccc; + border-left: 1px solid #ccc; + } +caption { + font-size: .9em; + font-style: italic; + text-align: right; + } +td, th { + padding: 3px 6px; + border-bottom: 1px solid #ccc; + border-right: 1px solid #ccc; + } +th { + background: #eee; + } + +/* Drop caps */ +.drop-cap { + float: left; + margin: 3px 3px 0 0; + font: normal normal normal 47px/35px "Warnock Pro", "Goudy Old Style", Palatino,"Book Antiqua", Georgia, serif; + color: #333; + } + +/* Notes */ +.note { + padding: 6px 9px; + background: #eee; + border: 1px solid #ccc; + } + +/* Warnings/Alerts */ +.warning, .alert { + padding: 6px 9px; + background: #fffbbc; + border: 1px solid #E6DB55; + } + +/* Errors */ +.error { + padding: 6px 9px; + background: #ffebe8; + border: 1px solid #C00; + } + +/* Downloads */ +.download { + padding: 6px 9px; + background: #e7f7d3; + border: 1px solid #6c3; + } + +/* Breadcrumb */ +.breadcrumb { + margin: 0 0 30px 0; + font-size: .9em; + font-style: italic; + color: #666; + } +.breadcrumb a { + color: #111; + text-decoration: none; + } +.breadcrumb a:hover { + color: #d54e21; + text-decoration: underline; + } + +/* Images */ +.post img { + max-width: 568px; + height: auto; + padding: 5px; + border: 1px solid #ccc; + } +img.alignleft, img.alignright { + margin-bottom: 10px; + } + +.thumbnail { + float: left; + width: 100px; + height: 100px; + margin: 5px 15px 0 0; + } + +/* Smiley */ +img.wp-smiley { + max-width: 12px; + padding: 0; + background: transparent; + border: none; + } + +/* Captions [caption] */ +.wp-caption { + max-width: 576px; + margin-top: 6px; + padding: 6px 1px 0 1px; + border: 1px solid #ccc; + text-align: center; + } +.wp-caption .wp-caption-text { + margin: 0; + padding: 0 5px; + text-align: right; + font-size: .9em; + font-style: italic; + color: #666; + } +.wp-caption img { + max-width: 564px; + margin: 0 auto; + padding: 0; + border: 1px solid #666; + } + +/* Gallery [gallery] */ +.gallery img { + border: 1px solid #ccc; + } + +/* Avatars */ +.avatar { + float: left; + width: 100px; + height: 100px; + margin: 5px 15px 0 0; + padding: 5px; + border: 1px solid #ccc; + } + +/* Header */ +#header { + margin: 0 0 40px 0; + } + +/* Blog title */ +#site-title { + font: italic normal normal 35px/35px Georgia, Times, "Times New Roman", serif; + margin: 0 0 10px 0; + } +#site-title a { + color: #000; + } + +/* Blog description */ +#site-description { + font: normal normal normal 16px/20px Georgia, Times, "Times New Roman", serif; + margin: 0; + color: #666; + } + +/* Navigation */ +#primary-menu, #navigation { + overflow: visible; + height: 34px; + margin: 0 0 60px 0; + z-index: 100; + } +#primary-menu li, #page-nav li { + margin-right: 15px; + } +#primary-menu li li, #page-nav li li { + margin-right: 0; + } +#primary-menu li a, #page-nav li a { + padding: 8px 15px 8px 15px; + color: #111; + background: #fff; + border: 1px solid #ccc; + } + +/* Drop-downs style */ +#primary-menu li:hover ul, #primary-menu li.sfHover ul, #page-nav li:hover ul, #page-nav li.sfHover ul { + top: 32px; + } +#primary-menu li li a, #page-nav li li a { + border-top: none; + margin-right: 0; + } +#primary-menu li ul, #page-nav li ul { + background: #fff; + border-top: 1px solid #ccc; + } +#primary-menu li li:hover ul, #primary-menu li li.sfHover ul, #primary-menu li li li:hover ul, #primary-menu li li li.sfHover ul, +#page-nav li li:hover ul, #page-nav li li.sfHover ul , #page-nav li li li:hover ul, #page-nav li li li.sfHover ul { + top: -1px; + } +#primary-menu li li li, #page-nav li li li { + margin-left: -1px; + } + +/* Container (wraps content, primary, and secondary) */ +#container { + margin-bottom: 21px; + } + +/* Main content */ +.content { + margin: 0 0 21px 0; + } +.no-widgets .content, .page-template-no-widgets .content { + width: 960px; + } + +/* Posts */ +.post { + overflow: hidden; + margin: 0 0 40px 0; + } +.single .post, .attachment .post, .page .post { + margin: 0; + } + +/* Archive information */ +.author-info, .search-info { + overflow: hidden; + margin: 0 0 40px 0; + } + +/* Entry title */ +.entry-title { + font-size: 24px; + line-height: 24px; + margin: 0 0 12px 0; + font-weight: normal; + font-style: italic; + } +.archive .entry-title, .search .entry-title { + font-size: 21px; + margin: 0; + } +.page-title, .attachment-title { + margin: 0 0 21px 0; + } +.entry-title a { + color: #000; + } + +/* Byline */ +.byline { + margin: 0 0 30px 0; + font-style: italic; + color: #666; + } +.archive .byline, .search .byline { + margin: 0; + } +.byline .byline-prep { + text-transform: lowercase; + } + +/* Entry content */ +.entry-content { + margin: 0 0 10px 0; + } + +/* Entry metadata */ +.entry-meta { + clear: both; + font-style: italic; + color: #666; + } + +/* Page links (multiple-paged posts) */ +p.page-links { + clear: both; + } +p.page-links a { + margin: 0 3px; + padding: 3px 9px 3px 9px; + border: 1px solid #ccc; + } + +/* Navigation links */ +.navigation-links { + margin-bottom: 21px; + font-style: italic; + } +.navigation-links .previous { + float: left; + max-width: 50%; + } +.navigation-links .next { + float: right; + max-width: 50%; + text-align: right; + } +.navigation-attachment { + overflow: hidden; + } + +/* Widgets */ +.widget { + overflow: hidden; + margin: 0 0 15px 0; + color: #464646; + } +.widget a { + color: #464646; + text-decoration: underline; + } +.widget a:hover { + color: #d54e21; + text-decoration: none; + } + +/* Widget titles */ +.widget-title { + font-size: 18px; + font-weight: normal; + font-style: italic; + color: #111; + } + +/* Utility widget areas */ +#utility-before-content, #utility-after-content, #utility-after-page, #utility-after-single { + margin: 0 0 21px 0; + padding: 20px 20px 0 20px; + border: 1px solid #ccc; + } + +/* Comments template */ +#comments-template { + clear: both; + } + +/* Comment headers */ +.comments-header { + font-size: 1.2em; + } + +/* Comments are closed */ +.comments-closed { + font-style: italic; + } + +/* Comment list */ +#comments-template ol { + list-style: none; + margin: 0 0 21px 0; + } +#comments li, #comments li li li, #comments li li li li li { + overflow: hidden; + margin: 0 0 15px 0; + padding: 15px 15px 0 15px; + background: #fff; + border: 1px solid #ccc; + } +#comments li li, #comments li li li li { + background: #f9f9f9; + } + +/* Avatar */ +#comments-template .avatar { + width: 40px; + height: 40px; + float: left; + margin-right: 15px; + padding: 0; + border: 1px solid #666; + } + +/* Comment metadata */ +.comment-meta { + margin: 10px 0 21px 0; + font-size: 13px; + color: #666; + } +.comment-author { + font-size: 15px; + color: #000; + } +.comment-reply-link, .permalink, .comment-edit-link { + font-style: italic; + color: #666; + } + +/* Comment text */ +.comment-text { + clear: left; + margin: 0 15px; + } + +/* Form */ +.text-input { + display: block; + padding: 3px 6px; + width: 97%; + } +#comments-template label { + font-size: .9em; + } + +/* Respond textarea */ +textarea { + width: 98%; + } + +/* Submit and rest buttons */ +.button, .submit, .reset { + width: 100px; + margin-right: 15px; + padding: 7px 15px 8px 15px; + background: #fff; + border: 1px solid #ccc; + } +.button:hover, .submit:hover, .reset:hover { + cursor: pointer; + background: #f9f9f9; + } + +/* Footer container */ +#footer-container { + clear: both; + margin: 0 0 21px 0; + } + +/* Subsidiary */ +#subsidiary { + margin: 0 0 21px 0; + } + +/* Footer */ +#footer { + font-style: italic; + color: #444; + } +#footer .copyright { + display: inline; + float: left; + margin-right: 9px; + } + +/* Layout */ +.content { + float: left; + width: 620px; + } +#primary { + float: right; + width: 300px; + } +#secondary { + clear: right; + float: right; + width: 300px; + } \ No newline at end of file diff --git a/taxonomy-category.php b/taxonomy-category.php index b23e56d..210002f 100644 --- a/taxonomy-category.php +++ b/taxonomy-category.php @@ -47,7 +47,7 @@

- +

diff --git a/taxonomy-post_tag.php b/taxonomy-post_tag.php index d645f9d..1341db8 100644 --- a/taxonomy-post_tag.php +++ b/taxonomy-post_tag.php @@ -46,7 +46,7 @@

- +

diff --git a/taxonomy.php b/taxonomy.php index 54c487b..0a0f323 100644 --- a/taxonomy.php +++ b/taxonomy.php @@ -48,7 +48,7 @@

- +

diff --git a/time.php b/time.php index 974e1ef..04ef7f1 100644 --- a/time.php +++ b/time.php @@ -20,7 +20,7 @@

- +

@@ -47,7 +47,7 @@

- +

diff --git a/week.php b/week.php index d7ac49b..c8b82a6 100644 --- a/week.php +++ b/week.php @@ -16,11 +16,11 @@
-

+

- +

@@ -47,7 +47,7 @@

- +

diff --git a/year.php b/year.php index dd7aa6c..6ed8341 100644 --- a/year.php +++ b/year.php @@ -15,11 +15,11 @@
-

+

- +

@@ -46,7 +46,7 @@

- +