Skip to content

Commit

Permalink
Merge remote branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
swalkinshaw committed May 1, 2011
2 parents 592d36b + 29dbefc commit f6a95be
Show file tree
Hide file tree
Showing 25 changed files with 1,210 additions and 151 deletions.
12 changes: 6 additions & 6 deletions 404.php
Expand Up @@ -2,15 +2,15 @@
<div id="content" class="<?php echo roots_container_class; ?>">
<div id="main" role="main">
<div class="container">
<h1>File Not Found</h1>
<h1><?php _e('File Not Found', 'roots'); ?></h1>
<div class="error">
<p class="bottom">The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.</p>
<p class="bottom"><?php _e('The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.', 'roots'); ?></p>
</div>
<p>Please try the following:</p>
<p><?php _e('Please try the following:', 'roots'); ?></p>
<ul>
<li>Check your spelling</li>
<li>Return to the <a href="<?php echo home_url(); ?>/">home page</a></li>
<li>Click the <a href="javascript:history.back()">Back</a> button</li>
<li><?php _e('Check your spelling', 'roots'); ?> </li>
<li><?php printf(__('Return to the <a href="%s">home page</a>', 'roots'), home_url()); ?></li>
<li><?php _e('Click the <a href="javascript:history.back()">Back</a> button', 'roots'); ?></li>
</ul>
</div>
</div><!-- /#main -->
Expand Down
47 changes: 36 additions & 11 deletions README.md
Expand Up @@ -2,6 +2,32 @@

## Changelog:

### 3.2.2: April 24th, 2011
<ul>
<li>Bugfixes</li>
</ul>

### 3.2.1: April 20th, 2011

<ul>
<li>Added support for child themes</li>
</ul>

### 3.2.0: April 15th, 2011

<ul>
<li>Added support for the 1140px Grid</li>
<li>Updated the conditional comment code to match latest changes to HTML5 Boilerplate</li>
</ul>

### 3.1.1: April 7th, 2011

<ul>
<li>Fixed relative path function to work correctly when WordPress is installed in a subdirectory</li>
<li>Updated jQuery to 1.5.2</li>
<li>Fixed comments to show avatars correctly</li>
</ul>

### 3.1.0: April 1st, 2011

<ul>
Expand All @@ -10,9 +36,6 @@
<li>Made the theme directory and name renamable</li>
</ul>

#### Contributors
[John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/)

### 3.0.0: March 28th, 2011

<ul>
Expand All @@ -34,9 +57,6 @@
<li>Updated CSS for Gravity Forms 1.5</li>
<li>Added <code>searchform.php template</code></li>
</ul>

