Skip to content
Browse files

Updates galore for Prototype.

git-svn-id: http://svn.locallylost.com/themes/prototype/trunk@382 dba0f204-706d-4bc1-bc29-8b92e0485636
  • Loading branch information...
1 parent 839713b commit a1b452016dbbb9cf332829291cd781aa8cf12228 greenshady committed Oct 14, 2010
Showing with 280 additions and 160 deletions.
  1. +1 −1 archive.php
  2. +0 −6 attachment.php
  3. +9 −3 footer.php
  4. +37 −49 functions.php
  5. +15 −5 header.php
  6. +1 −1 index.php
  7. +6 −6 loop-nav.php
  8. +2 −2 menu-primary.php
  9. +2 −2 menu-secondary.php
  10. +2 −2 menu-subsidiary.php
  11. +1 −1 search.php
  12. +204 −82 style.css
View
2 archive.php
@@ -30,7 +30,7 @@
<?php do_atomic( 'open_entry' ); // Open loop hook ?>
- <?php if ( current_theme_supports( 'get-the-image' ) ) get_the_image( array( 'meta_key' => array( 'Thumbnail' ), 'size' => 'news-thumbnail' ) ); ?>
+ <?php if ( current_theme_supports( 'get-the-image' ) ) get_the_image( array( 'meta_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
<?php echo apply_atomic_shortcode( 'entry_title', '[entry-title]' ); ?>
View
6 attachment.php
@@ -29,12 +29,8 @@
<?php do_atomic( 'open_entry' ); // Open loop hook ?>
- <?php echo apply_atomic_shortcode( 'entry_utility', '<div class="entry-utility">' . __( '[entry-print-link] [entry-email-link] [entry-popup-shortlink]', hybrid_get_textdomain() ) . '</div>' ); ?>
-
<?php echo apply_atomic_shortcode( 'entry_title', '[entry-title]' ); ?>
- <?php echo apply_atomic_shortcode( 'byline', '<div class="byline">' . __( 'By [entry-author] on [entry-published] [entry-terms taxonomy="category" before=" in "] [entry-edit-link before=" | "]', hybrid_get_textdomain() ) . '</div>' ); ?>
-
<div class="entry-content">
<?php if ( wp_attachment_is_image( get_the_ID() ) ) : ?>
@@ -56,8 +52,6 @@
<?php wp_link_pages( array( 'before' => '<p class="page-links">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php echo apply_atomic_shortcode( 'entry_meta', '<div class="entry-meta">' . __( '<span class="share">Share this on:</span> [entry-mixx-link] [entry-delicious-link] [entry-digg-link] [entry-facebook-link] [entry-twitter-link]', hybrid_get_textdomain() ) . '</div>' ); ?>
-
<?php do_atomic( 'close_loop' ); // Close loop hook ?>
</div><!-- .hentry -->
View
12 footer.php
@@ -11,18 +11,22 @@
* @subpackage Template
*/
?>
- <?php get_sidebar( 'primary' ); ?>
+ <?php get_sidebar( 'primary' ); ?>
- <?php get_sidebar( 'secondary' ); ?>
+ <?php get_sidebar( 'secondary' ); ?>
- <?php do_atomic( 'close_main' ); // Close main hook ?>
+ <?php do_atomic( 'close_main' ); // Close main hook ?>
</div><!-- .wrap -->
</div><!-- #main -->
<?php do_atomic( 'after_main' ); // After main hook ?>
+ <?php get_sidebar( 'subsidiary' ); // Load the sidebar-subsidiary.php template. ?>
+
+ <?php get_template_part( 'menu', 'subsidiary' ); // Load the menu-subsidiary.php template. ?>
+
<?php do_atomic( 'before_footer' ); // Before footer hook ?>
<div id="footer">
@@ -31,6 +35,8 @@
<div class="wrap">
+ <?php echo apply_atomic_shortcode( 'footer_content', hybrid_get_setting( 'footer_insert' ) ); ?>
+
<?php do_atomic( 'footer' ); // Footer hook ?>
</div><!-- .wrap -->
View
86 functions.php
@@ -13,7 +13,7 @@
*/
/* Load the core theme framework. */
-require_once( TEMPLATEPATH . '/library/classes/hybrid.php' );
+require_once( TEMPLATEPATH . '/library/hybrid.php' );
$theme = new Hybrid();
/* Do theme setup on the 'after_setup_theme' hook. */
@@ -36,18 +36,21 @@ function prototype_theme_setup() {
add_theme_support( 'hybrid-core-widgets' );
add_theme_support( 'hybrid-core-shortcodes' );
add_theme_support( 'hybrid-core-post-meta-box' );
+ add_theme_support( 'hybrid-core-theme-settings' );
add_theme_support( 'hybrid-core-meta-box-footer' );
add_theme_support( 'hybrid-core-drop-downs' );
- add_theme_support( 'hybrid-core-print-style' );
add_theme_support( 'hybrid-core-seo' );
+ add_theme_support( 'hybrid-core-template-hierarchy' );
/* Add theme support for extensions. */
add_theme_support( 'post-layouts' );
+ add_theme_support( 'post-stylesheets' );
add_theme_support( 'loop-pagination' );
add_theme_support( 'get-the-image' );
- add_theme_support( 'entry-views' );
add_theme_support( 'breadcrumb-trail' );
+ add_theme_support( 'automatic-feed-links' );
+
/* Allow users to upload a custom background. */
add_custom_background();
@@ -58,30 +61,15 @@ function prototype_theme_setup() {
add_action( 'init', 'prototype_unregister_sidebars' );
add_action( 'init', 'prototype_register_sidebars' );
- /* Add site title and description to the header. */
- add_action( "{$prefix}_header", 'prototype_sidebar_header' );
- add_action( "{$prefix}_header", 'hybrid_site_title' );
- add_action( "{$prefix}_header", 'hybrid_site_description' );
-
/* Add the breadcrumb trail just after the container is open. */
- add_action( "{$prefix}_open_container", 'breadcrumb_trail' );
-
- /* Add menus to specific locations. */
- add_action( "{$prefix}_before_header", 'hybrid_get_primary_menu' );
- add_action( "{$prefix}_after_header", 'prototype_menu_secondary' );
- add_action( "{$prefix}_before_footer", 'prototype_menu_subsidiary' );
-
- /* Add subisidiary sidebar before the footer. */
- add_action( "{$prefix}_before_footer", 'prototype_sidebar_subsidiary' );
-
- /* Add the footer text to the footer. */
- add_action( "{$prefix}_footer", 'hybrid_footer_insert' );
+ add_action( "{$prefix}_open_main", 'breadcrumb_trail' );
/* Embed width/height defaults. */
add_filter( 'embed_defaults', 'prototype_embed_defaults' );
/* Filter the sidebar widgets. */
add_filter( 'sidebars_widgets', 'prototype_disable_sidebars' );
+ add_action( 'template_redirect', 'prototype_one_column' );
/* Filter the breadcrumb trail arguments. */
add_filter( 'breadcrumb_trail_args', 'prototype_breadcrumb_trail_args' );
@@ -99,21 +87,27 @@ function prototype_breadcrumb_trail_args( $args ) {
return $args;
}
-function prototype_disable_sidebars( $sidebars_widgets ) {
+function prototype_one_column() {
- //if ( current_theme_supports( 'post-layouts' ) && 'layout-1c' == post_layouts_get() ) {
- // $sidebars_widgets['primary'] = false;
- // $sidebars_widgets['secondary'] = false;
- //}
+ if ( !is_active_sidebar( 'primary' ) && !is_active_sidebar( 'secondary' ) )
+ add_filter( 'get_post_layout', 'prototype_post_layout_one_column' );
+ elseif ( is_attachment() )
+ add_filter( 'get_post_layout', 'prototype_post_layout_one_column' );
+}
+
+function prototype_post_layout_one_column( $layout ) {
+ return 'layout-1c';
+}
+
+function prototype_disable_sidebars( $sidebars_widgets ) {
global $wp_query;
- if ( is_singular() ) {
- $post_id = $wp_query->get_queried_object_id();
+ if ( current_theme_supports( 'post-layouts' ) ) {
- $layout = get_post_meta( $post_id, 'Layout', true );
+ $layout = post_layouts_get_layout();
- if ( '1c' == $layout ) {
+ if ( 'layout-1c' == $layout ) {
$sidebars_widgets['primary'] = false;
$sidebars_widgets['secondary'] = false;
}
@@ -122,35 +116,19 @@ function prototype_disable_sidebars( $sidebars_widgets ) {
return $sidebars_widgets;
}
-function prototype_sidebar_subsidiary() {
- get_sidebar( 'subsidiary' );
-}
-
function prototype_register_sidebars() {
register_sidebar( array( 'name' => __( 'Header', hybrid_get_textdomain() ), 'id' => 'header', 'description' => __( 'Displayed in the header area.', hybrid_get_textdomain() ), 'before_widget' => '<div id="%1$s" class="widget %2$s widget-%2$s"><div class="widget-inside">', 'after_widget' => '</div></div>', 'before_title' => '<h3 class="widget-title">', 'after_title' => '</h3>' ) );
}
function prototype_register_menus() {
register_nav_menus(
array(
- 'secondary-menu' => __( 'Secondary Menu', hybrid_get_textdomain() ),
- 'subsidiary-menu' => __( 'Subsidiary Menu', hybrid_get_textdomain() )
+ 'secondary' => __( 'Secondary Menu', hybrid_get_textdomain() ),
+ 'subsidiary' => __( 'Subsidiary Menu', hybrid_get_textdomain() )
)
);
}
-function prototype_sidebar_header() {
- get_sidebar( 'header' );
-}
-
-function prototype_menu_secondary() {
- locate_template( array( 'menu-secondary.php', 'menu.php' ), true );
-}
-
-function prototype_menu_subsidiary() {
- locate_template( array( 'menu-subsidiary.php', 'menu.php' ), true );
-}
-
/**
* Overwrites the default widths for embeds. This is especially useful for making sure videos properly
* expand the full width on video pages. This function overwrites what the $content_width variable handles
@@ -159,8 +137,18 @@ function prototype_menu_subsidiary() {
* @since 0.1.0
*/
function prototype_embed_defaults( $args ) {
- if ( !is_active_sidebar( 'primary' ) && !is_active_sidebar( 'secondary' ) )
- $args['width'] = 928;
+
+ if ( current_theme_supports( 'post-layouts' ) ) {
+
+ $layout = post_layouts_get_layout();
+
+ if ( 'layout-3c-l' == $layout || 'layout-3c-r' == $layout || 'layout-3c-c' == $layout )
+ $args['width'] = 500;
+ elseif ( 'layout-1c' == $layout )
+ $args['width'] = 928;
+ else
+ $args['width'] = 600;
+ }
else
$args['width'] = 600;
View
20 header.php
@@ -10,15 +10,17 @@
* @package Prototype
* @subpackage Template
*/
+?>
+<!DOCTYPE html>
+<html <?php language_attributes(); ?>>
+<head>
+
+<meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php bloginfo( 'charset' ); ?>" />
-hybrid_doctype(); ?>
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes( 'xhtml' ); ?>>
-<head profile="<?php hybrid_profile_uri(); ?>">
<title><?php hybrid_document_title(); ?></title>
-<link rel="stylesheet" href="<?php echo get_stylesheet_uri(); ?>" type="text/css" media="screen" />
+<link rel="stylesheet" href="<?php echo get_stylesheet_uri(); ?>" type="text/css" media="all" />
-<?php do_atomic( 'head' ); // Head hook ?>
<?php wp_head(); // WP head hook ?>
</head>
@@ -29,6 +31,8 @@
<div id="container">
+ <?php get_template_part( 'menu', 'primary' ); ?>
+
<?php do_atomic( 'before_header' ); // Before header hook ?>
<div id="header">
@@ -37,6 +41,10 @@
<div class="wrap">
+ <?php hybrid_site_title(); ?>
+ <?php hybrid_site_description(); ?>
+ <?php get_sidebar( 'header' ); ?>
+
<?php do_atomic( 'header' ); // Header hook ?>
</div><!-- .wrap -->
@@ -47,6 +55,8 @@
<?php do_atomic( 'after_header' ); // After header hook ?>
+ <?php get_template_part( 'menu', 'secondary' ); ?>
+
<?php do_atomic( 'before_main' ); // Before main hook ?>
<div id="main">
View
2 index.php
@@ -31,7 +31,7 @@
<?php do_atomic( 'open_entry' ); // Open entry hook ?>
- <?php get_the_image( array( 'meta_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
+ <?php if ( current_theme_supports( 'get-the-image' ) ) get_the_image( array( 'meta_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
<?php echo apply_atomic_shortcode( 'entry_title', '[entry-title]' ); ?>
View
12 loop-nav.php
@@ -12,23 +12,23 @@
<?php if ( is_attachment() ) : ?>
- <div class="loop-nav navigation-links">
+ <div class="loop-nav">
<?php previous_post_link( '%link', '<span class="previous">' . __( '&larr; Return to entry', hybrid_get_textdomain() ) . '</span>' ); ?>
- </div>
+ </div><!-- .loop-nav -->
<?php elseif ( is_singular( 'post' ) ) : ?>
- <div class="loop-nav navigation-links">
+ <div class="loop-nav">
<?php previous_post_link( '<div class="previous">' . __( 'Previous Entry: %link', hybrid_get_textdomain() ) . '</div>', '%title' ); ?>
<?php next_post_link( '<div class="next">' . __( 'Next Entry: %link', hybrid_get_textdomain() ) . '</div>', '%title' ); ?>
- </div><!-- .navigation-links -->
+ </div><!-- .loop-nav -->
<?php elseif ( !is_singular() && current_theme_supports( 'loop-pagination' ) ) : loop_pagination(); ?>
<?php elseif ( !is_singular() && $nav = get_posts_nav_link( array( 'sep' => '', 'prelabel' => '<span class="previous">' . __( '&larr; Previous', hybrid_get_textdomain() ) . '</span>', 'nxtlabel' => '<span class="next">' . __( 'Next &rarr;', hybrid_get_textdomain() ) . '</span>' ) ) ) : ?>
- <div class="loop-nav navigation-links">
+ <div class="loop-nav">
<?php echo $nav; ?>
- </div><!-- .navigation-links -->
+ </div><!-- .loop-nav -->
<?php endif; ?>
View
4 menu-primary.php
@@ -8,7 +8,7 @@
* @subpackage Template
*/
-if ( has_nav_menu( 'primary-menu' ) ) : ?>
+if ( has_nav_menu( 'primary' ) ) : ?>
<?php do_atomic( 'before_menu_primary' ); // Before primary menu hook ?>
@@ -18,7 +18,7 @@
<?php do_atomic( 'open_menu_primary' ); // Open primary menu hook ?>
- <?php wp_nav_menu( array( 'theme_location' => 'primary-menu', 'container_class' => 'menu', 'menu_class' => '', 'menu_id' => 'menu-primary-items', 'fallback_cb' => '' ) ); ?>
+ <?php wp_nav_menu( array( 'theme_location' => 'primary', 'container_class' => 'menu', 'menu_class' => '', 'menu_id' => 'menu-primary-items', 'fallback_cb' => '' ) ); ?>
<?php do_atomic( 'close_menu_primary' ); // Close primary menu hook ?>
View
4 menu-secondary.php
@@ -8,7 +8,7 @@
* @subpackage Template
*/
-if ( has_nav_menu( 'secondary-menu' ) ) : ?>
+if ( has_nav_menu( 'secondary' ) ) : ?>
<?php do_atomic( 'before_menu_secondary' ); // Before secondary menu hook ?>
@@ -18,7 +18,7 @@
<?php do_atomic( 'open_menu_secondary' ); // Open secondary menu hook ?>
- <?php wp_nav_menu( array( 'theme_location' => 'secondary-menu', 'container_class' => 'menu', 'menu_class' => '', 'menu_id' => 'menu-secondary-items', 'fallback_cb' => '' ) ); ?>
+ <?php wp_nav_menu( array( 'theme_location' => 'secondary', 'container_class' => 'menu', 'menu_class' => '', 'menu_id' => 'menu-secondary-items', 'fallback_cb' => '' ) ); ?>
<?php do_atomic( 'close_menu_secondary' ); // Close secondary menu hook ?>
View
4 menu-subsidiary.php
@@ -8,7 +8,7 @@
* @subpackage Template
*/
-if ( has_nav_menu( 'subsidiary-menu' ) ) : ?>
+if ( has_nav_menu( 'subsidiary' ) ) : ?>
<?php do_atomic( 'before_menu_subsidiary' ); // Before subsidiary menu hook ?>
@@ -18,7 +18,7 @@
<?php do_atomic( 'open_menu_subsidiary' ); // Open subsidiary menu hook ?>
- <?php wp_nav_menu( array( 'theme_location' => 'subsidiary-menu', 'container_class' => 'menu', 'menu_class' => '', 'menu_id' => 'menu-subsidiary-items', 'fallback_cb' => '' ) ); ?>
+ <?php wp_nav_menu( array( 'theme_location' => 'subsidiary', 'container_class' => 'menu', 'menu_class' => '', 'menu_id' => 'menu-subsidiary-items', 'fallback_cb' => '' ) ); ?>
<?php do_atomic( 'close_menu_subsidiary' ); // Close subsidiary menu hook ?>
View
2 search.php
@@ -31,7 +31,7 @@
<?php do_atomic( 'open_entry' ); // Open loop hook ?>
- <?php if ( current_theme_supports( 'get-the-image' ) ) get_the_image( array( 'meta_key' => array( 'Thumbnail' ), 'size' => 'news-thumbnail' ) ); ?>
+ <?php if ( current_theme_supports( 'get-the-image' ) ) get_the_image( array( 'meta_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
<?php echo apply_atomic_shortcode( 'entry_title', '[entry-title]' ); ?>
View
286 style.css
@@ -22,15 +22,15 @@
/* Drop-downs. */
@import url( 'library/css/drop-downs.css' );
+
a {
- color: #98B4C0;
- color: #88a7b4;
- color: #668c9c;
+ color: #999;
+ border-bottom: 1px dotted #666;
}
a:hover {
- color: #7c9eac;
- color: #3E606A;
- text-decoration: underline;
+ text-decoration: none;
+ color: #000;
+ border-bottom: 1px dotted #000;
}
@@ -45,15 +45,29 @@ h4 { font-size: 19px; }
h5 { font-size: 17px; }
h6 { font-size: 15px; }
-.entry-content h2,
-.entry-content h3,
-.entry-content h4,
-.entry-content h5,
-.entry-content h6
- {
+.entry-content h2, .entry-content h3, .entry-content h4, .entry-content h5, .entry-content h6 {
padding-left: 15px;
color: #444;
- border-left: 5px solid #eee;
+ border-left: 5px solid #ddd;
+ }
+
+.entry-content h2 { line-height: 23px; border-color: #ddd; }
+.entry-content h3 { line-height: 21px; border-color: #dfdfdf; }
+.entry-content h4 { line-height: 19px; border-color: #e1e1e1; }
+.entry-content h5 { line-height: 17px; border-color: #e3e3e3; }
+.entry-content h6 { line-height: 15px; border-color: #e5e5e5; }
+
+acronym {
+ font-size: .9em;
+ text-transform: uppercase;
+ color: #555;
+ background: #fcfcfc;
+ border-bottom: 1px dotted #ccc;
+ }
+acronym:hover {
+ color: #333;
+ background: #f9f9f9;
+ border-bottom: 1px dotted #999;
}
/* Lists. */
@@ -95,7 +109,7 @@ code {
padding: 0 3px;
color: #555;
font: normal normal normal 13px/25px Arial, Verdana, sans-serif;
- background: #dfdfdf;
+ background: #e6e6e6;
}
pre {
padding: 25px;
@@ -119,22 +133,93 @@ textarea {
width: 98.5%;
}
-/* Layout */
+/* Alignment */
+.left, .alignleft {
+ float: left;
+ margin: 0 25px 0 0;
+ }
+.right, .alignright {
+ float: right;
+ margin: 0 0 0 25px;
+ }
+.center, .aligncenter {
+ display: block;
+ margin: 0 auto 25px auto !important;
+ }
+.block, .alignnone {
+ display: block;
+ margin: 0 0 25px 0;
+ }
+.clear {
+ clear: both;
+ }
-body {
- padding: 25px 0;
- color: #111;
+/* Images */
+
+.entry-content img {
+ max-width: 590px;
+ padding: 4px;
+ background: #f9f9f9;
+ border: 1px solid #ddd;
+ }
+.layout-1c .entry-content img {
+ max-width: 918px;
+ }
+.layout-3c-l .entry-content img, .layout-3c-r .entry-content img, .layout-3c-c .entry-content img {
+ max-width: 490px;
}
-#menu-primary, #menu-secondary, #footer {
- width: 980px;
- margin: 0 auto;
+.gallery {
+ overflow: hidden;
+ margin: 0 0 -25px 0 !important;
+ }
+.gallery a {
+ border: none;
+ }
+.gallery-item {
+ overflow: hidden;
+ margin: 0 0 25px 0 !important;
+ }
+.gallery-icon {
+ margin: 0;
+ }
+.gallery img {
+ margin: 0;
+ padding: 2px !important;
+ border: 1px solid #ddd !important;
+ }
+.gallery-caption {
+ font: normal normal normal 12px/25px Arial, Verdana, sans-serif;
+ color: #999;
+ }
+
+/* Captions [caption] */
+.wp-caption {
+ overflow: hidden;
+ padding: 12px 9px;
+ background: #f9f9f9;
+ border: 1px dotted #ccc;
+ }
+.wp-caption img {
+ display: block;
+ max-width: 586px;
+ margin: 0 auto 10px auto;
+ padding: 2px;
+ background: #eee;
+ border: 1px solid #bbb;
+ }
+.wp-caption .wp-caption-text {
+ margin: 0 4px;
+ font: normal normal normal 12px/12px Arial, Verdana, sans-serif;
+ color: #888;
+ text-align: right;
}
/* Style. */
body {
- background: #fff;
+ padding: 25px 0;
+ color: #111;
background: #f9f9f9;
}
@@ -144,6 +229,8 @@ body {
}
#menu-primary {
+ width: 980px;
+ margin: 0 auto;
}
#menu-primary div.menu {
float: left;
@@ -153,38 +240,50 @@ body {
border-left: 1px solid #dfdfdf;
border-right: 1px solid #dfdfdf;
}
+#menu-primary li {
+ background: #fff;
+ }
#menu-primary li a {
- padding: 6px 25px;
- font: normal normal bold 13px/25px Arial, Verdana, sans-serif;
+ padding: 12px 25px;
+ font: normal normal bold 13px/13px Arial, Verdana, sans-serif;
color: #777;
background: #fff;
+ border-bottom: none;
border-right: 1px solid #dfdfdf;
}
-#menu-primary li:hover ul li a, #menu-primary li.sfHover ul li a, #menu-primary li.sfHover a {
- color: #9e9e9e;
- background: #fdfdfd;
- background: #252525;
- }
#menu-primary li a:hover {
- color: #000;
- color: #eee;
- background: #252525;
text-decoration: underline;
}
#menu-primary li ul {
border-top: 1px solid #dfdfdf;
- border-left: 1px solid #dfdfdf;
border-right: 1px solid #dfdfdf;
border-color: #444;
}
-#menu-primary li li a {
+#menu-primary li.current-menu-item a {
+ color: #000;
+ }
+#menu-primary li li.current-menu-item a {
+ padding-left: 20px;
+ border-left: 5px solid #777;
+ }
+#menu-primary li:hover ul li a, #menu-primary li.sfHover ul li a, #menu-primary li.sfHover a {
+ color: #9e9e9e;
+ background: #252525;
+ }
+#menu-primary li li a, #menu-primary li li.current-menu-item li a {
font-size: 11px;
text-transform: uppercase;
color: #9e9e9e;
border-bottom: 1px solid #dfdfdf;
border-right: none;
+ border-left: 1px solid #dfdfdf;
border-color: #444;
}
+#menu-primary ul li a:hover, #menu-primary li ul li a:hover {
+ color: #eee;
+ background: #252525;
+ text-decoration: underline;
+ }
/* Drop-down styles */
#menu-primary li ul {
@@ -215,6 +314,7 @@ body {
}
#site-title a {
color: #000;
+ border-bottom: none;
}
#site-title a:hover {
text-decoration: underline;
@@ -233,6 +333,8 @@ body {
#menu-secondary {
+ width: 980px;
+ margin: 0 auto;
}
#menu-secondary div.menu {
float: left;
@@ -242,13 +344,20 @@ body {
border-left: 1px solid #dfdfdf;
border-right: 1px solid #dfdfdf;
}
+#menu-secondary li {
+ background: #fff;
+ }
#menu-secondary li a {
- padding: 6px 25px;
- font: normal normal bold 13px/25px Arial, Verdana, sans-serif;
+ padding: 12px 25px;
+ font: normal normal bold 13px/13px Arial, Verdana, sans-serif;
color: #777;
background: #fff;
+ border-bottom: none;
border-right: 1px solid #dfdfdf;
}
+#menu-secondary li a:hover {
+ text-decoration: underline;
+ }
#menu-secondary li ul {
border-top: 1px solid #dfdfdf;
border-right: 1px solid #dfdfdf;
@@ -275,7 +384,6 @@ body {
border-color: #444;
}
#menu-secondary ul li a:hover, #menu-secondary li ul li a:hover {
- color: #000;
color: #eee;
background: #252525;
text-decoration: underline;
@@ -307,12 +415,10 @@ body {
.breadcrumbs {
font-size: 13px;
- font-style: italic;
color: #999;
margin-bottom: 25px;
}
.breadcrumbs a {
- font-style: normal;
color: #555;
border-bottom: 1px dotted #999;
}
@@ -324,9 +430,11 @@ body {
.breadcrumbs .trail-before {
display: inline-block;
margin-right: 6px;
- font-style: normal;
color: #777;
}
+.breadcrumbs .trail-end {
+ font-style: italic;
+ }
.breadcrumbs .sep {
display: inline-block;
margin: 0 3px;
@@ -379,11 +487,12 @@ body {
.singular .entry-title {
font-size: 25px;
}
-.singular-page .entry-title {
+.singular-page .entry-title, .singular-attachment .entry-title {
margin-bottom: 25px;
}
.entry-title a {
color: #000;
+ border-bottom: none;
}
.entry-title a:hover {
text-decoration: underline;
@@ -408,7 +517,6 @@ body {
}
.entry-content {
- overflow: hidden;
}
.entry-meta {
@@ -428,60 +536,71 @@ body {
.loop-meta {
overflow: hidden;
- margin: 0 0 50px 0;
- padding: 25px 25px 0 25px;
+ margin: 0 0 25px 0;
font-size: 14px;
- color: #666;
- background: #f9f9f9;
- border-left: 5px solid #ddd;
+ color: #777;
+ }
+.loop-description {
+ overflow: hidden;
+ font-style: italic;
+ }
+.loop-description em {
+ font-style: normal;
}
.loop-title {
font: normal normal bold 25px/25px Arial, Verdana, sans-serif;
text-shadow: 1px 1px 1px #ccc;
}
.loop-meta .avatar {
- float: right;
- width: 50px;
- height: 50px;
- margin: 0 0 10px 15px;
- padding: 4px;
- background: #eee;
- border: 1px solid #ccc;
+ float: left;
+ width: 51px;
+ height: 51px;
+ margin: 0 25px 10px 0;
+ padding: 2px;
+ background: #f9f9f9;
+ border: 1px solid #ddd;
}
.singular .loop-nav {
font-size: 15px;
- color: #999;
+ color: #666;
}
.singular .loop-nav a {
font-style: italic;
}
.page-links {
clear: both;
- font-size: 14px;
+ font: normal normal bold 13px/13px Arial, Verdana, sans-serif;
color: #333;
}
.page-links a {
display: inline-block;
- padding: 1px 9px;
+ padding: 6px 9px;
margin: 0 5px 0 5px;
- color: #777;
- border: 1px solid #ddd;
+ color: #aaa;
+ border: 1px solid #dfdfdf;
+ }
+.page-links a:hover {
+ color: #000;
+ background: #f9f9f9;
+ text-decoration: underline;
}
.pagination .page-numbers {
display: inline-block;
- padding: 1px 9px;
+ padding: 6px 9px;
margin: 0 10px 0 0;
- font-size: 14px;
+ font: normal normal bold 13px/13px Arial, Verdana, sans-serif;
color: #333;
- border: 1px solid #ddd;
+ border: 1px solid #dfdfdf;
}
.pagination a.page-numbers {
- color: #777;
+ color: #aaa;
}
.pagination a:hover {
+ color: #000;
+ background: #f9f9f9;
text-decoration: underline;
}
.pagination .current {
@@ -505,7 +624,6 @@ body {
}
#sidebar-after-singular .widget ul li a {
color: #555;
- color: #777;
border-bottom: 1px dotted #ccc;
}
#sidebar-after-singular .widget ul li a:hover {
@@ -539,7 +657,8 @@ body {
list-style: square;
}
#sidebar-primary .widget ul li a {
- color: #555;
+ color: #777;
+ border-bottom: 1px dotted #ccc;
}
#sidebar-primary .widget ul li a:hover {
color: #000;
@@ -551,6 +670,7 @@ body {
}
#sidebar-secondary .widget ul li a {
color: #777;
+ border-bottom: 1px dotted #ccc;
}
#sidebar-secondary .widget ul li a:hover {
color: #000;
@@ -564,11 +684,8 @@ body {
margin: 0 0 25px 0;
border-top: 1px solid #dfdfdf;
}
-.comment-list ol {
- margin-bottom: 0;
- }
.comment-list li {
- padding: 25px;
+ padding: 25px 25px 0 25px;
border: 1px solid #dfdfdf;
border-top: none;
}
@@ -632,6 +749,7 @@ body {
}
#respond #submit {
float: right;
+ margin-bottom: 25px;
}
@@ -662,6 +780,7 @@ body {
}
#sidebar-subsidiary .widget ul li a {
color: #777;
+ border-bottom: 1px dotted #ccc;
}
#sidebar-subsidiary .widget ul li a:hover {
color: #000;
@@ -684,14 +803,19 @@ body {
border-right: 1px solid #dfdfdf;
}
#menu-subsidiary li a {
- padding: 6px 25px;
- font: normal normal bold 13px/25px Arial, Verdana, sans-serif;
+ padding: 12px 25px;
+ font: normal normal bold 13px/13px Arial, Verdana, sans-serif;
color: #777;
background: #fff;
+ border-bottom: none;
border-right: 1px solid #dfdfdf;
}
+#menu-subsidiary li.current-menu-item a {
+ color: #000;
+ }
#menu-subsidiary li a:hover {
color: #000;
+ text-decoration: underline;
}
#footer {
@@ -743,12 +867,12 @@ body {
.layout-3c-l #content {
float: left;
- width: 480px;
+ width: 500px;
}
.layout-3c-l #sidebar-primary, .layout-3c-l #sidebar-secondary {
clear: none;
float: left;
- width: 199px;
+ width: 189px;
margin-left: 25px;
}
.layout-3c-l #sidebar-secondary {
@@ -758,12 +882,12 @@ body {
.layout-3c-r #content {
float: right;
- width: 480px;
+ width: 500px;
}
.layout-3c-r #sidebar-primary, .layout-3c-r #sidebar-secondary {
clear: none;
float: left;
- width: 199px;
+ width: 189px;
margin-right: 25px;
}
.layout-3c-r #sidebar-secondary {
@@ -773,20 +897,18 @@ body {
.layout-3c-c #content {
float: left;
- position: relative;
- left: 225px;
- width: 460px;
+ margin-left: 205px;
+ width: 500px;
}
.layout-3c-c #sidebar-primary {
float: left;
- position: relative;
- left: -460px;
- width: 199px;
+ margin-left: -705px;
+ width: 189px;
}
.layout-3c-c #sidebar-secondary {
clear: none;
float: right;
- width: 199px;
+ width: 189px;
padding: 0;
border: none;
}

0 comments on commit a1b4520

Please sign in to comment.
Something went wrong with that request. Please try again.