Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
founddrama committed Feb 12, 2012
2 parents 6c2e8ae + da58913 commit e978dff2aeefcb2635b8449c5611142125956d99
View
@@ -9,7 +9,7 @@
get_header(); ?>
- <h1><?php _e( 'Not Found', 'starkers' ); ?></h1>
+ <h2><?php _e( 'Not Found', 'starkers' ); ?></h2>
<p><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'starkers' ); ?></p>
<?php get_search_form(); ?>
View
@@ -15,16 +15,20 @@ too and choose fork it for your own experiments.
**Author URI:** <http://blog.founddrama.net/>
-**Version:** 0.5
+**Version:** 0.6
## Notes
-* CSS is developed and managed using [Sass](http://sass-lang.com/); the author
- recommends that you work it into your deploy script.
-
-## @todo
-* The site references minified versions of certain resources (_e.g._, `css` and
- `js` files); the author recommends a build script to handle creating these
- minified files and putting them in the right place
- * A sample deploy script is included at `./bin/deploy.sh`
- * see also : <http://developer.yahoo.com/yui/compressor/> and/or
- <https://github.com/yui/yuicompressor>
+
+CSS is developed and managed using [Sass](http://sass-lang.com/) and
+[Compass](http://compass-style.org/); the author recommends that you work it
+into your deploy script.
+
+## Your Homework
+
+The site references minified versions of certain resources (_e.g._, `css` and
+`js` files); the author recommends a build script to handle creating these
+minified files and putting them in the right place
+
+* A sample deploy script is included at `./bin/deploy.sh`
+* see also : <http://developer.yahoo.com/yui/compressor/> and/or
+ <https://github.com/yui/yuicompressor>
File renamed without changes.
View
@@ -14,7 +14,7 @@
the_post();
?>
- <h1>
+ <h2>
<?php if ( is_day() ) : ?>
<?php printf( __( 'Daily Archives: %s', 'starkers' ), get_the_date() ); ?>
<?php elseif ( is_month() ) : ?>
@@ -24,7 +24,7 @@
<?php else : ?>
<?php _e( 'Blog Archives', 'starkers' ); ?>
<?php endif; ?>
- </h1>
+ </h2>
<?php
rewind_posts();
View
@@ -14,13 +14,13 @@
the_post();
?>
- <h1><?php printf( __( 'Author Archives: %s', 'starkers' ), "<a href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a>" ); ?></h1>
+ <h2><?php printf( __( 'Author Archives: %s', 'starkers' ), "<a href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a>" ); ?></h2>
<?php
// If a user has filled out their description, show a bio on their entries.
if ( get_the_author_meta( 'description' ) ) : ?>
<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'starkers_author_bio_avatar_size', 60 ) ); ?>
- <h2><?php printf( __( 'About %s', 'starkers' ), get_the_author() ); ?></h2>
+ <h3><?php printf( __( 'About %s', 'starkers' ), get_the_author() ); ?></h3>
<?php the_author_meta( 'description' ); ?>
<?php endif; ?>
View
@@ -9,9 +9,9 @@
get_header(); ?>
- <h1><?php
+ <h2><?php
printf( __( 'Category Archives: %s', 'starkers' ), '' . single_cat_title( '', false ) . '' );
- ?></h1>
+ ?></h2>
<?php
$category_description = category_description();
if ( ! empty( $category_description ) )
View
@@ -26,7 +26,7 @@
<?php if ( have_comments() ) : ?>
<?php /* STARKERS NOTE: The following h3 id is left intact so that comments can be referenced on the page */ ?>
- <h3 id="comments-title"><?php
+ <h3 id="comments-title" class="comments-title"><?php
printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'starkers' ),
number_format_i18n( get_comments_number() ), '' . get_the_title() . '' );
?></h3>
View
@@ -7,16 +7,16 @@
* @since 0.1a
*/
?>
- </section><?php /* / #orin-chronology */ ?>
+ </section><?php /* / .orin-chronology */ ?>
<?php
if ( ! is_404() ) {
get_sidebar();
}
?>
- </section><?php /* / #orin-container */ ?>
- </div><?php /* / #orin-ct-wrap */ ?>
+ </section><?php /* / .orin-container */ ?>
+ </div><?php /* / .orin-ct-wrap */ ?>
- <footer id="orin-footer">
+ <footer class="orin-footer">
<section>
<?php get_sidebar( 'footer' ); ?>
View
@@ -45,21 +45,21 @@
<body <?php body_class(); ?>>
- <header id="masthead">
+ <header class="masthead">
<hgroup>
<h1><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
- <h2><?php bloginfo( 'description' ); ?></h2>
+ <div class="desc"><?php bloginfo( 'description' ); ?></div>
</hgroup>
<?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to the 'starkers_menu' function which can be found in functions.php. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
<?php wp_nav_menu( array( 'container' => 'nav', 'fallback_cb' => 'starkers_menu', 'theme_location' => 'primary' ) ); ?>
<?php if ( is_active_sidebar( 'masthead-widget-area' ) ) : ?>
- <section id="masthead-widgets">
+ <section class="masthead-widgets">
<?php dynamic_sidebar( 'masthead-widget-area' ); ?>
</section>
<?php endif; ?>
</header>
- <div id="orin-ct-wrap">
- <section id="orin-container">
- <section id="orin-chronology">
+ <div class="orin-ct-wrap">
+ <section class="orin-container">
+ <section class="orin-chronology">
View
@@ -10,7 +10,7 @@
<?php /* If there are no posts to display, such as an empty archive page */ ?>
<?php if ( ! have_posts() ) : ?>
- <h1><?php _e( 'Not Found', 'starkers' ); ?></h1>
+ <h2><?php _e( 'Not Found', 'starkers' ); ?></h2>
<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'starkers' ); ?></p>
<?php get_search_form(); ?>
<?php endif; ?>
View
@@ -14,7 +14,7 @@
<article <?php post_class() ?> id="post-<?php the_ID(); ?>">
<header>
- <h1><?php the_title(); ?></h1>
+ <h2><?php the_title(); ?></h2>
</header>
<?php the_content(); ?>
View
@@ -15,11 +15,7 @@
<article <?php post_class() ?> id="post-<?php the_ID(); ?>">
<header>
- <?php if ( is_front_page() ) { ?>
- <h2><?php the_title(); ?></h2>
- <?php } else { ?>
- <h1><?php the_title(); ?></h1>
- <?php } ?>
+ <h2><?php the_title(); ?></h2>
</header>
<?php the_content(); ?>
View
@@ -10,7 +10,7 @@
get_header(); ?>
<?php if ( have_posts() ) : ?>
- <h1><?php printf( __( 'Search Results for: %s', 'starkers' ), '' . get_search_query() . '' ); ?></h1>
+ <h2><?php printf( __( 'Search Results for: %s', 'starkers' ), '' . get_search_query() . '' ); ?></h2>
<?php
get_template_part( 'loop', 'search' );
?>
View
@@ -15,7 +15,7 @@
<article <?php post_class() ?> id="post-<?php the_ID(); ?>">
<header>
- <h1><?php the_title(); ?></h1>
+ <h2><?php the_title(); ?></h2>
<?php orin_posted_on(); ?>
<?php orin_edit_post_link(); ?>
View
@@ -1,122 +1,74 @@
article {
- // h#{n} headings:
- $_em: 1em; $i: 6;
- @while $i > 0 {
- $_em: $_em + 0.125em; $i: $i - 1;
- h#{$i} { line-height: $_em * 0.75; }
- }
-
-
- @include border-radius(8px);
-
- header, footer { width: 100%; }
-
- header {
- margin-bottom: 2em;
- h1, h2 {
- @include text-shadow($f_d-grey 1px 0 1px);
- }
- }
-
- // $_font-size @ _typography
- p, ol, ul { margin-bottom: $_font-size * 1.5; }
-
- a img:hover {
- @include article-shadow(4px, lighten($f_d-dark, 25%));
- @include rotate(-1deg);
- @include transition(all 0.5s ease-out);
- }
-
- img {
- background: white;
- border: 1px solid $f_d-grey;
- padding: 4px;
- @include article-shadow(2px, lighten($f_d-dark, 50%));
- @include transition(all 0.5s ease-out);
- }
-
- blockquote {
- color: white;
- padding: 1em;
- margin: 2em;
- border: 0.25em solid white;
- @include article-shadow(4px, $f_d-grey);
- @include basic-linear-grader(darken($f_d-color, 10%), $f_d-dark, 92%);
- blockquote {
- @include article-shadow(4px, $f_d-dark);
- }
-
- a { color: $f_d-grey; }
- .wp-caption { color: $f_d-dark; }
-
- p:last-child { margin-bottom: 0; }
- }
-
- q {
- font-style: italic;
- color: $f_d-dark;
- }
-
- ol, ul {
- list-style-position: outside;
- margin-left: 1.5em;
- }
-
- footer {
- clear: both;
- padding: $_48th / 2 2px;
- background: white;
- }
-
- footer, nav {
- margin-bottom: $_48th;
- }
-
- #comments-title,
- .comment { clear: both; }
-
- #comments-title {
- margin: {
- top: $_24th;
- bottom: $_48th
- }
- }
-
- .comment {
- padding: 0 1em;
-
- &:nth-child(odd) { @include basic-linear-grader(white, lighten($f_d-desat, 50%), 92%); }
-
- a.permalink { float: right; }
- }
- .avatar {
- background: white;
- float: left;
- margin: {
- left: -1em;
- right: 0.5em;
- }
- }
-
- #reply-title { padding-top: $_24th; }
-
- #commentform {
- input,
- textarea { display: block; }
-
- .required { color: $f_d-color; }
- }
+ @include border-radius(8px);
+
+ header { margin-bottom: 2em; }
+
+ // $_font-size @ _typography
+ p, ol, ul { margin-bottom: $_font-size * 1.5; }
+
+ a img:hover {
+ @include box-shadow(lighten($f_d-dark, 25%) 0 4px 4px);
+ @include rotate(-1deg);
+ -ms-transition: all 0.5s ease-out;
+ @include transition(all 0.5s ease-out);
+ }
+
+ img {
+ background: white;
+ border: 1px solid $f_d-grey;
+ padding: 4px;
+ @include box-shadow(lighten($f_d-dark, 50%) 0 2px 2px);
+ -ms-transition: all 0.5s ease-out;
+ @include transition(all 0.5s ease-out);
+ }
+
+ blockquote {
+ color: white;
+ padding: 1em;
+ margin: 2em;
+ border: 0.25em solid white;
+ @include article-shadow(4px, $f_d-grey);
+ @include basic-linear-grader(darken($f_d-color, 10%), $f_d-dark, 92%);
+ blockquote {
+ @include article-shadow(4px, $f_d-dark);
+ }
+
+ a { color: $f_d-grey; }
+ .wp-caption { color: $f_d-dark; }
+
+ p:last-child { margin-bottom: 0; }
+ }
+
+ q {
+ font-style: italic;
+ color: $f_d-dark;
+ }
+
+ ol, ul {
+ list-style-position: outside;
+ margin-left: 1.5em;
+ }
+
+ footer {
+ clear: both;
+ padding: $_48th / 2 2px;
+ background: white;
+ }
+
+ footer, nav {
+ margin-bottom: $_48th;
+ }
}
.post-edit-link,
.post-comment-link { float: right; }
.single-post article footer {
- @include basic-linear-grader(white, rgba($f_d-grey, .6), 92%);
-
- $_border: 1px dotted $f_d-dark;
- border: {
- top: $_border;
- bottom: $_border;
- }
+ @include basic-linear-grader(white, rgba($f_d-grey, .6), 92%);
+
+ $_border: 1px dotted $f_d-dark;
+ border: {
+ top: $_border;
+ bottom: $_border;
+ }
}
Oops, something went wrong.

0 comments on commit e978dff

Please sign in to comment.