#### Contributors
[Scott Walkinshaw](http://www.scottwalkinshaw.com/), [Matthew Price](http://www.matthewaprice.com/), [Kyle Geminden](http://www.kylegeminden.com/), [Steve Jothen](http://twitter.com/sjothen)

### 2.4.0: January 25th, 2011

Expand Down Expand Up @@ -103,20 +123,25 @@
<li>Added Blueprint CSS to Starkers</li>
</ul>

## Contributors:

[Scott Walkinshaw](http://www.scottwalkinshaw.com/), [Matthew Price](http://www.matthewaprice.com/), [Kyle Geminden](http://www.kylegeminden.com/), [Steve Jothen](http://twitter.com/sjothen), [John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/), [Jenny Jui-Shan Liang](http://jsliang.twgogo.org/)

## License:

Major components:

* HTML5 Boileplate: [The Unlicense](http://unlicense.org)
* HTML5 Boilerplate: [The Unlicense](http://unlicense.org)
* Blueprint CSS: Modified MIT License
* 960 Grid System: MIT/GPL license
* Modernizr: MIT/BSD license
* jQuery: MIT/GPL license
* 960 Grid System: MIT/GPL License
* The 1140px Grid: CC BY-SA 3.0 Australia License
* Modernizr: MIT/BSD License
* jQuery: MIT/GPL License

Everything else:

* [The Unlicense](http://unlicense.org) (aka: public domain)

## Summary:

Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS and Starkers that will help you rapidly create brochure sites and blogs.
Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS/960 Grid System/1140 Grid and Starkers that will help you rapidly create brochure sites and blogs.
35 changes: 19 additions & 16 deletions comments.php
Expand Up @@ -4,14 +4,14 @@
<article id="comment-<?php comment_ID(); ?>">
<header class="comment-author vcard">
<?php echo get_avatar($comment,$size='32'); ?>
<?php printf(__('<cite class="fn">%s</cite>'), get_comment_author_link()) ?>
<time datetime="<?php echo comment_date('c') ?>"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s'), get_comment_date(), get_comment_time()) ?></a></time>
<?php edit_comment_link(__('(Edit)'),' ','') ?>
<?php printf(__('<cite class="fn">%s</cite>', 'roots'), get_comment_author_link()) ?>
<time datetime="<?php echo comment_date('c') ?>"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s', 'roots'), get_comment_date(), get_comment_time()) ?></a></time>
<?php edit_comment_link(__('(Edit)', 'roots'), '', '') ?>
</header>

<?php if ($comment->comment_approved == '0') : ?>
<div class="notice">
<p class="bottom"><?php _e('Your comment is awaiting moderation.') ?></p>
<p class="bottom"><?php _e('Your comment is awaiting moderation.', 'roots') ?></p>
</div>

<?php endif; ?>
Expand All @@ -28,12 +28,12 @@
<?php
// Do not delete these lines
if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
die ('Please do not load this page directly. Thanks!');
die (__('Please do not load this page directly. Thanks!', 'roots'));

if ( post_password_required() ) { ?>
<section id="comments">
<div class="notice">
<p class="bottom">This post is password protected. Enter the password to view comments.</p>
<p class="bottom"><?php _e('This post is password protected. Enter the password to view comments.', 'roots'); ?></p>
</div>
</section>
<?php
Expand All @@ -43,7 +43,7 @@
<?php // You can start editing here. ?>
<?php if ( have_comments() ) : ?>
<section id="comments">
<h3><?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
<h3><?php comments_number(__('No Responses to', 'roots'), __('One Response to', 'roots'), __('% Responses to', 'roots') ); ?> &#8220;<?php the_title(); ?>&#8221;</h3>
<ol class="commentlist">
<?php wp_list_comments('type=comment&callback=roots_comments'); ?>
<?php // wp_list_comments(); ?>
Expand All @@ -60,37 +60,40 @@
<?php else : // comments are closed ?>
<section id="comments">
<div class="notice">
<p class="bottom">Comments are closed.</p>
<p class="bottom"><?php _e('Comments are closed.', 'roots') ?></p>
</div>
</section>
<?php endif; ?>
<?php endif; ?>
<?php if ( comments_open() ) : ?>
<section id="respond">
<h3><?php comment_form_title( 'Leave a Reply', 'Leave a Reply to %s' ); ?></h3>
<h3><?php comment_form_title( __('Leave a Reply', 'roots'), __('Leave a Reply to %s', 'roots') ); ?></h3>
<p class="cancel-comment-reply"><?php cancel_comment_reply_link(); ?></p>
<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
<p>You must be <a href="<?php echo wp_login_url( get_permalink() ); ?>">logged in</a> to post a comment.</p>
<p><?php printf( __('You must be <a href="%s">logged in</a> to post a comment.', 'roots'), wp_login_url( get_permalink() ) ); ?></p>
<?php else : ?>
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
<?php if ( is_user_logged_in() ) : ?>
<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
<p><?php printf(__('Logged in as <a href="%s"/wp-admin/profile.php">%s</a>.', 'roots'), get_option('siteurl'), $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php __('Log out of this account', 'roots'); ?>"><?php _e('Log out &raquo;', 'roots'); ?></a></p>
<?php else : ?>
<p>
<label for="author">Name <?php if ($req) echo "(required)"; ?></label>
<label for="author"><?php _e('Name', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
<input type="text" class="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?>>
</p>
<p>
<label for="email">Email (will not be published) <?php if ($req) echo "(required)"; ?></label>
<label for="email"><?php _e('Email (will not be published)', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
<input type="email" class="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?>>
</p>
<p>
<label for="url">Website</label>
<label for="url"><?php _e('Website', 'roots'); ?></label>
<input type="url" class="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3">
</p>
<?php endif; ?>
<p><textarea name="comment" id="comment" rows="10" tabindex="4"></textarea></p>
<p><input name="submit" class="button" type="submit" id="submit" tabindex="5" value="Submit Comment"></p>
<p>
<label for="comment"><?php _e('Comment', 'roots'); ?></label>
<textarea name="comment" id="comment" tabindex="4"></textarea>
</p>
<p><input name="submit" class="button" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'roots'); ?>"></p>
<?php comment_id_fields(); ?>
<?php do_action('comment_form', $post->ID); ?>
</form>
Expand Down
130 changes: 130 additions & 0 deletions css/1140/1140.css
@@ -0,0 +1,130 @@
/* CSS Resets */

html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,address,cite,code,del,dfn,em,img,ins,q,small,strong,sub,sup,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{border:0;margin:0;padding:0}article,aside,figure,figure img,figcaption,hgroup,footer,header,nav,section,video,object{display:block}a img{border:0}figure{position:relative}figure img{width:100%}


/* ==================================================================================================================== */
/* ! The 1140px Grid V2 by Andy Taylor \ http://cssgrid.net \ http://www.twitter.com/andytlr \ http://www.andytlr.com */
/* ==================================================================================================================== */

.container {
padding-left: 20px;
padding-right: 20px;
}

.row {
width: 100%;
max-width: 1140px;
min-width: 755px;
margin: 0 auto;
overflow: hidden;
}

.onecol, .twocol, .threecol, .fourcol, .fivecol, .sixcol, .sevencol, .eightcol, .ninecol, .tencol, .elevencol {
margin-right: 3.8%;
float: left;
min-height: 1px;
}

.row .onecol {
width: 4.85%;
}

.row .twocol {
width: 13.45%;
}

.row .threecol {
width: 22.05%;
}

.row .fourcol {
width: 30.75%;
}

.row .fivecol {
width: 39.45%;
}

.row .sixcol {
width: 48%;
}

.row .sevencol {
width: 56.75%;
}

.row .eightcol {
width: 65.4%;
}

.row .ninecol {
width: 74.05%;
}

.row .tencol {
width: 82.7%;
}

.row .elevencol {
width: 91.35%;
}

.row .twelvecol {
width: 100%;
float: left;
}

.last {
margin-right: 0px;
}

img, object, embed {
max-width: 100%;
}

img {
height: auto;
}


/* Smaller screens */

@media only screen and (max-width: 1023px) {

body {
font-size: 0.8em;
line-height: 1.5em;
}

}


/* Mobile */

@media handheld, only screen and (max-width: 767px) {

body {
font-size: 16px;
-webkit-text-size-adjust: none;
}

.row, body, .container {
width: 100%;
min-width: 0;
margin-left: 0px;
margin-right: 0px;
padding-left: 0px;
padding-right: 0px;
}

.row .onecol, .row .twocol, .row .threecol, .row .fourcol, .row .fivecol, .row .sixcol, .row .sevencol, .row .eightcol, .row .ninecol, .row .tencol, .row .elevencol, .row .twelvecol {
width: auto;
float: none;
margin-left: 0px;
margin-right: 0px;
padding-left: 20px;
padding-right: 20px;
}

}
43 changes: 43 additions & 0 deletions css/1140/ie.css
@@ -0,0 +1,43 @@
.onecol {
width: 4.7%;
}

.twocol {
width: 13.2%;
}

.threecol {
width: 22.05%;
}

.fourcol {
width: 30.6%;
}

.fivecol {
width: 39%;
}

.sixcol {
width: 48%;
}

.sevencol {
width: 56.75%;
}

.eightcol {
width: 61.6%;
}

.ninecol {
width: 74.05%;
}

.tencol {
width: 82%;
}

.elevencol {
width: 91.35%;
}

0 comments on commit f6a95be

Please sign in to comment.