diff --git a/app/api/deprecated.php b/app/api/deprecated.php index b083e4b..09f0c38 100644 --- a/app/api/deprecated.php +++ b/app/api/deprecated.php @@ -11,6 +11,20 @@ * @link http://tarskitheme.com/forum/ */ +/** + * Return the current theme version. + * + * @since 2.0 + * @deprecated 3.2.0 + * + * @return string + */ +function theme_version() { + _deprecated_function('wp_get_theme', '3.2.0'); + + return wp_get_theme()->Version; +} + /** * Returns the document title. * @@ -64,113 +78,4 @@ function tarski_doctitle($sep = '·') { echo $doctitle; } -/** - * If debug mode is enabled, use uncompressed (development mode) JavaScript. - * - * @since 2.7 - * @deprecated 3.1.0 - * - * @see TARSKI_DEBUG - * @uses _tarski_compressible_asset_path - * - * @param string $path - * @return string - */ -function tarski_js($path) { - _deprecated_function(__FUNCTION__, '3.1.0'); - - return tarski_asset_path($path); -} - -/** - * If debug mode is enabled, use uncompressed (development mode) CSS. - * - * @since 2.7 - * @deprecated 3.1.0 - * - * @see TARSKI_DEBUG - * @uses _tarski_compressible_asset_path - * - * @param string $path - * @return string - */ -function tarski_css($path) { - _deprecated_function(__FUNCTION__, '3.1.0'); - - return tarski_asset_path($path); -} - -/** - * Adds JavaScript to the Tarski Options page. - * - * @since 1.4 - * @deprecated 3.1.0 - * - * @uses get_bloginfo - * @uses wp_enqueue_script - * - * @return void -*/ -function tarski_inject_scripts() { - _deprecated_function(__FUNCTION__, '3.1.0'); -} - -/** - * Returns the number of authors who have published posts. - * - * @since 2.0.3 - * @deprecated 3.1.0 - * - * @global object $wpdb - * @return integer - */ -function tarski_count_authors() { - _deprecated_function(__FUNCTION__, '3.1.0'); - - global $wpdb; - return count($wpdb->get_col($wpdb->prepare( - "SELECT post_author, COUNT(DISTINCT post_author) - FROM $wpdb->posts - WHERE post_status = 'publish' - GROUP BY post_author" - ), 1)); -} - -/** - * Determines whether Tarski should show authors. - * - * @since 2.0.3 - * @deprecated 3.1.0 - * - * @uses tarski_count_authors() - * - * @global object $wpdb - * @return boolean - */ -function tarski_should_show_authors() { - _deprecated_function(__FUNCTION__, '3.1.0'); - - $show_authors = tarski_count_authors() > 1; - return (bool) apply_filters('tarski_show_authors', $show_authors); -} - -/** - * Re-saves Tarski's 'show_authors' option. - * - * If more than one author is detected, it will turn the 'show_authors' - * option on; otherwise it will turn it off. - * - * @since 2.0.3 - * @deprecated 3.1.0 - * - * @uses tarski_should_show_authors - */ -function tarski_resave_show_authors() { - _deprecated_function(__FUNCTION__, '3.1.0'); - - if (get_option('tarski_options')) { - update_tarski_option('show_authors', tarski_should_show_authors()); - } -} - ?> \ No newline at end of file diff --git a/changelog.txt b/changelog.txt index b8d2c1b..545721a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,10 +2,21 @@ ### Version 3.2.0 + * Added option to display featured post images in the header. + * Moved language files to `/languages` directory. + * Added POT file to theme files in `languages` directory. + * Replaced use of deprecated `add_custom_image_header` function. + * Stop defining header image constants. * Deprecated `tarski_doctitle` in favour of a filter on `wp_title`. * Updated the author details per Theme Directory requirements. * Updated theme description to explain more of its advantages. * Fixed options saving bug so post and page sidebar selection works properly. + * Replaced use of deprecated `get_current_theme` and `get_theme_data` + functions. + * Deprecated `tarski_version` in favour of core `wp_get_theme` function. + * Added white background to main content wrapper. + * Replaced use of deprecated `add_custom_background` function. + * Removed functions deprecated in version 3.1.0. ### Version 3.1.3 diff --git a/functions.php b/functions.php index 4991a6d..271e10c 100644 --- a/functions.php +++ b/functions.php @@ -76,27 +76,31 @@ */ // Localisation -load_theme_textdomain('tarski'); - -// Custom header image -if (!defined('HEADER_TEXTCOLOR')) - define('HEADER_TEXTCOLOR', ''); -if (!defined('HEADER_IMAGE')) // %s is theme directory URI - define('HEADER_IMAGE', '%s/headers/' . get_tarski_option('header')); -if (!defined('HEADER_IMAGE_WIDTH')) - define('HEADER_IMAGE_WIDTH', 720); -if (!defined('HEADER_IMAGE_HEIGHT')) - define('HEADER_IMAGE_HEIGHT', 180); -if (!defined('NO_HEADER_TEXT')) - define('NO_HEADER_TEXT', true); - -add_custom_image_header('', 'tarski_admin_header_style'); +load_theme_textdomain('tarski', get_template_directory() . '/languages'); + +// Custom header support +add_theme_support('custom-header', array( + 'default-image' => '%s/headers/' . get_tarski_option('header'), + 'random-default' => false, + 'width' => 720, + 'height' => 180, + 'flex-height' => false, + 'flex-width' => false, + 'default-text-color' => '', + 'header-text' => false, + 'uploads' => true, + 'wp-head-callback' => '', + 'admin-head-callback' => 'tarski_admin_header_style', + 'admin-preview-callback' => '' +)); + register_default_headers(_tarski_list_header_images()); // Content width; set this in a plugin or child theme if you want to change // the width of the theme via a stylesheet. -if (!isset($content_width)) +if (!isset($content_width)) { $content_width = 500; +} // Main sidebar widgets register_sidebar(array( @@ -149,14 +153,22 @@ register_nav_menu('tarski_navbar', __('Tarski navbar', 'tarski')); // Custom background support -add_custom_background(); +add_theme_support('custom-background'); // Post thumbnails; change these settings via a child theme or plugin add_theme_support('post-thumbnails'); -if (get_tarski_option('featured_header')) -set_post_thumbnail_size(HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true); -else -set_post_thumbnail_size(150, 150, false); + +if (get_tarski_option('featured_header')) { + set_post_thumbnail_size(HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true); +} else { + set_post_thumbnail_size($content_width, 300, false); +} + +// Image size for large feature images, used in the header +add_image_size('large-feature', HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true); + +// Image size for featured posts if a large-feature doesn't exist +add_image_size('small-feature', $content_width, 300); // Post types add_theme_support('post-formats', array('aside')); @@ -222,4 +234,4 @@ add_action('th_footer', 'tarski_feedlink'); add_action('th_footer', 'tarski_credits'); -?> +?> \ No newline at end of file diff --git a/languages/tarski.pot b/languages/tarski.pot new file mode 100644 index 0000000..9315182 --- /dev/null +++ b/languages/tarski.pot @@ -0,0 +1,528 @@ +# Translation of the WordPress theme Tarski 3.2 by Benedict Eastaugh +# Copyright (c) 2012 Benedict Eastaugh +# This file is distributed under the same license as the Tarski package. +msgid "" +msgstr "" +"Project-Id-Version: Tarski 3.2.0\n" +"Report-Msgid-Bugs-To: Benedict Eastaugh \n" +"POT-Creation-Date: 2012-02-12 15:44:21+00:00\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"PO-Revision-Date: 2012-MO-DA HO:MI+ZONE\n" +"Last-Translator: Benedict Eastaugh \n" +"Language-Team: Benedict Eastaugh \n" + +#: 404.php:8 +msgid "Error 404" +msgstr "" + +#: app/api/deprecated.php:38 library/helpers/template_helper.php:72 +msgid "Error %s" +msgstr "" + +#: app/api/deprecated.php:42 library/helpers/template_helper.php:76 +msgid "Search results for %s" +msgstr "" + +#: app/templates/credits.php:2 +msgid "Powered by WordPress and Tarski" +msgstr "" + +#: app/templates/credits.php:6 +msgid " | Hosted by %s" +msgstr "" + +#: app/templates/feed_link.php:2 +msgid "Subscribe to feed" +msgstr "" + +#: app/templates/loop.php:7 app/templates/loop.php:29 +msgid "Read the rest of this entry »" +msgstr "" + +#: app/templates/loop.php:10 library/classes/comment_walker.php:86 +#: library/classes/comment_walker.php:97 library/helpers/content_helper.php:346 +msgid "edit" +msgstr "" + +#: app/templates/loop.php:19 +msgid "Permanent link to %s" +msgstr "" + +#: app/templates/no_posts.php:4 +msgid "No posts found" +msgstr "" + +#: app/templates/no_posts.php:9 +msgid "Looks like there᾿s nothing here, sorry. You might want to try the search function. Alternatively, return to the %s." +msgstr "" + +#: app/templates/no_posts.php:10 library/helpers/content_helper.php:369 +#: search.php:29 +msgid "front page" +msgstr "" + +#: app/templates/options/alternate_style.php:7 +msgid "Default style" +msgstr "" + +#: app/templates/options/alternate_style.php:19 +msgid "Tarski allows you to select an alternate style that modifies the default one. Choose from the list above." +msgstr "" + +#: app/templates/options/alternate_style.php:21 +msgid "Tarski allows you to select an %1$s that modifies the default one. Choose from the list above, or upload your own to %2$s." +msgstr "" + +#: app/templates/options/alternate_style.php:21 +msgid "alternate style" +msgstr "" + +#: app/templates/options/alternate_style.php:25 +msgid "No alternate stylesheets appear to be present." +msgstr "" + +#: app/templates/options/messages.php:3 +msgid "Tarski options have been restored. %s" +msgstr "" + +#: app/templates/options/messages.php:4 app/templates/options/messages.php:9 +msgid "View site ›" +msgstr "" + +#: app/templates/options/messages.php:8 +msgid "Tarski options have been updated. %s" +msgstr "" + +#: app/templates/options/missing_files.php:1 +msgid "This may be because you have removed them, or because those files aren’t readable by WordPress." +msgstr "" + +#: app/templates/options/missing_files.php:2 +msgid "If you have problems making the files readable, try the WordPress Codex documentation on %s." +msgstr "" + +#: app/templates/options/missing_files.php:2 +msgid "changing file permissions" +msgstr "" + +#: app/templates/options/missing_files.php:3 +msgid "If you deleted the files by accident, just download a new copy from the %s and re-upload them to your website." +msgstr "" + +#: app/templates/options/missing_files.php:3 +msgid "Tarski website" +msgstr "" + +#: app/templates/options/reset_options.php:2 +msgid "Reset Tarski’s options to their default values" +msgstr "" + +#: app/templates/options/reset_options.php:7 +msgid "If you change your mind, you’ll have three hours to restore your options before they’re removed for good." +msgstr "" + +#: app/templates/options/restore_options.php:6 +msgid "You have deleted your Tarski options." +msgstr "" + +#: app/templates/options/restore_options.php:6 +msgid "Restore Tarski Options »" +msgstr "" + +#: app/templates/options/sidebar_options.php:1 +msgid "The sidebar for posts and pages can be the same as that for index pages, or use its own set of widgets." +msgstr "" + +#: app/templates/options/sidebar_options.php:6 +msgid "Same content as main sidebar?" +msgstr "" + +#: app/templates/options_page.php:10 library/helpers/admin_helper.php:201 +#: library/helpers/admin_helper.php:202 +msgid "Tarski Options" +msgstr "" + +#: app/templates/options_page.php:13 app/templates/options_page.php:30 +msgid "Save Options" +msgstr "" + +#: app/templates/options_page.php:17 +msgid "Tarski documentation" +msgstr "" + +#: app/templates/options_page.php:18 +msgid "Credits & Thanks" +msgstr "" + +#: app/templates/options_page.php:19 +msgid "Forum" +msgstr "" + +#: app/templates/options_page.php:28 +msgid "Alternate Style" +msgstr "" + +#: app/templates/options_page.php:29 +msgid "Miscellaneous Options" +msgstr "" + +#: app/templates/options_page.php:34 +msgid "Sidebar Options" +msgstr "" + +#: app/templates/options_page.php:40 +msgid "Reset Options" +msgstr "" + +#: archive.php:13 +msgid "You are currently browsing the archive for the %s category." +msgstr "" + +#: archive.php:22 +msgid "You are currently browsing articles tagged %s." +msgstr "" + +#: archive.php:26 library/helpers/author_helper.php:32 +msgid "Articles by %s" +msgstr "" + +#: archive.php:33 +msgid "You are currently browsing %s’s articles." +msgstr "" + +#: archive.php:42 +msgid "You are currently browsing the daily archive for %s." +msgstr "" + +#: archive.php:46 archive.php:50 +msgid "F Y" +msgstr "" + +#: archive.php:50 +msgid "You are currently browsing the monthly archive for %s." +msgstr "" + +#: archive.php:54 archive.php:58 +msgid "Y" +msgstr "" + +#: archive.php:58 +msgid "You are currently browsing the yearly archive for %s." +msgstr "" + +#: archives.php:14 links.php:15 tags.php:15 +msgid "edit page" +msgstr "" + +#: archives.php:25 +msgid "Monthly Archives" +msgstr "" + +#: archives.php:36 +msgid "Category Archives" +msgstr "" + +#: comments.php:12 library/helpers/content_helper.php:158 +#: library/helpers/content_helper.php:213 +msgid "No comments" +msgstr "" + +#: comments.php:12 library/helpers/content_helper.php:160 +#: library/helpers/content_helper.php:214 +msgid "1 comment" +msgstr "" + +#: comments.php:12 library/helpers/content_helper.php:156 +#: library/helpers/content_helper.php:215 +msgid "% comments" +msgstr "" + +#: comments.php:14 +msgid "Comments feed for this article" +msgstr "" + +#: comments.php:18 +msgid "Trackback link: %s" +msgstr "" + +#: comments.php:30 +msgid "‹ Previous" +msgstr "" + +#: comments.php:31 +msgid "Next ›" +msgstr "" + +#: comments.php:39 +msgid "Comments are now closed." +msgstr "" + +#: functions.php:104 +msgid "Main sidebar" +msgstr "" + +#: functions.php:113 +msgid "Post and page sidebar" +msgstr "" + +#: functions.php:122 +msgid "Footer main widgets" +msgstr "" + +#: functions.php:131 +msgid "Footer sidebar widgets" +msgstr "" + +#: functions.php:149 +msgid "Tarski navbar" +msgstr "" + +#: library/classes/comment_walker.php:80 +msgid "%1$s from %2$s on %3$s" +msgstr "" + +#: library/classes/comment_walker.php:81 +msgctxt "noun" +msgid "Comment" +msgstr "" + +#: library/classes/comment_walker.php:82 +msgid "Trackback" +msgstr "" + +#: library/classes/comment_walker.php:83 +msgid "Pingback" +msgstr "" + +#: library/classes/comment_walker.php:89 +msgid "Your comment is awaiting moderation." +msgstr "" + +#: library/classes/comment_walker.php:94 +msgid "%1$s on %2$s" +msgstr "" + +#: library/classes/options.php:79 library/helpers/template_helper.php:436 +msgid "Home" +msgstr "" + +#: library/helpers/admin_helper.php:23 library/helpers/admin_helper.php:49 +#: library/helpers/admin_helper.php:76 +msgid "You are not authorised to perform this operation." +msgstr "" + +#: library/helpers/admin_helper.php:313 +msgid "Display site title" +msgstr "" + +#: library/helpers/admin_helper.php:314 +msgid "Display site tagline" +msgstr "" + +#: library/helpers/admin_helper.php:315 +msgid "Show post categories" +msgstr "" + +#: library/helpers/admin_helper.php:316 +msgid "Show tags everywhere" +msgstr "" + +#: library/helpers/admin_helper.php:317 +msgid "Centrally align the theme" +msgstr "" + +#: library/helpers/admin_helper.php:318 +msgid "Switch column order" +msgstr "" + +#: library/helpers/admin_helper.php:319 +msgid "Reverse document title order" +msgstr "" + +#: library/helpers/author_helper.php:35 +msgid " by " +msgstr "" + +#: library/helpers/comments_helper.php:21 +msgid "%1$s at %2$s" +msgstr "" + +#: library/helpers/comments_helper.php:40 +msgid "Permalink to this comment" +msgstr "" + +#: library/helpers/comments_helper.php:82 +#: library/helpers/comments_helper.php:99 +msgid "%s’s avatar" +msgstr "" + +#: library/helpers/comments_helper.php:169 +msgid "You must be %s to post a comment." +msgstr "" + +#: library/helpers/comments_helper.php:171 +msgid "logged in" +msgstr "" + +#: library/helpers/comments_helper.php:173 +msgid "Your comment" +msgstr "" + +#: library/helpers/comments_helper.php:186 +msgid "Reply" +msgstr "" + +#: library/helpers/comments_helper.php:187 +msgid "Reply to %s" +msgstr "" + +#: library/helpers/content_helper.php:59 +msgid "Pages:" +msgstr "" + +#: library/helpers/content_helper.php:63 +msgid "Next page" +msgstr "" + +#: library/helpers/content_helper.php:64 +msgid "Previous page" +msgstr "" + +#: library/helpers/content_helper.php:93 +msgid "Previous results" +msgstr "" + +#: library/helpers/content_helper.php:94 +msgid "More results" +msgstr "" + +#: library/helpers/content_helper.php:97 +msgid "Older entries" +msgstr "" + +#: library/helpers/content_helper.php:98 +msgid "Newer entries" +msgstr "" + +#: library/helpers/content_helper.php:124 +msgid " in %s" +msgstr "" + +#: library/helpers/content_helper.php:192 +#: library/helpers/content_helper.php:217 +msgid "Permalink" +msgstr "" + +#: library/helpers/content_helper.php:345 +msgid "Edit this post" +msgstr "" + +#: library/helpers/content_helper.php:368 +msgid "The page you are looking for does not exist; it may have been moved, or removed altogether. You might want to try the search function or return to the %s." +msgstr "" + +#: library/helpers/tag_helper.php:20 library/helpers/tag_helper.php:90 +msgid ", " +msgstr "" + +#: library/helpers/tag_helper.php:23 library/helpers/tag_helper.php:60 +msgid "and" +msgstr "" + +#: library/helpers/tag_helper.php:62 +msgid "or" +msgstr "" + +#: library/helpers/tag_helper.php:112 tags.php:22 +msgid "Tags" +msgstr "" + +#: library/helpers/template_helper.php:291 +msgid "Header image" +msgstr "" + +#: library/helpers/template_helper.php:298 +#: library/helpers/template_helper.php:327 +msgid "Return to main page" +msgstr "" + +#: library/helpers/template_helper.php:435 +msgid "Return to front page" +msgstr "" + +#: library/helpers/widgets.php:97 +msgid "The most recent articles, offset by the number of visible articles on the home page." +msgstr "" + +#: library/helpers/widgets.php:98 library/helpers/widgets.php:122 +msgid "Recent Articles" +msgstr "" + +#: library/helpers/widgets.php:144 +msgid "View this post" +msgstr "" + +#: library/helpers/widgets.php:145 +msgid "%1$s in %2$s" +msgstr "" + +#: library/helpers/widgets.php:183 +msgid "Title:" +msgstr "" + +#: library/helpers/widgets.php:186 +msgid "Number of posts to display:" +msgstr "" + +#: library/helpers/widgets.php:188 +msgid "(at most 15)" +msgstr "" + +#: search.php:11 +msgid "Search Results" +msgstr "" + +#: search.php:14 +msgid "Your search for %s returned the following results." +msgstr "" + +#: search.php:26 +msgid "No results" +msgstr "" + +#: search.php:29 +msgid "Your search for %1$s returned no results. Try returning to the %2$s." +msgstr "" + +#: searchform.php:1 +msgid "Search this site" +msgstr "" + +#: searchform.php:6 +msgid "Search" +msgstr "" +#. Theme Name of the plugin/theme +msgid "Tarski" +msgstr "" + +#. Theme URI of the plugin/theme +msgid "http://tarskitheme.com/" +msgstr "" + +#. Description of the plugin/theme +msgid "An elegant, flexible theme with built-in display options and alternate styles. Tarski includes support for aside-style posts, comes with numerous default header images, and translations are available for over 20 different languages. It is extremely customisable, both by the usual WordPress mechanisms such as custom headers, backgrounds and menus, but also by its support for custom CSS files and an extensive, well-documented API that gives child theme and plugin authors a huge amount of control without needing to modify the theme's files, making upgrading to new versions simple." +msgstr "" + +#. Author of the plugin/theme +msgid "Benedict Eastaugh" +msgstr "" + +#. Author URI of the plugin/theme +msgid "http://extralogical.net" +msgstr "" + +#. Tags of the plugin/theme +msgid "white, two-columns, left-sidebar, right-sidebar, fixed-width, custom-colors, custom-header, custom-background, custom-menu, editor-style, theme-options, threaded-comments, sticky-post, microformats, rtl-language-support, translation-ready" +msgstr "" diff --git a/library/classes/options.php b/library/classes/options.php index 0220484..aa42b4b 100644 --- a/library/classes/options.php +++ b/library/classes/options.php @@ -71,7 +71,7 @@ function __wakeup() { */ function set_defaults() { $this->defaults = array( - 'installed' => theme_version('current'), + 'installed' => wp_get_theme()->Version, 'update_notification' => true, 'header' => 'greytree.jpg', 'display_title' => true, diff --git a/library/core.php b/library/core.php index cca2fc9..8884ff9 100644 --- a/library/core.php +++ b/library/core.php @@ -4,19 +4,6 @@ * @subpackage Tarski */ -/** - * Return the current theme version. - * - * @since 2.0 - * @return string - */ -function theme_version() { - $themedata = get_theme_data(get_template_directory() . '/style.css'); - $version = trim($themedata['Version']); - - return strlen($version) > 0 ? $version : ''; -} - /** * Check whether a given file name is a valid Tarski stylesheet name. * @@ -60,7 +47,7 @@ function tarski_asset_path($path) { * theme (if one is being used). * * @uses get_tarski_option - * @uses get_current_theme + * @uses wp_get_theme * @uses get_template_directory_uri * @uses get_stylesheet_directory_uri * @@ -70,12 +57,13 @@ function _tarski_list_header_images() { $headers = array(); $dirs = array('Tarski' => get_template_directory()); $current = get_tarski_option('header'); - $theme = get_current_theme(); + $theme = wp_get_theme(); - if (get_template_directory() != get_stylesheet_directory()) - $dirs[$theme] = get_stylesheet_directory(); + if (strlen($theme->Template) > 0) { + $dirs[$theme->Name] = get_stylesheet_directory(); + } - foreach ($dirs as $theme => $dir) { + foreach ($dirs as $theme_name => $dir) { $dirpath = $dir . '/headers'; if (is_dir($dirpath)) @@ -86,7 +74,7 @@ function _tarski_list_header_images() { while ($file = $header_dir->read()) { if (preg_match('/^[^.].+\.(jpg|png|gif)/', $file) && !preg_match('/-thumb\.(jpg|png|gif)$/', $file)) { - $name = $theme . '/' . $file; + $name = $theme_name . '/' . $file; $id = 'header_' . preg_replace('/[^a-z_]/', '_', strtolower($name)); $path = $dir == get_template_directory() ? '%1$s' : '%2$s'; $thumb = preg_replace('/(\.(?:png|gif|jpg))/', '-thumb\\1', $file); @@ -94,7 +82,7 @@ function _tarski_list_header_images() { ? get_template_directory_uri() : get_stylesheet_directory_uri()); $is_current = is_string($current) && $current == $file || - $current[0] == $theme && $current[1] == $file; + $current[0] == $theme_name && $current[1] == $file; $headers[] = array( 'name' => $name, 'id' => $id, diff --git a/library/css/editor.css b/library/css/editor.css index dcc0b89..db3ea18 100644 --- a/library/css/editor.css +++ b/library/css/editor.css @@ -1 +1 @@ -.mceContentBody{font-family:Verdana, Helvetica, Arial, sans-serif;font-size:76%;line-height:120%;color:#404040}.mceContentBody p{margin:0 0 1em 0;line-height:1.4}.mceContentBody blockquote{margin:0 0 1em 0;padding:0 30px;color:#808080}.mceContentBody strong{font-weight:bold}.mceContentBody em{font-style:italic}.mceContentBody acronym,.mceContentBody abbr{border-bottom:1px solid #8fb7bf}.mceContentBody small{font-size:0.8em}.mceContentBody sup,.mceContentBody sub{font-size:75%}.mceContentBody sup{vertical-align:super}.mceContentBody sub{vertical-align:sub}.mceContentBody hr{width:100%;height:1px;background:#ccc;color:#ccc;margin:1em 0;border:none;padding:0}.mceContentBody pre,.mceContentBody code,.mceContentBody tt{font-family:'Courier', 'Courier New', monospace;font-size:1em;line-height:1.8;color:#4d4d4d}.mceContentBody pre{margin:0 0 1em 0;border:1px solid #e5e5e5;padding:0.5em 1em;white-space:pre-wrap;overflow:hidden;background:#fafafa}.mceContentBody code,.mceContentBody tt{background:#efefef}.mceContentBody pre code,.mceContentBody pre tt{background:none}.mceContentBody html > body .mceContentBody code,html > body .mceContentBody tt,html > body .mceContentBody pre{font-size:12px}.mceContentBody h3 code{text-transform:none}.mceContentBody ul,.mceContentBody ol{margin:0 0 1em 15px;padding:0}.mceContentBody ul{list-style:disc}.mceContentBody li{margin:0 0 0.25em 0;line-height:1.4}body.rtl .mceContentBody ul,body.rtl .mceContentBody ol{margin:0 15px 1em 0;padding:0}.mceContentBody h1{font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;line-height:120%;margin:0;border-bottom:1px solid #ccc;padding:0 0 0.1em 0}.mceContentBody h2{font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;line-height:120%;margin:0 0 0.5em 0}.mceContentBody h3{font-size:0.8em;font-weight:normal;color:#8fbf60;text-transform:uppercase;letter-spacing:0.1em;margin:0 0 0.8em 0;border-bottom:1px solid #e5e5e5;padding:0 0 0.4em 0}.mceContentBody h4{font-family:'Times New Roman', Times, serif;font-size:1.5em;font-weight:normal;line-height:120%;margin:0 0 0.3em 0}.mceContentBody h5{font-size:1em;font-weight:bold;line-height:120%;margin:0 0 0.3em 0;padding:0}.mceContentBody h6{font-size:0.8em;font-weight:bold;line-height:120%;margin:0 0 0.3em 0;padding:0}.mceContentBody .insertright{margin:0 0 20px 20px;width:220px;float:right}.mceContentBody .insertleft{margin:0 20px 20px 0;width:220px;float:left}.mceContentBody .insert{background:#fcffff;margin:0 0 1em 0;border:1px solid #cfe2e5;padding:9px}.mceContentBody .insert h3{border-bottom:1px solid #cfe2e5}.mceContentBody a.download{display:block;margin:1em 0;padding:5px 5px 5px 28px;min-height:15px}body .mceContentBody a.download:link,body .mceContentBody a.download:visited,body .mceContentBody a.download:active{background:#fcffff url('images/icons.png') no-repeat 5px -295px;border:1px solid #cfe2e5}body .mceContentBody a.download:hover{text-decoration:underline}.mceContentBody a img{border:1px solid #006a80}.mceContentBody a:hover img{border:1px solid #a8001c}.mceContentBody a.imagelink2 img,.mceContentBody a.imagelink2:hover img,.mceContentBody a.imagelink:link,.mceContentBody a.imagelink:visited,.mceContentBody a.imagelink:hover,.mceContentBody a.imagelink:active,.mceContentBody a.imagelink2:link,.mceContentBody a.imagelink2:visited,.mceContentBody a.imagelink2:hover,.mceContentBody a.imagelink2:active{border:none}.mceContentBody .imageleft,.mceContentBody .alignleft{float:left;margin:0 10px 10px 0}.mceContentBody .imageright,.mceContentBody .alignright{float:right;margin:0 0 10px 10px}.mceContentBody .imageblock{display:block;margin:0 0 1em 0}.mceContentBody .imagecentre,.mceContentBody .imagecenter,.mceContentBody .centered,.mceContentBody .aligncenter{display:block;text-align:center;margin:0 auto 1em auto}.mceContentBody .attachment a{border-bottom:none}.mceContentBody .wp-caption{margin-bottom:10px;border:1px solid #e5e5e5;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.mceContentBody .wp-caption{margin-bottom:10px;border:1px solid #e5e5e5;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding-bottom:2px}.mceContentBody .wp-caption a{display:block;margin:4px;border:none}.mceContentBody .wp-caption img{display:block}.mceContentBody .wp-caption .wp-caption-text{margin:4px;font-size:0.9em}.mceContentBody .wp-caption .wp-caption-text{margin:3px 4px 2px;font-size:0.9em;text-align:center} \ No newline at end of file +.mceContentBody{font-family:Verdana, Helvetica, Arial, sans-serif;font-size:76%;line-height:120%;color:#404040}.mceContentBody p{margin:0 0 1em 0;line-height:1.4}.mceContentBody blockquote{margin:0 0 1em 0;padding:0 30px;color:#808080}.mceContentBody strong{font-weight:bold}.mceContentBody em{font-style:italic}.mceContentBody acronym,.mceContentBody abbr{border-bottom:1px solid #8fb7bf}.mceContentBody small{font-size:0.8em}.mceContentBody sup,.mceContentBody sub{font-size:75%}.mceContentBody sup{vertical-align:super}.mceContentBody sub{vertical-align:sub}.mceContentBody hr{width:100%;height:1px;background:#ccc;color:#ccc;margin:1em 0;border:none;padding:0}.mceContentBody pre,.mceContentBody code,.mceContentBody tt{font-family:'Courier', 'Courier New', monospace;font-size:1em;line-height:1.8;color:#4d4d4d}.mceContentBody pre{margin:0 0 1em 0;border:1px solid #e5e5e5;padding:0.5em 1em;white-space:pre-wrap;overflow:hidden;background:#fafafa}.mceContentBody code,.mceContentBody tt{background:#efefef}.mceContentBody pre code,.mceContentBody pre tt{background:none}.mceContentBody html>body .mceContentBody code,html>body .mceContentBody tt,html>body .mceContentBody pre{font-size:12px}.mceContentBody h3 code{text-transform:none}.mceContentBody ul,.mceContentBody ol{margin:0 0 1em 15px;padding:0}.mceContentBody ul{list-style:disc}.mceContentBody li{margin:0 0 0.25em 0;line-height:1.4}body.rtl .mceContentBody ul,body.rtl .mceContentBody ol{margin:0 15px 1em 0;padding:0}.mceContentBody h1{font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;line-height:120%;margin:0;border-bottom:1px solid #ccc;padding:0 0 0.1em 0}.mceContentBody h2{font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;line-height:120%;margin:0 0 0.5em 0}.mceContentBody h3{font-size:0.8em;font-weight:normal;color:#8fbf60;text-transform:uppercase;letter-spacing:0.1em;margin:0 0 0.8em 0;border-bottom:1px solid #e5e5e5;padding:0 0 0.4em 0}.mceContentBody h4{font-family:'Times New Roman', Times, serif;font-size:1.5em;font-weight:normal;line-height:120%;margin:0 0 0.3em 0}.mceContentBody h5{font-size:1em;font-weight:bold;line-height:120%;margin:0 0 0.3em 0;padding:0}.mceContentBody h6{font-size:0.8em;font-weight:bold;line-height:120%;margin:0 0 0.3em 0;padding:0}.mceContentBody .insertright{margin:0 0 20px 20px;width:220px;float:right}.mceContentBody .insertleft{margin:0 20px 20px 0;width:220px;float:left}.mceContentBody .insert{background:#fcffff;margin:0 0 1em 0;border:1px solid #cfe2e5;padding:9px}.mceContentBody .insert h3{border-bottom:1px solid #cfe2e5}.mceContentBody a.download{display:block;margin:1em 0;padding:5px 5px 5px 28px;min-height:15px}body .mceContentBody a.download:link,body .mceContentBody a.download:visited,body .mceContentBody a.download:active{background:#fcffff url('images/icons.png') no-repeat 5px -295px;border:1px solid #cfe2e5}body .mceContentBody a.download:hover{text-decoration:underline}.mceContentBody a img{border:1px solid #006a80}.mceContentBody a:hover img{border:1px solid #a8001c}.mceContentBody a.imagelink2 img,.mceContentBody a.imagelink2:hover img,.mceContentBody a.imagelink:link,.mceContentBody a.imagelink:visited,.mceContentBody a.imagelink:hover,.mceContentBody a.imagelink:active,.mceContentBody a.imagelink2:link,.mceContentBody a.imagelink2:visited,.mceContentBody a.imagelink2:hover,.mceContentBody a.imagelink2:active{border:none}.mceContentBody .imageleft,.mceContentBody .alignleft{float:left;margin:0 10px 10px 0}.mceContentBody .imageright,.mceContentBody .alignright{float:right;margin:0 0 10px 10px}.mceContentBody .imageblock{display:block;margin:0 0 1em 0}.mceContentBody .imagecentre,.mceContentBody .imagecenter,.mceContentBody .centered,.mceContentBody .aligncenter{display:block;text-align:center;margin:0 auto 1em auto}.mceContentBody .attachment a{border-bottom:none}.mceContentBody .wp-caption{margin-bottom:10px;border:1px solid #e5e5e5;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.mceContentBody .wp-caption{margin-bottom:10px;border:1px solid #e5e5e5;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding-bottom:2px}.mceContentBody .wp-caption a{display:block;margin:4px;border:none}.mceContentBody .wp-caption img{display:block}.mceContentBody .wp-caption .wp-caption-text{margin:4px;font-size:0.9em}.mceContentBody .wp-caption .wp-caption-text{margin:3px 4px 2px;font-size:0.9em;text-align:center} \ No newline at end of file diff --git a/library/helpers/admin_helper.php b/library/helpers/admin_helper.php index ccf2f76..954eecc 100644 --- a/library/helpers/admin_helper.php +++ b/library/helpers/admin_helper.php @@ -120,14 +120,14 @@ function maybe_wipe_tarski_options() { * * @uses get_option * @uses get_tarski_option - * @uses theme_version + * @uses wp_get_theme * * @return boolean */ function tarski_upgrade_needed() { if (!get_option('tarski_options')) return false; $installed = get_tarski_option('installed'); - return empty($installed) || version_compare($installed, theme_version('current')) === -1; + return empty($installed) || version_compare($installed, wp_get_theme()->Version) === -1; } /** @@ -182,7 +182,7 @@ function tarski_upgrade() { $options = get_option('tarski_options'); // Update the options version so we don't run this code more than once - $options->installed = theme_version('current'); + $options->installed = wp_get_theme()->Version; // Handle special cases first tarski_upgrade_special($options, null); @@ -256,7 +256,7 @@ function tarski_inject_styles() { * * @uses get_tarski_option * @uses is_valid_tarski_style - * @uses get_current_theme + * @uses wp_get_theme * * @return array */ @@ -264,7 +264,7 @@ function _tarski_list_alternate_styles() { $styles = array(); $dirs = array('Tarski' => get_template_directory()); $current_style = get_tarski_option('style'); - $current_theme = get_current_theme(); + $current_theme = wp_get_theme()->Name; if (get_template_directory() != get_stylesheet_directory()) $dirs[$current_theme] = get_stylesheet_directory(); @@ -317,8 +317,7 @@ function tarski_miscellaneous_options() { 'centred_theme' => __('Centrally align the theme', 'tarski'), 'swap_sides' => __('Switch column order', 'tarski'), 'swap_title_order' => __('Reverse document title order', 'tarski'), - 'featured_header' => __('Featured images in header', 'tarski'), - ); + 'featured_header' => __('Display featured images in header', 'tarski')); foreach ($checkboxes as $name => $label) $output .= tarski_option_checkbox($name, $label) . "\n\n"; @@ -396,4 +395,4 @@ function tarski_option_checkbox($name, $label) { $id, $hidden, $checkbox, $label); } -?> +?> \ No newline at end of file diff --git a/library/helpers/template_helper.php b/library/helpers/template_helper.php index 6f260f3..45fd091 100644 --- a/library/helpers/template_helper.php +++ b/library/helpers/template_helper.php @@ -10,7 +10,7 @@ * @uses get_tarski_option * @uses get_template_directory_uri * @uses get_stylesheet_directory_uri - * @uses get_current_theme + * @uses wp_get_theme * * @return string */ @@ -21,7 +21,7 @@ function _tarski_get_alternate_stylesheet_uri() { if (is_string($style) && strlen($style) > 0) { $file = $style; } elseif (is_array($style)) { - if ($style[0] == get_current_theme()) { + if ($style[0] == wp_get_theme()->Name) { $path = get_stylesheet_directory_uri(); $file = $style[1]; } elseif ('Tarski' == $style[0]) { @@ -120,7 +120,7 @@ function trim_gallery_style($style) { * * @since 2.7 * - * @uses theme_version + * @uses wp_get_theme * @uses get_bloginfo * @uses get_option * @uses _tarski_asset_output @@ -137,7 +137,7 @@ function trim_gallery_style($style) { function tarski_meta() { global $wp_query; - $themeversion = theme_version(); + $themeversion = wp_get_theme()->Version; $excerpt = (isset($wp_query->post)) ? trim(strip_tags(esc_attr($wp_query->post->post_excerpt))) : ''; @@ -168,7 +168,7 @@ function tarski_meta() { * * @uses wp_enqueue_script * @uses tarski_asset_path - * @uses theme_version + * @uses wp_get_theme * * @see tarski_meta * @see tarski_stylesheets @@ -178,7 +178,7 @@ function tarski_meta() { function tarski_enqueue_scripts() { wp_enqueue_script('tarski', tarski_asset_path('app/js/tarski.js'), - array('jquery'), theme_version()); + array('jquery'), wp_get_theme()->Version); wp_enqueue_script('comment-reply'); } @@ -277,32 +277,37 @@ function _tarski_asset_output($type, $assets) { * @uses user_trailingslashit * @uses home_url * + * @global object $post + * * @return string */ function tarski_headerimage() { global $post; + if (!get_theme_mod('header_image')) return; $header_img_url = get_header_image(); - // inspired by twentyeleven - if ( get_tarski_option('featured_header') && - is_singular() && - has_post_thumbnail( $post->ID ) && - ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( HEADER_IMAGE_WIDTH, HEADER_IMAGE_WIDTH ) ) ) && - $image[1] >= HEADER_IMAGE_WIDTH ) - // Houston, we have a new header image! - $header_img_tag = get_the_post_thumbnail( $post->ID, 'post-thumbnail' ); - else { + if (get_tarski_option('featured_header') && + is_singular($post) && + has_post_thumbnail($post->ID)) { + $image_size = array(HEADER_IMAGE_WIDTH, HEADER_IMAGE_WIDTH); + $image_id = get_post_thumbnail_id($post->ID); + $image = wp_get_attachment_image_src($image_id, $image_size); + + if ($image[1] >= HEADER_IMAGE_WIDTH) { + $header_img_tag = get_the_post_thumbnail($post->ID, $image_size); + } + } if (!$header_img_url) return; - $header_img_tag = sprintf('%s', - get_tarski_option('display_title') - ? __('Header image', 'tarski') - : get_bloginfo('name'), - $header_img_url); - + if (!isset($header_img_tag)) { + $header_img_tag = sprintf('%s', + get_tarski_option('display_title') + ? __('Header image', 'tarski') + : get_bloginfo('name'), + $header_img_url); } if (!(get_tarski_option('display_title') || is_front_page())) @@ -600,4 +605,4 @@ function tarski_credits() { get_template_part('app/templates/credits'); } -?> +?> \ No newline at end of file diff --git a/style.css b/style.css index 4fef638..422de67 100644 --- a/style.css +++ b/style.css @@ -5,8 +5,8 @@ Description: An elegant, flexible theme with built-in display options and altern Author: Benedict Eastaugh Author URI: http://extralogical.net Tags: white, two-columns, left-sidebar, right-sidebar, fixed-width, custom-colors, custom-header, custom-background, custom-menu, editor-style, theme-options, threaded-comments, sticky-post, microformats, rtl-language-support, translation-ready -Version: 3.2.0 +Version: 3.2.0RC1 License: GNU General Public License, v2 License URI: http://www.opensource.org/licenses/gpl-2.0.html */ -html,body,form,fieldset{margin:0;padding:0}form label{cursor:pointer}fieldset{border:none}body{min-width:760px;font-family:Verdana, Helvetica, Arial, sans-serif;font-size:76%;line-height:120%;color:#404040;background:#fff}#wrapper{width:760px;text-align:left}body.rtl #wrapper{text-align:right;direction:rtl}#header,#content{margin-bottom:2em;padding-left:20px;padding-right:20px}#footer,#theme-info,#footer-include{clear:both}.clearfix:before,.clearfix:after{content:"\0020";display:block;height:0;overflow:hidden}.clearfix:after{clear:both}.clearfix{zoom:1}body .primary{width:500px;float:right}body.janus .primary{float:left}body .primary-span{padding-left:220px;clear:both}body.janus .primary-span{padding-left:0;padding-right:220px}body .secondary{width:200px;float:left}body.janus .secondary{float:right}body .secondary-span{padding-left:520px;clear:both}body.janus .secondary-span{padding-left:0;padding-right:520px}body{text-align:left}body.rtl{text-align:right}body.centre{text-align:center}body #wrapper{margin:0 auto 0 0}body.rtl #wrapper{margin:0 0 0 auto}body.centre #wrapper{margin:0 auto}#header-image{overflow:hidden;margin:0 0 -20px 0}#header-image a{text-decoration:none;border:none}#header-image a img{border:none}#title{margin:20px 0 -20px;border-bottom:1px solid #ccc}#navigation{margin:20px 0 0 0;border-bottom:1px solid #ccc}#navigation{position:relative}#navigation .secondary{padding:5px 0}#navigation ul{list-style:none;margin:0;padding:0}body.rtl #navigation ul{direction:ltr}#navigation li{display:block;margin:0 15px 0 0;padding:6px 0 7px 0;float:left;position:relative}#navigation .menu-item a{display:block}#navigation .sub-menu{display:none;min-width:130px;position:absolute;left:-10px;top:100%;z-index:2;margin:0;padding:0 10px 3px;border:1px solid #ccc;border-top-color:#fff;background:#fff}#navigation .menu-item:hover .sub-menu{display:block}#navigation .sub-menu .sub-menu{position:static;background:none;border:none;padding:0}#navigation .sub-menu .menu-item{float:none;margin:7px 0;padding:0}#navigation .sub-menu .sub-menu .menu-item{padding:0 0 0 16px;background:url('images/icons.png') no-repeat 2px -694px}#wrapper .current-menu-item > a:link,#wrapper .current-menu-item > a:visited,#wrapper .current-menu-item > a:active,#wrapper .current_page_item > a:link,#wrapper .current_page_item > a:visited,#wrapper .current_page_item > a:active{color:#8fbf60}#wrapper .current-menu-item > a:hover,#wrapper .current_page_item > a:hover{color:#a8001c}#navigation .secondary p{margin:0}#navigation .navbar-toggle{font-size:0.8em;position:absolute;top:7px;right:0;padding-right:13px;background:url('images/icons.png') no-repeat 100% -797px;cursor:pointer}#navigation .navbar-toggle:hover{text-decoration:underline}body.janus #navigation .secondary p,body.janus #theme-info .secondary p{text-align:right}body .feed{display:block;float:left;padding:1px 0 1px 20px;min-height:15px;font-size:0.8em;background:url('images/icons.png') no-repeat 0 1px}body.janus .feed,body.rtl .feed{float:right;padding:1px 20px 1px 0;background-position:100% 1px}p{margin:0 0 1em 0}blockquote{margin:0 0 1em 0;padding:0 30px;color:#808080}strong{font-weight:bold}em{font-style:italic}acronym,abbr{border-bottom:1px solid #8fb7bf}small{font-size:0.8em}sup,sub{font-size:75%}sup{vertical-align:super}sub{vertical-align:sub}hr{width:100%;height:1px;background:#ccc;color:#ccc;margin:1em 0;border:none;padding:0}pre,code,tt{font-family:'Courier', 'Courier New', monospace;font-size:1em;line-height:1.8;color:#4d4d4d}pre{margin:0 0 1em 0;border:1px solid #e5e5e5;padding:0.5em 1em;white-space:pre-wrap;overflow:hidden;background:#fafafa}code,tt{background:#efefef}pre code,pre tt{background:none}html > body code,html > body tt,html > body pre{font-size:12px}h3 code{text-transform:none}ul,ol{margin:0 0 1em 15px;padding:0}ul{list-style:disc}li{margin:0 0 0.25em 0}body.rtl ul,body.rtl ol{margin:0 15px 1em 0;padding:0}body .content img{max-width:500px;height:auto}body .content a img{max-width:498px}body .content p{line-height:1.4}body .content li{line-height:1.4}#blog-title{font-family:'Times New Roman', Times, serif;font-size:2.5em;font-weight:normal;margin:0;border:none;padding:0;line-height:120%}#tagline{font-family:'Times New Roman', Times, serif;font-size:1.5em;font-weight:normal;font-style:italic;color:#808080;margin:0.1em 0 0.3em 0;border:none;padding:0;line-height:120%}h1,body .entry .title{font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;line-height:120%;margin:0;border-bottom:1px solid #ccc;padding:0 0 0.1em 0}h2{font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;line-height:120%;margin:0 0 0.5em 0}h3{font-size:0.8em;font-weight:normal;color:#8fbf60;text-transform:uppercase;letter-spacing:0.1em;margin:0 0 0.8em 0;border-bottom:1px solid #e5e5e5;padding:0 0 0.4em 0}h4{font-family:'Times New Roman', Times, serif;font-size:1.5em;font-weight:normal;line-height:120%;margin:0 0 0.3em 0}h5{font-size:1em;font-weight:bold;line-height:120%;margin:0 0 0.3em 0;padding:0}h6{font-size:0.8em;font-weight:bold;line-height:120%;margin:0 0 0.3em 0;padding:0}body .articlenav{margin:0 0 2em 0;border-bottom:1px solid #e5e5e5;padding-top:0.75em;padding-bottom:0.75em;background:#fcffff;color:#808080}body.janus .articlenav{text-align:right}body.rtl .articlenav{border-bottom:1px solid #e5e5e5}body .entry{margin:0 0 2em 0;clear:both}body .posts .entry{margin:0 0 4em 0}body .entry .meta{margin:0 0 1em 0}body .entry .metadata{font-size:0.8em;color:#808080;margin:0;padding:0}body .entry .meta .metadata{margin:0;padding:0.3em 0 0 0}body .aside{margin:0 0 4em 0}body .aside .meta{margin:-0.8em 0 0 0;border-top:1px dotted #d9d9d9;padding:0.2em 0 0 0;color:#808080;font-size:0.8em;text-align:right;clear:both}body .archive{margin:0 0 2em 0}body .archive .meta{margin:0 0 1em 0}body .link-pages{font-size:0.8em;color:#808080;clear:both}body .pagination{margin:0;font-family:'Times New Roman', Times, serif;font-size:1.5em;font-weight:normal;line-height:120%;color:#808080;clear:both}.sticky{background-color:inherit}body .insertright{margin:0 0 20px 20px;width:220px;float:right}body .insertleft{margin:0 20px 20px 0;width:220px;float:left}body .insert{background:#fcffff;margin:0 0 1em 0;border:1px solid #cfe2e5;padding:9px}body .insert h3{border-bottom:1px solid #cfe2e5}body a.download{display:block;margin:1em 0;padding:5px 5px 5px 28px;min-height:15px}body .content a.download:link,body .content a.download:visited,body .content a.download:active{background:#fcffff url('images/icons.png') no-repeat 5px -295px;border:1px solid #cfe2e5}body .content a.download:hover{text-decoration:underline}a img{border:1px solid #006a80}a:hover img,body .comment a:hover .avatar{border:1px solid #a8001c}#wrapper .gallery a:link,#wrapper .gallery-item a:visited,#wrapper .gallery-item a:hover,#wrapper .gallery-item a:active,#wrapper a.imagelink2 img,#wrapper a.imagelink2:hover img,#wrapper a.imagelink:link,#wrapper a.imagelink:visited,#wrapper a.imagelink:hover,#wrapper a.imagelink:active,#wrapper a.imagelink2:link,#wrapper a.imagelink2:visited,#wrapper a.imagelink2:hover,#wrapper a.imagelink2:active{border:none}body .imageleft,body .alignleft{float:left;margin:0 10px 10px 0}body .imageright,body .alignright{float:right;margin:0 0 10px 10px}body .imageblock{display:block;margin:0 0 1em 0}body .imagecentre,body .imagecenter,body .centered,body .aligncenter{display:block;text-align:center;margin:0 auto 1em auto}body .gallery{margin:0 auto 1em 0}body .gallery-item{float:left;margin-top:10px;text-align:center}body #wrapper .content .gallery-item a,body #wrapper .content .attachment a{border-bottom:none}body .gallery-caption{margin-left:0}body .wp-caption{max-width:490px;margin-bottom:10px;border:1px solid #e5e5e5;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:4px 4px 2px 4px}#wrapper .wp-caption a{display:block;margin:0;border:none}body .content .wp-caption img{max-width:490px;display:block}body .content .wp-caption a img{max-width:488px}body .wp-caption .wp-caption-text{margin:3px 0 2px;font-size:0.9em;text-align:center}body .tagdata{font-size:0.8em;color:#808080;clear:both}body .tagcloud a{margin:0 2px 0 0}body .post-brief{margin:0 0 2em 0}body .post-brief h3{margin:0 0 0.2em 0}body .post-brief p.post-metadata{color:#808080;margin:0 0 0.2em 0;border:none;padding:0}body .post-brief p.excerpt{margin:0}#comments{clear:both;margin:0;padding:0}body .comment,body .trackback,body .pingback{padding:0;list-style:none}body .comment .comment{margin:0}li.comment,li.trackback,li.pingback{margin:0;border-top:1px solid #ccc;padding:0}body .comment ol.children,body .trackback ol.children,body .pingback ol.children{clear:both;margin:0;border-top:1px solid #ccc;padding:0 0 0 20px}body.rtl .comment ol.children,body.rtl .trackback ol.children,body.rtl .pingback ol.children{padding:0 20px 0 0}body p.pingdata{margin:0;font-size:0.8em;color:#808080}li.comment-lvl-first{border-top:none}body .comment .reply{clear:both}body .comment .reply a{padding-left:13px;background:url('images/icons.png') no-repeat -7px -398px}body.rtl .comment .reply a{background:url('images/icons.png') no-repeat -7px -598px}body .comment-wrapper{padding:0.66em 0}body .moderated{border-bottom:1px solid #e5e5e5;padding-bottom:0.66em;background:url('images/icons.png') no-repeat 100% -200px}body .comment-meta{margin:0;float:left;font-size:0.8em;color:#808080}body.rtl .comment-meta{float:right}body .avatar-link{display:block;float:right;margin:0 0 10px 10px}body.rtl .avatar-link{float:left;margin:0 10px 10px 0}body .avatar,body .comment a .avatar{display:block;float:right;margin:0 0 10px 10px;border:1px solid #ccc;padding:4px;background:#fcfcfc}body.rtl .avatar,body.rtl .comment a .avatar{float:left;margin:0 10px 10px 0}body .comment .avatar-link .avatar{float:none;margin:0}body .comment-author{font-weight:bold;color:#404040}body .comment-content{clear:left;padding-top:0.8em}body.rtl .comment-content{clear:right}body .reply{margin:0;font-size:0.8em}body .trackback{margin:0;border-top:1px solid #ccc;padding:0.5em 0;background:#fcffff}body .trackback p{font-size:0.8em;margin:0}.bypostauthor{background-color:inherit}#comments-header .title{width:49.5%;float:left;margin:0 0 0.1em 0;border:none}.rtl #comments-header .title{float:right}#comments-header .comments-feed{width:49.5%;float:right;text-align:right;margin:0;padding:0.75em 0 0 0}#comments-header .comments-feed a{display:block;float:right;min-height:16px;padding:1px 20px 1px 0;background:url('images/icons.png') no-repeat 100% -100px;font-size:0.8em}.rtl #comments-header .comments-feed a{float:left;padding:1px 20px 1px 0}#comments-header .trackback-link{clear:both;margin:0.4em 0 0 0;border-top:1px solid #ccc;padding:0.5em 0;font-size:0.8em;font-weight:bold;color:#808080}#comments-header .trackback-link a{font-weight:normal}#comment-paging{padding:0.5em 0}#comment-paging{margin:0;border-top:1px solid #ccc;font-family:'Times New Roman', Times, serif;font-size:1.5em;color:#808080}#comment-paging span.page-numbers{color:#404040}#comments-closed{margin:0;border-top:1px solid #e5e5e5;padding-top:0.66em}body .navlist{list-style:none;margin:0 0 1em 0}body .navlist li{margin:0.5em 0}body .navlist ul{list-style:none;margin:0 0 0 1em}body .navlist ul li{margin:0.5em 0}#wrapper .navlist a:link,#wrapper .navlist a:visited,#wrapper .navlist a:hover,#wrapper .navlist a:active{border-bottom:none}body .archivelist{list-style:none;margin:0.5em 0 1em 0}body .archivelist li{margin:0.5em 0}body .archivelist ul{list-style:none;margin:0 0 0 1.5em}body .archivelist ul li{margin:0.5em 0}body .postspermonth{list-style:none;margin:0.5em 0 1em 0}body .postspermonth li{margin:0.5em 0}body .bookmarks ul{list-style:none;margin:0 0 1em 0}body .bookmarks ul li{margin:0.5em 0}#footer{margin:0 20px 0 20px;border-top:3px double #ccc;padding:1em 0 0 0}.recent-articles ul{list-style:none;margin:0}.recent-articles li{margin:0}h4.recent-title{margin:0}.recent-metadata{font-size:0.8em;color:#808080;margin:0 0 0.5em 0}.recent-excerpt{line-height:1.4;margin:0 0 1em 0}#theme-info{margin:0.5em 0 0 0;border-top:3px double #ccc;padding:1em 0 0.5em 0;color:#808080}.tarski input,.tarski select,.tarski textarea{font-family:Verdana, Helvetica, Arial, sans-serif;font-size:100%}.tarski input.text,.tarski input[type=text],.tarski input[type=password],.tarski textarea{border:1px solid #ccc;padding:2px;background:#fafafa;color:#404040}.tarski input::-webkit-input-placeholder{color:#404040}.tarski input.text:focus,.tarski input[type=text]:focus,.tarski input[type=password]:focus,.tarski textarea:focus{background:#fff}.tarski input[type=submit]:enabled,.tarski button:enabled{border:1px solid #ccc;padding:2px 10px;border-radius:10px;-webkit-border-radius:10px;-moz-border-radius:10px;background:url('images/button_gradient.png') repeat-x 0 0;color:#404040;cursor:pointer}.tarski input[type=submit]:enabled:focus,.tarski input[type=submit]:enabled:hover,.tarski button:enabled:focus,.tarski button:enabled:hover{border-color:#666}body .searchbox{width:200px;margin:0 0 1em 0}#s{display:block;width:194px;margin:0 0 0.6em 0;border:1px solid #ccc;padding:2px;background:#fafafa;color:#404040}#s:focus{background:#fff}#respond{padding-top:0.66em;border-top:1px solid #e5e5e5}#reply-title{margin:0 0 0.33em 0;border-bottom:1px solid #ccc;padding:0 0 0.33em 0;font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;text-transform:none;letter-spacing:0;line-height:1;color:#404040}#cancel-comment-reply-link{display:block;float:right;margin:0.75em 0 0.5em 0;padding:0 13px 0.25em 0;font-family:Verdana, Helvetica, Arial, sans-serif;font-size:0.5em;background:url('images/icons.png') no-repeat 100% -498px}body .response-details{margin-bottom:1em}body .response-details .text-wrap{width:31%;float:left;margin-right:2%}body .response-details > .text-wrap{width:32%}body .response-details .url-wrap{margin-right:0}body .response{margin-bottom:0.8em}body .response-details .text-wrap label,body .response label{display:block;height:1.5em;color:#808080}body .response-details .text-wrap input.text{display:block;width:98%}body .response textarea{display:block;width:99%}body .req-notice{font-size:0.8em}p.submit-wrapper{margin:0}a{text-decoration:none}a:link,a:visited,a:active{color:#006a80}a:hover{color:#a8001c}body .content a:link,body .content a:active,body .content a:visited,body .link-pages a:link,body .link-pages a:active,body .link-pages a:visited,body .tagdata a:link,body .tagdata a:active,body .tagdata a:visited,body .widget_tag_cloud a:link,body .widget_tag_cloud a:active,body .widget_tag_cloud a:visited{border-bottom:1px solid #cfe2e5}body .content a:hover,body .link-pages a:hover,body .tagdata a:hover,body .widget_tag_cloud a:hover{border-bottom:1px solid #e5cfd2}#wrapper .content h2 a:link,#wrapper .content h2 a:visited,#wrapper .content h2 a:hover,#wrapper .content h2 a:active,#wrapper .content h3 a:link,#wrapper .content h3 a:visited,#wrapper .content h3 a:hover,#wrapper .content h3 a:active,#wrapper .content h4 a:link,#wrapper .content h4 a:visited,#wrapper .content h4 a:hover,#wrapper .content h4 a:active{border:none}body .widget{margin:0 0 2em 0}body .widget ul{margin:0;list-style:none}body .widget ul li{margin:0.5em 0}body .widget ul ul,body .widget ol ol,body .widget ol ul,body .widget ul ol{margin-left:15px}body.rtl .widget ul ul,body.rtl .widget ol ol,body.rtl .widget ol ul,body.rtl .widget ul ol{margin-right:15px}body .widget_tag_cloud{line-height:1.2}body .widget_tag_cloud a{margin:0 2px 0 0}body .widget_calendar table{width:100%}body .widget_calendar caption{margin:0.25em 0 0.2em 0;border-bottom:1px solid #ccc;padding:0 0 0.5em 0;font-family:'Times New Roman', Times, Georgia, serif;font-size:1.5em;text-align:center}body .widget_calendar th,body .widget_calendar td{margin:1px;padding:5px;text-align:center}body .widget_calendar th{background:#fafcfc;font-weight:bold}body .widget_calendar td{background:#edf1f2}body .widget_calendar tbody td a{display:block;margin:-5px;padding:5px;color:#fff;background:#8bb6cc}body .widget_calendar tbody td a:hover{color:#fff;background:#cc8a95}body .widget_calendar td.pad,.widget_calendar tfoot td{background:#fff}body .widget_calendar tfoot td{font-family:'Times New Roman', Times, Georgia, serif;font-size:1.5em}body .widget_calendar #prev{text-align:left}body .widget_calendar #next{text-align:right} +html,body,form,fieldset{margin:0;padding:0}form label{cursor:pointer}fieldset{border:none}body{min-width:760px;font-family:Verdana, Helvetica, Arial, sans-serif;font-size:76%;line-height:120%;color:#404040;background:#fff}#wrapper{width:760px;text-align:left;background-color:#fff}body.rtl #wrapper{text-align:right;direction:rtl}#header,#content{margin-bottom:2em;padding-left:20px;padding-right:20px}#footer,#theme-info,#footer-include{clear:both}.clearfix:before,.clearfix:after{content:"\0020";display:block;height:0;overflow:hidden}.clearfix:after{clear:both}.clearfix{zoom:1}body .primary{width:500px;float:right}body.janus .primary{float:left}body .primary-span{padding-left:220px;clear:both}body.janus .primary-span{padding-left:0;padding-right:220px}body .secondary{width:200px;float:left}body.janus .secondary{float:right}body .secondary-span{padding-left:520px;clear:both}body.janus .secondary-span{padding-left:0;padding-right:520px}body{text-align:left}body.rtl{text-align:right}body.centre{text-align:center}body #wrapper{margin:0 auto 0 0}body.rtl #wrapper{margin:0 0 0 auto}body.centre #wrapper{margin:0 auto}#header-image{overflow:hidden;margin:0 0 -20px 0}#header-image a{text-decoration:none;border:none}#header-image a img{border:none}#title{margin:0 0 -20px;border-bottom:1px solid #ccc;padding-top:20px}#navigation{margin:20px 0 0 0;border-bottom:1px solid #ccc}#navigation{position:relative}#navigation .secondary{padding:5px 0}#navigation ul{list-style:none;margin:0;padding:0}body.rtl #navigation ul{direction:ltr}#navigation li{display:block;margin:0 15px 0 0;padding:6px 0 7px 0;float:left;position:relative}#navigation .menu-item a{display:block}#navigation .sub-menu{display:none;min-width:130px;position:absolute;left:-10px;top:100%;z-index:2;margin:0;padding:0 10px 3px;border:1px solid #ccc;border-top-color:#fff;background:#fff}#navigation .menu-item:hover .sub-menu{display:block}#navigation .sub-menu .sub-menu{position:static;background:none;border:none;padding:0}#navigation .sub-menu .menu-item{float:none;margin:7px 0;padding:0}#navigation .sub-menu .sub-menu .menu-item{padding:0 0 0 16px;background:url('images/icons.png') no-repeat 2px -694px}#wrapper .current-menu-item>a:link,#wrapper .current-menu-item>a:visited,#wrapper .current-menu-item>a:active,#wrapper .current_page_item>a:link,#wrapper .current_page_item>a:visited,#wrapper .current_page_item>a:active{color:#8fbf60}#wrapper .current-menu-item>a:hover,#wrapper .current_page_item>a:hover{color:#a8001c}#navigation .secondary p{margin:0}#navigation .navbar-toggle{font-size:0.8em;position:absolute;top:7px;right:0;padding-right:13px;background:url('images/icons.png') no-repeat 100% -797px;cursor:pointer}#navigation .navbar-toggle:hover{text-decoration:underline}body.janus #navigation .secondary p,body.janus #theme-info .secondary p{text-align:right}body .feed{display:block;float:left;padding:1px 0 1px 20px;min-height:15px;font-size:0.8em;background:url('images/icons.png') no-repeat 0 1px}body.janus .feed,body.rtl .feed{float:right;padding:1px 20px 1px 0;background-position:100% 1px}p{margin:0 0 1em 0}blockquote{margin:0 0 1em 0;padding:0 30px;color:#808080}strong{font-weight:bold}em{font-style:italic}acronym,abbr{border-bottom:1px solid #8fb7bf}small{font-size:0.8em}sup,sub{font-size:75%}sup{vertical-align:super}sub{vertical-align:sub}hr{width:100%;height:1px;background:#ccc;color:#ccc;margin:1em 0;border:none;padding:0}pre,code,tt{font-family:'Courier', 'Courier New', monospace;font-size:1em;line-height:1.8;color:#4d4d4d}pre{margin:0 0 1em 0;border:1px solid #e5e5e5;padding:0.5em 1em;white-space:pre-wrap;overflow:hidden;background:#fafafa}code,tt{background:#efefef}pre code,pre tt{background:none}html>body code,html>body tt,html>body pre{font-size:12px}h3 code{text-transform:none}ul,ol{margin:0 0 1em 15px;padding:0}ul{list-style:disc}li{margin:0 0 0.25em 0}body.rtl ul,body.rtl ol{margin:0 15px 1em 0;padding:0}body .content img{max-width:500px;height:auto}body .content a img{max-width:498px}body .content p{line-height:1.4}body .content li{line-height:1.4}#blog-title{font-family:'Times New Roman', Times, serif;font-size:2.5em;font-weight:normal;margin:0;border:none;padding:0;line-height:120%}#tagline{font-family:'Times New Roman', Times, serif;font-size:1.5em;font-weight:normal;font-style:italic;color:#808080;margin:0.1em 0 0.3em 0;border:none;padding:0;line-height:120%}h1,body .entry .title{font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;line-height:120%;margin:0;border-bottom:1px solid #ccc;padding:0 0 0.1em 0}h2{font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;line-height:120%;margin:0 0 0.5em 0}h3{font-size:0.8em;font-weight:normal;color:#8fbf60;text-transform:uppercase;letter-spacing:0.1em;margin:0 0 0.8em 0;border-bottom:1px solid #e5e5e5;padding:0 0 0.4em 0}h4{font-family:'Times New Roman', Times, serif;font-size:1.5em;font-weight:normal;line-height:120%;margin:0 0 0.3em 0}h5{font-size:1em;font-weight:bold;line-height:120%;margin:0 0 0.3em 0;padding:0}h6{font-size:0.8em;font-weight:bold;line-height:120%;margin:0 0 0.3em 0;padding:0}body .articlenav{margin:0 0 2em 0;border-bottom:1px solid #e5e5e5;padding-top:0.75em;padding-bottom:0.75em;background:#fcffff;color:#808080}body.janus .articlenav{text-align:right}body.rtl .articlenav{border-bottom:1px solid #e5e5e5}body .entry{margin:0 0 2em 0;clear:both}body .posts .entry{margin:0 0 4em 0}body .entry .meta{margin:0 0 1em 0}body .entry .metadata{font-size:0.8em;color:#808080;margin:0;padding:0}body .entry .meta .metadata{margin:0;padding:0.3em 0 0 0}body .aside{margin:0 0 4em 0}body .aside .meta{margin:-0.8em 0 0 0;border-top:1px dotted #d9d9d9;padding:0.2em 0 0 0;color:#808080;font-size:0.8em;text-align:right;clear:both}body .archive{margin:0 0 2em 0}body .archive .meta{margin:0 0 1em 0}body .link-pages{font-size:0.8em;color:#808080;clear:both}body .pagination{margin:0;font-family:'Times New Roman', Times, serif;font-size:1.5em;font-weight:normal;line-height:120%;color:#808080;clear:both}.sticky{background-color:inherit}body .insertright{margin:0 0 20px 20px;width:220px;float:right}body .insertleft{margin:0 20px 20px 0;width:220px;float:left}body .insert{background:#fcffff;margin:0 0 1em 0;border:1px solid #cfe2e5;padding:9px}body .insert h3{border-bottom:1px solid #cfe2e5}body a.download{display:block;margin:1em 0;padding:5px 5px 5px 28px;min-height:15px}body .content a.download:link,body .content a.download:visited,body .content a.download:active{background:#fcffff url('images/icons.png') no-repeat 5px -295px;border:1px solid #cfe2e5}body .content a.download:hover{text-decoration:underline}a img{border:1px solid #006a80}a:hover img,body .comment a:hover .avatar{border:1px solid #a8001c}#wrapper .gallery a:link,#wrapper .gallery-item a:visited,#wrapper .gallery-item a:hover,#wrapper .gallery-item a:active,#wrapper a.imagelink2 img,#wrapper a.imagelink2:hover img,#wrapper a.imagelink:link,#wrapper a.imagelink:visited,#wrapper a.imagelink:hover,#wrapper a.imagelink:active,#wrapper a.imagelink2:link,#wrapper a.imagelink2:visited,#wrapper a.imagelink2:hover,#wrapper a.imagelink2:active{border:none}body .imageleft,body .alignleft{float:left;margin:0 10px 10px 0}body .imageright,body .alignright{float:right;margin:0 0 10px 10px}body .imageblock{display:block;margin:0 0 1em 0}body .imagecentre,body .imagecenter,body .centered,body .aligncenter{display:block;text-align:center;margin:0 auto 1em auto}body .gallery{margin:0 auto 1em 0}body .gallery-item{float:left;margin-top:10px;text-align:center}body #wrapper .content .gallery-item a,body #wrapper .content .attachment a{border-bottom:none}body .gallery-caption{margin-left:0}body .wp-caption{max-width:490px;margin-bottom:10px;border:1px solid #e5e5e5;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:4px 4px 2px 4px}#wrapper .wp-caption a{display:block;margin:0;border:none}body .content .wp-caption img{max-width:490px;display:block}body .content .wp-caption a img{max-width:488px}body .wp-caption .wp-caption-text{margin:3px 0 2px;font-size:0.9em;text-align:center}body .tagdata{font-size:0.8em;color:#808080;clear:both}body .tagcloud a{margin:0 2px 0 0}body .post-brief{margin:0 0 2em 0}body .post-brief h3{margin:0 0 0.2em 0}body .post-brief p.post-metadata{color:#808080;margin:0 0 0.2em 0;border:none;padding:0}body .post-brief p.excerpt{margin:0}#comments{clear:both;margin:0;padding:0}body .comment,body .trackback,body .pingback{padding:0;list-style:none}body .comment .comment{margin:0}li.comment,li.trackback,li.pingback{margin:0;border-top:1px solid #ccc;padding:0}body .comment ol.children,body .trackback ol.children,body .pingback ol.children{clear:both;margin:0;border-top:1px solid #ccc;padding:0 0 0 20px}body.rtl .comment ol.children,body.rtl .trackback ol.children,body.rtl .pingback ol.children{padding:0 20px 0 0}body p.pingdata{margin:0;font-size:0.8em;color:#808080}li.comment-lvl-first{border-top:none}body .comment .reply{clear:both}body .comment .reply a{padding-left:13px;background:url('images/icons.png') no-repeat -7px -398px}body.rtl .comment .reply a{background:url('images/icons.png') no-repeat -7px -598px}body .comment-wrapper{padding:0.66em 0}body .moderated{border-bottom:1px solid #e5e5e5;padding-bottom:0.66em;background:url('images/icons.png') no-repeat 100% -200px}body .comment-meta{margin:0;float:left;font-size:0.8em;color:#808080}body.rtl .comment-meta{float:right}body .avatar-link{display:block;float:right;margin:0 0 10px 10px}body.rtl .avatar-link{float:left;margin:0 10px 10px 0}body .avatar,body .comment a .avatar{display:block;float:right;margin:0 0 10px 10px;border:1px solid #ccc;padding:4px;background:#fcfcfc}body.rtl .avatar,body.rtl .comment a .avatar{float:left;margin:0 10px 10px 0}body .comment .avatar-link .avatar{float:none;margin:0}body .comment-author{font-weight:bold;color:#404040}body .comment-content{clear:left;padding-top:0.8em}body.rtl .comment-content{clear:right}body .reply{margin:0;font-size:0.8em}body .trackback{margin:0;border-top:1px solid #ccc;padding:0.5em 0;background:#fcffff}body .trackback p{font-size:0.8em;margin:0}.bypostauthor{background-color:inherit}#comments-header .title{width:49.5%;float:left;margin:0 0 0.1em 0;border:none}.rtl #comments-header .title{float:right}#comments-header .comments-feed{width:49.5%;float:right;text-align:right;margin:0;padding:0.75em 0 0 0}#comments-header .comments-feed a{display:block;float:right;min-height:16px;padding:1px 20px 1px 0;background:url('images/icons.png') no-repeat 100% -100px;font-size:0.8em}.rtl #comments-header .comments-feed a{float:left;padding:1px 20px 1px 0}#comments-header .trackback-link{clear:both;margin:0.4em 0 0 0;border-top:1px solid #ccc;padding:0.5em 0;font-size:0.8em;font-weight:bold;color:#808080}#comments-header .trackback-link a{font-weight:normal}#comment-paging{padding:0.5em 0}#comment-paging{margin:0;border-top:1px solid #ccc;font-family:'Times New Roman', Times, serif;font-size:1.5em;color:#808080}#comment-paging span.page-numbers{color:#404040}#comments-closed{margin:0;border-top:1px solid #e5e5e5;padding-top:0.66em}body .navlist{list-style:none;margin:0 0 1em 0}body .navlist li{margin:0.5em 0}body .navlist ul{list-style:none;margin:0 0 0 1em}body .navlist ul li{margin:0.5em 0}#wrapper .navlist a:link,#wrapper .navlist a:visited,#wrapper .navlist a:hover,#wrapper .navlist a:active{border-bottom:none}body .archivelist{list-style:none;margin:0.5em 0 1em 0}body .archivelist li{margin:0.5em 0}body .archivelist ul{list-style:none;margin:0 0 0 1.5em}body .archivelist ul li{margin:0.5em 0}body .postspermonth{list-style:none;margin:0.5em 0 1em 0}body .postspermonth li{margin:0.5em 0}body .bookmarks ul{list-style:none;margin:0 0 1em 0}body .bookmarks ul li{margin:0.5em 0}#footer{margin:0 20px 0 20px;border-top:3px double #ccc;padding:1em 0 0 0}.recent-articles ul{list-style:none;margin:0}.recent-articles li{margin:0}h4.recent-title{margin:0}.recent-metadata{font-size:0.8em;color:#808080;margin:0 0 0.5em 0}.recent-excerpt{line-height:1.4;margin:0 0 1em 0}#theme-info{margin:0.5em 0 0 0;border-top:3px double #ccc;padding:1em 0 0.5em 0;color:#808080}.tarski input,.tarski select,.tarski textarea{font-family:Verdana, Helvetica, Arial, sans-serif;font-size:100%}.tarski input.text,.tarski input[type=text],.tarski input[type=password],.tarski textarea{border:1px solid #ccc;padding:2px;background:#fafafa;color:#404040}.tarski input::-webkit-input-placeholder{color:#404040}.tarski input.text:focus,.tarski input[type=text]:focus,.tarski input[type=password]:focus,.tarski textarea:focus{background:#fff}.tarski input[type=submit]:enabled,.tarski button:enabled{border:1px solid #ccc;padding:2px 10px;border-radius:10px;-webkit-border-radius:10px;-moz-border-radius:10px;background:url('images/button_gradient.png') repeat-x 0 0;color:#404040;cursor:pointer}.tarski input[type=submit]:enabled:focus,.tarski input[type=submit]:enabled:hover,.tarski button:enabled:focus,.tarski button:enabled:hover{border-color:#666}body .searchbox{width:200px;margin:0 0 1em 0}#s{display:block;width:194px;margin:0 0 0.6em 0;border:1px solid #ccc;padding:2px;background:#fafafa;color:#404040}#s:focus{background:#fff}#respond{padding-top:0.66em;border-top:1px solid #e5e5e5}#reply-title{margin:0 0 0.33em 0;border-bottom:1px solid #ccc;padding:0 0 0.33em 0;font-family:'Times New Roman', Times, serif;font-size:2em;font-weight:normal;text-transform:none;letter-spacing:0;line-height:1;color:#404040}#cancel-comment-reply-link{display:block;float:right;margin:0.75em 0 0.5em 0;padding:0 13px 0.25em 0;font-family:Verdana, Helvetica, Arial, sans-serif;font-size:0.5em;background:url('images/icons.png') no-repeat 100% -498px}body .response-details{margin-bottom:1em}body .response-details .text-wrap{width:31%;float:left;margin-right:2%}body .response-details>.text-wrap{width:32%}body .response-details .url-wrap{margin-right:0}body .response{margin-bottom:0.8em}body .response-details .text-wrap label,body .response label{display:block;height:1.5em;color:#808080}body .response-details .text-wrap input.text{display:block;width:98%}body .response textarea{display:block;width:99%}body .req-notice{font-size:0.8em}p.submit-wrapper{margin:0}a{text-decoration:none}a:link,a:visited,a:active{color:#006a80}a:hover{color:#a8001c}body .content a:link,body .content a:active,body .content a:visited,body .link-pages a:link,body .link-pages a:active,body .link-pages a:visited,body .tagdata a:link,body .tagdata a:active,body .tagdata a:visited,body .widget_tag_cloud a:link,body .widget_tag_cloud a:active,body .widget_tag_cloud a:visited{border-bottom:1px solid #cfe2e5}body .content a:hover,body .link-pages a:hover,body .tagdata a:hover,body .widget_tag_cloud a:hover{border-bottom:1px solid #e5cfd2}#wrapper .content h2 a:link,#wrapper .content h2 a:visited,#wrapper .content h2 a:hover,#wrapper .content h2 a:active,#wrapper .content h3 a:link,#wrapper .content h3 a:visited,#wrapper .content h3 a:hover,#wrapper .content h3 a:active,#wrapper .content h4 a:link,#wrapper .content h4 a:visited,#wrapper .content h4 a:hover,#wrapper .content h4 a:active{border:none}body .widget{margin:0 0 2em 0}body .widget ul{margin:0;list-style:none}body .widget ul li{margin:0.5em 0}body .widget ul ul,body .widget ol ol,body .widget ol ul,body .widget ul ol{margin-left:15px}body.rtl .widget ul ul,body.rtl .widget ol ol,body.rtl .widget ol ul,body.rtl .widget ul ol{margin-right:15px}body .widget_tag_cloud{line-height:1.2}body .widget_tag_cloud a{margin:0 2px 0 0}body .widget_calendar table{width:100%}body .widget_calendar caption{margin:0.25em 0 0.2em 0;border-bottom:1px solid #ccc;padding:0 0 0.5em 0;font-family:'Times New Roman', Times, Georgia, serif;font-size:1.5em;text-align:center}body .widget_calendar th,body .widget_calendar td{margin:1px;padding:5px;text-align:center}body .widget_calendar th{background:#fafcfc;font-weight:bold}body .widget_calendar td{background:#edf1f2}body .widget_calendar tbody td a{display:block;margin:-5px;padding:5px;color:#fff;background:#8bb6cc}body .widget_calendar tbody td a:hover{color:#fff;background:#cc8a95}body .widget_calendar td.pad,.widget_calendar tfoot td{background:#fff}body .widget_calendar tfoot td{font-family:'Times New Roman', Times, Georgia, serif;font-size:1.5em}body .widget_calendar #prev{text-align:left}body .widget_calendar #next{text-align:right} \ No newline at end of file diff --git a/style.dev.css b/style.dev.css index e9d464b..de6830e 100644 --- a/style.dev.css +++ b/style.dev.css @@ -5,7 +5,7 @@ Description: An elegant, flexible theme with built-in display options and altern Author: Benedict Eastaugh Author URI: http://extralogical.net Tags: white, two-columns, left-sidebar, right-sidebar, fixed-width, custom-colors, custom-header, custom-background, custom-menu, editor-style, theme-options, threaded-comments, sticky-post, microformats, rtl-language-support, translation-ready -Version: 3.2.0 +Version: 3.2.0RC1 License: GNU General Public License, v2 License URI: http://www.opensource.org/licenses/gpl-2.0.html */ @@ -39,6 +39,7 @@ body { #wrapper { width: 760px; text-align: left; + background-color: #fff; } body.rtl #wrapper { @@ -154,8 +155,9 @@ body.centre #wrapper { } #title { - margin: 20px 0 -20px; + margin: 0 0 -20px; border-bottom: 1px solid #ccc; + padding-top: 20px; } #navigation {