diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a147d2..a3addc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +### 7.0.2: October 24th, 2014 +* Simplify comments, use core comment form and list +* Remove HTML5 shiv from Modernizr build +* Move JavaScript to footer +* Update hEntry schema to use `updated` instead of `published` +* Move variables into `main.less` +* Add `roots_body_class` function that checks for page slug in `body_class` +* Move `wp_footer` from footer template into `base.php` + ### 7.0.1: August 15th, 2014 * Move `
` and `.sidebar` markup out of PHP and into LESS * Define `WP_ENV` if it is not already defined diff --git a/assets/less/_bootstrap.less b/assets/less/_bootstrap.less index 700f225..425658e 100644 --- a/assets/less/_bootstrap.less +++ b/assets/less/_bootstrap.less @@ -6,7 +6,6 @@ // Variables @import "../vendor/bootstrap/less/variables"; -@import "_variables"; // Bootstrap variable overrides and custom variables // Mixins: Utilities @import "../vendor/bootstrap/less/mixins/hide-text"; diff --git a/assets/less/main.less b/assets/less/main.less index e300484..5affb9f 100644 --- a/assets/less/main.less +++ b/assets/less/main.less @@ -1,6 +1,9 @@ // Bootstrap @import "_bootstrap"; +// Variable overrides and custom variables +@import "_variables"; + // Roots @import "_global"; // Base styling & custom mixins @import "components/_buttons"; // Button tweaks diff --git a/base.php b/base.php index 27c050b..9828b4c 100644 --- a/base.php +++ b/base.php @@ -27,5 +27,7 @@ + + diff --git a/bower.json b/bower.json index 3dde4cf..d556cd2 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "roots", - "version": "7.0.1", + "version": "7.0.2", "homepage": "http://roots.io", "authors": [ "Ben Word " diff --git a/functions.php b/functions.php index 515a348..a93b5e1 100644 --- a/functions.php +++ b/functions.php @@ -19,7 +19,6 @@ $roots_includes = array( 'lib/titles.php', // Page titles 'lib/nav.php', // Custom nav modifications 'lib/gallery.php', // Custom [gallery] modifications - 'lib/comments.php', // Custom comments modifications 'lib/scripts.php', // Scripts and stylesheets 'lib/extras.php', // Custom functions ); diff --git a/lang/roots.pot b/lang/roots.pot index 746b034..4315807 100644 --- a/lang/roots.pot +++ b/lang/roots.pot @@ -1,5 +1,4 @@ msgid "" -msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,10 +19,12 @@ msgid "an out-of-date link" msgstr "" #: base.php:6 -msgid "You are using an outdated browser. Please upgrade your browser to improve your experience." +msgid "" +"You are using an outdated browser. Please upgrade your browser to improve your experience." msgstr "" -#: functions.php:29 +#: functions.php:28 msgid "Error locating %s for inclusion" msgstr "" @@ -48,7 +49,9 @@ msgid "%s Theme Activation" msgstr "" #: lib/activation.php:52 -msgid "These settings are optional and should usually be used only on a fresh installation" +msgid "" +"These settings are optional and should usually be used only on a fresh " +"installation" msgstr "" #: lib/activation.php:59 lib/activation.php:62 @@ -110,11 +113,11 @@ msgstr "" msgid "Continued" msgstr "" -#: lib/init.php:36 +#: lib/init.php:40 msgid "Primary" msgstr "" -#: lib/init.php:45 +#: lib/init.php:49 msgid "Footer" msgstr "" @@ -146,21 +149,10 @@ msgstr "" msgid "Not Found" msgstr "" -#: templates/comment.php:4 -msgid "%1$s" -msgstr "" - -#: templates/comment.php:5 -msgid "(Edit)" -msgstr "" - -#: templates/comment.php:9 -msgid "Your comment is awaiting moderation." -msgstr "" - #: templates/comments.php:9 -msgid "One Response to “%2$s”" -msgid_plural "%1$s Responses to “%2$s”" +msgctxt "comments title" +msgid "One response to “%2$s”" +msgid_plural "%1$s responses to “%2$s”" msgstr[0] "" msgstr[1] "" @@ -172,58 +164,10 @@ msgstr "" msgid "Newer comments →" msgstr "" -#: templates/comments.php:30 templates/comments.php:35 +#: templates/comments.php:31 msgid "Comments are closed." msgstr "" -#: templates/comments.php:42 -msgid "Leave a Reply" -msgstr "" - -#: templates/comments.php:42 -msgid "Leave a Reply to %s" -msgstr "" - -#: templates/comments.php:45 -msgid "You must be logged in to post a comment." -msgstr "" - -#: templates/comments.php:50 -msgid "Logged in as %s." -msgstr "" - -#: templates/comments.php:51 -msgid "Log out of this account" -msgstr "" - -#: templates/comments.php:51 -msgid "Log out »" -msgstr "" - -#: templates/comments.php:55 -msgid "Name" -msgstr "" - -#: templates/comments.php:55 templates/comments.php:59 -msgid " (required)" -msgstr "" - -#: templates/comments.php:59 -msgid "Email (will not be published)" -msgstr "" - -#: templates/comments.php:63 -msgid "Website" -msgstr "" - -#: templates/comments.php:68 -msgid "Comment" -msgstr "" - -#: templates/comments.php:71 -msgid "Submit Comment" -msgstr "" - #: templates/content-single.php:11 msgid "Pages:" msgstr "" @@ -239,6 +183,7 @@ msgstr "" #: templates/searchform.php:4 templates/searchform.php:6 msgid "Search" msgstr "" + #. Theme Name of the plugin/theme msgid "Roots Starter Theme" msgstr "" @@ -248,7 +193,10 @@ msgid "http://roots.io/starter-theme/" msgstr "" #. Description of the plugin/theme -msgid "Roots is a WordPress starter theme based on HTML5 Boilerplate & Bootstrap. Contribute on GitHub" +msgid "" +"Roots is a WordPress starter theme based on HTML5 Boilerplate & Bootstrap. " +"Contribute on " +"GitHub" msgstr "" #. Author of the plugin/theme diff --git a/lib/comments.php b/lib/comments.php deleted file mode 100644 index afe1f11..0000000 --- a/lib/comments.php +++ /dev/null @@ -1,52 +0,0 @@ - - + - -
- -
- - +
- -
- -

-

- -

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

- -
- -

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

- -
- - > -
-
- - > -
-
- - -
- -
- - -
-

- - ID); ?> -
- - -
+ + diff --git a/templates/entry-meta.php b/templates/entry-meta.php index e0ba57e..cbab2e4 100644 --- a/templates/entry-meta.php +++ b/templates/entry-meta.php @@ -1,2 +1,2 @@ - + diff --git a/templates/footer.php b/templates/footer.php index f34fe5f..3c83574 100644 --- a/templates/footer.php +++ b/templates/footer.php @@ -3,5 +3,3 @@ - -