diff --git a/404.php b/404.php index 05f7f46..f0e7172 100644 --- a/404.php +++ b/404.php @@ -2,15 +2,15 @@
-

File Not Found

+

-

The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.

+

-

Please try the following:

+

    -
  • Check your spelling
    • -
  • Return to the home page
    • -
  • Click the Back button
    • +
    • +
  • home page', 'roots'), home_url()); ?>
    • +
  • Back button', 'roots'); ?>
diff --git a/README.md b/README.md index 38b3d2f..7e83a75 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,32 @@ ## Changelog: +### 3.2.2: April 24th, 2011 + + +### 3.2.1: April 20th, 2011 + + + +### 3.2.0: April 15th, 2011 + + + +### 3.1.1: April 7th, 2011 + + + ### 3.1.0: April 1st, 2011 -#### Contributors -[John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/) - ### 3.0.0: March 28th, 2011 - -#### 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 @@ -103,15 +123,20 @@
  • Added Blueprint CSS to Starkers
    • +## 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: @@ -119,4 +144,4 @@ Everything else: ## 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. \ No newline at end of file +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. \ No newline at end of file diff --git a/comments.php b/comments.php index 7632e36..bd6a83c 100644 --- a/comments.php +++ b/comments.php @@ -4,14 +4,14 @@
    - %s'), get_comment_author_link()) ?> - - + %s', 'roots'), get_comment_author_link()) ?> + +
    comment_approved == '0') : ?>
    -

    +

    @@ -28,12 +28,12 @@
    -

    This post is password protected. Enter the password to view comments.

    +

    -

    to “”

    +

    “”

      @@ -60,37 +60,40 @@
      -

      Comments are closed.

      +

      -

      +

      -

      You must be logged in to post a comment.

      +

      logged in to post a comment.', 'roots'), wp_login_url( get_permalink() ) ); ?>

      -

      Logged in as . Log out »

      +

      %s.', 'roots'), get_option('siteurl'), $user_identity); ?>

      - + >

      - + >

      - +

      -

      -

      +

      + + +

      +

      ID); ?>
      diff --git a/css/1140/1140.css b/css/1140/1140.css new file mode 100644 index 0000000..b8d6fa2 --- /dev/null +++ b/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; + } + +} \ No newline at end of file diff --git a/css/1140/ie.css b/css/1140/ie.css new file mode 100644 index 0000000..530c113 --- /dev/null +++ b/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%; +} \ No newline at end of file diff --git a/css/blueprint/screen.css b/css/blueprint/screen.css index 6d1f6ed..c0253e0 100644 --- a/css/blueprint/screen.css +++ b/css/blueprint/screen.css @@ -13,8 +13,8 @@ /* reset.css */ html {margin:0;padding:0;border:0;} -body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;} -article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;} +body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;} +article, aside, details, figcaption, figure, dialog, footer, header, hgroup, menu, nav, section {display:block;} body {line-height:1.5;background:white;} table {border-collapse:separate;border-spacing:0;} caption, th, td {text-align:left;font-weight:normal;float:none !important;} @@ -84,7 +84,7 @@ fieldset {padding:0 1.4em 1.4em 1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;} legend {font-weight:bold;font-size:1.2em;margin-top:-0.2em;margin-bottom:1em;} fieldset, #IE8#HACK {padding-top:1.4em;} legend, #IE8#HACK {margin-top:0;margin-bottom:0;} -input[type=text], input[type=password], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;} +input[type=text], input[type=password], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;color:#000;} input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus {border-color:#666;} select {background-color:#fff;border-width:1px;border-style:solid;} input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;} @@ -257,7 +257,7 @@ input.span-24, textarea.span-24 {width:938px;} div.prepend-top, .prepend-top {margin-top:1.5em;} div.append-bottom, .append-bottom {margin-bottom:1.5em;} .box {padding:1.5em;margin-bottom:1.5em;background:#e5eCf9;} -hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 1.45em;border:none;} +hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 17px;border:none;} hr.space {background:#fff;color:#fff;visibility:hidden;} .clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;} .clearfix, .container {display:block;} diff --git a/css/style.css b/css/style.css index e176317..729782a 100644 --- a/css/style.css +++ b/css/style.css @@ -2,7 +2,7 @@ --------------------------------------------------------------------------------------------------------------------------------------------------- */ /* Typography */ html { overflow-y: scroll; } -body { background: #fff; } +body { background: #fff; font-family: sans-serif; } a { color: #06c; } a:hover, a:focus { color:#09f; } @@ -58,11 +58,10 @@ a:link { -webkit-tap-highlight-color: #3399FF; } } /* Forms */ -input, select, textarea { font-family: sans-serif; font-size: 1em; } -button, input, select, textarea { margin: 0; } -label, input[type=button], input[type=submit], button { cursor: pointer; } -button { width: auto; overflow: visible; } +button, input, select, textarea { width: auto; overflow: visible; margin: 0; font-family: sans-serif; font-size: 1em; } +label, input[type=button], input[type=submit], input[type=image], button { cursor: pointer; } textarea { overflow: auto; } +input::-moz-focus-inner, button::-moz-focus-inner { border: 0; padding: 0; } /* Grid */ #wrap { } @@ -70,7 +69,8 @@ textarea { overflow: auto; } /* HEADER --------------------------------------------------------------------------------------------------------------------------------------------------- */ -#banner { position: relative; margin: 16px auto; z-index: 1000; } +#banner { position: relative; margin: 16px auto 0; z-index: 1000; } +#banner .container { padding: 0; } #logo { float: left; width: 300px; height: 75px; margin: 0 0 16px; padding: 0; } @@ -82,7 +82,7 @@ textarea { overflow: auto; } background-image: linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.1)); position: relative; list-style: none; - margin: 0; + margin: 0 0 16px 0; padding: 0; float: left; width: 100%; @@ -150,9 +150,10 @@ textarea { overflow: auto; } /* CONTENT --------------------------------------------------------------------------------------------------------------------------------------------------- */ #content { margin-bottom: 24px; } -#content .container { width: auto; position: relative; } +#content .container { width: auto; position: relative; padding: 0; } #main { position: relative; } +#main .container { padding: 0; } /* Posts */ .hentry header { margin-bottom: 1.5em; } @@ -202,7 +203,7 @@ figure.gallery-item figcaption { display: none; } /* Primary Sidebar */ #sidebar { position: relative; } -#sidebar .container { width: auto; } +#sidebar .container { width: auto; padding: 0; } #sidebar .widget { clear: both; margin-bottom: 1.5em; } #sidebar .widget .gform_wrapper ul { padding: 0; list-style-type: none; } @@ -210,7 +211,7 @@ figure.gallery-item figcaption { display: none; } /* FOOTER --------------------------------------------------------------------------------------------------------------------------------------------------- */ #content-info { clear: both; position: relative; } -#content-info > .container { padding-bottom: 1.5em; } +#content-info > .container { padding: 0 0 1.5em; } #content-info ul.menu { margin: 0 0 24px; padding: 0; list-style-type: none; } #content-info ul.menu li { display: inline; margin-right: 1em; } @@ -394,8 +395,7 @@ img.ui-datepicker-trigger { vertical-align: middle; } #mapp0_poweredby, #mapp1_poweredby, #mapp2_poweredby, #mapp3_poweredby, #mapp4_poweredby, #mapp5_poweredby, #mapp6_poweredby, #mapp7_poweredby, #mapp8_poweredby, #mapp9_poweredby, #mapp10_poweredby { display: none !important; } /* remove MapPress credit */ /* Search */ -#searchform #s { padding: 5px; } -#searchform #searchsubmit { -moz-appearance: textfield; -webkit-appearance: textfield; } +#searchform #s { padding: 5px; -moz-appearance: textfield; -webkit-appearance: textfield; } /* INTERNET EXPLORER @@ -432,6 +432,7 @@ img.ui-datepicker-trigger { vertical-align: middle; } pre, blockquote { border: 1px solid #999; page-break-inside: avoid; } thead { display: table-header-group; } tr, img { page-break-inside: avoid; } + img { max-width: 100% !important; } @page { margin: 0.5cm; } p, h2, h3 { orphans: 3; widows: 3; } h2, h3 { page-break-after: avoid; } diff --git a/footer.php b/footer.php index 27677bd..3a02228 100644 --- a/footer.php +++ b/footer.php @@ -1,3 +1,7 @@ + +
    +
    +
    + + + - + \ No newline at end of file diff --git a/functions.php b/functions.php index c411f1c..3be8cd7 100644 --- a/functions.php +++ b/functions.php @@ -1,6 +1,6 @@ \n"; - } elseif (is_960gs_12 == 1 || is_960gs_16 == 1) { - $styles .= "\n"; - $styles .= "\t\n"; - $styles .= "\t\n"; - } elseif (is_960gs_24 == 1) { - $styles .= "\n"; - $styles .= "\t\n"; - $styles .= "\t\n"; + if ($roots_css_framework === 'blueprint') { + $styles .= "\n"; + } elseif ($roots_css_framework === '960gs_12' || $roots_css_framework === '960gs_16') { + $styles .= "\n"; + $styles .= "\t\n"; + $styles .= "\t\n"; + } elseif ($roots_css_framework === '960gs_24') { + $styles .= "\n"; + $styles .= "\t\n"; + $styles .= "\t\n"; + } elseif ($roots_css_framework === '1140') { + $styles .= "\n"; } if (class_exists('RGForms')) { $styles .= "\t\n"; } - $styles .= "\t\n"; + $styles .= "\t\n"; - if (!is_960gs) { - $styles .= "\t\n"; + if ($roots_css_framework === 'blueprint') { + $styles .= "\t\n"; + } elseif ($roots_css_framework === '1140') { + $styles .= "\t\n"; } - return $styles; + return $styles; } -// set the maximum 'Large' image width to the Blueprint grid maximum width -if (!isset($content_width)) $roots_selected_css_framework === 'blueprint' ? $content_width = 950 : $content_width = 940; - +// set the maximum 'Large' image width to the maximum grid width +if (!isset($content_width)) { + switch ($roots_css_framework) { + case 'blueprint': + $content_width = 950; + break; + case '960gs_12': + $content_width = 940; + break; + case '960gs_16': + $content_width = 940; + break; + case '960gs_24': + $content_width = 940; + break; + case '1140': + $content_width = 1140; + break; + default: + $content_width = 950; + break; + } +} // tell the TinyMCE editor to use editor-style.css // if you have issues with getting the editor to show your changes then use the following line: // add_editor_style('editor-style.css?' . time()); @@ -80,8 +105,8 @@ add_theme_support('post-thumbnails'); add_theme_support('menus'); register_nav_menus( array( - 'primary_navigation' => 'Primary Navigation', - 'utility_navigation' => 'Utility Navigation' + 'primary_navigation' => 'Primary Navigation', + 'utility_navigation' => 'Utility Navigation' ) ); diff --git a/header.php b/header.php index 85fa247..0f11742 100644 --- a/header.php +++ b/header.php @@ -1,8 +1,8 @@ - - - - + + + + > @@ -10,17 +10,19 @@ - + - + - + - + - - + + + + +
    - Read the rest of this entry »

    '); ?> + '.__('Read the rest of this entry »', 'roots').'

    '); ?>