From 9f866cde82d842d78842bc26c162becfb3af200e Mon Sep 17 00:00:00 2001 From: sixhours Date: Fri, 26 Jul 2013 11:59:25 -0400 Subject: [PATCH 01/15] Remove author link from archive.php --- archive.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archive.php b/archive.php index f054cc68..b55cb95f 100644 --- a/archive.php +++ b/archive.php @@ -28,7 +28,7 @@ get_header(); ?> * what author we're dealing with (if that is the case). */ the_post(); - printf( __( 'Author: %s', '_s' ), '' . get_the_author() . '' ); + printf( __( 'Author: %s', '_s' ), '' . get_the_author() . '' ); /* Since we called the_post() above, we need to * rewind the loop back to the beginning that way * we can run the loop properly, in full. @@ -99,4 +99,4 @@ get_header(); ?> - \ No newline at end of file + From 1a12794a21f2de66b503e34e4bc187be5b0b0bd7 Mon Sep 17 00:00:00 2001 From: obenland Date: Tue, 30 Jul 2013 11:07:13 -0700 Subject: [PATCH 02/15] _s: Make file paths more consistent in readme file. Props @asdfgh746. Fixes #269. --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 98ec7423..1cc8b2f2 100644 --- a/README.md +++ b/README.md @@ -7,21 +7,21 @@ My ultra-minimal CSS might make me look like theme tartare but that means less s * A just right amount of lean, well-commented, modern, HTML5 templates. * A helpful 404 template. -* A sample custom header implementation in inc/custom-header.php that can be activated by uncommenting one line in functions.php and adding the code snippet found the comments of inc/custom-header.php to your header.php template. -* Custom template tags in inc/template-tags that keep your templates clean and neat and prevent code duplication. -* Some small tweaks in /inc/extras.php that can improve your theming experience. -* Keyboard navigation for image attachment templates. The script can be found in js/keyboard-navigation.js. It’s enqueued in functions.php. -* A script at js/small-menu.js that makes your menu a toggled dropdown on small screens (like your phone), ready for CSS artistry. It’s enqueued in functions.php. -* 5 sample CSS layouts in /layouts: Two sidebars on the left, two sidebars on the right, a sidebar on either side of your content, and two-column layouts with sidebars on either side. -* Smartly organized starter CSS in style.css that will help you to quickly get your design off the ground. -* The GPL license in license.txt. :) Use it to make something cool. +* A sample custom header implementation in `inc/custom-header.php` that can be activated by uncommenting one line in functions.php and adding the code snippet found the comments of `inc/custom-header.php` to your `header.php` template. +* Custom template tags in `inc/template-tags.php` that keep your templates clean and neat and prevent code duplication. +* Some small tweaks in `inc/extras.php` that can improve your theming experience. +* Keyboard navigation for image attachment templates. The script can be found in `js/keyboard-navigation.js`. It's enqueued in `functions.php`. +* A script at `js/small-menu.js` that makes your menu a toggled dropdown on small screens (like your phone), ready for CSS artistry. It's enqueued in `functions.php`. +* 5 sample CSS layouts in `layouts`: Two sidebars on the left, two sidebars on the right, a sidebar on either side of your content, and two-column layouts with sidebars on either side. +* Smartly organized starter CSS in `style.css` that will help you to quickly get your design off the ground. +* Licensed under GPLv2 or later. :) Use it to make something cool. Getting Started --------------- If you want to keep it simple, head over to http://underscores.me and generate your `_s` based theme from there. You just input the name of the theme you want to create, click the "Generate" button, and you get your ready-to-awesomize starter theme. -If you want to set things up manually, download `_s` from github. The first thing you want to do is copy the `_s` directory and change the name to something else — Like, say, `megatherium` — then you'll need to do a three-step find and replace on the name in all the templates. +If you want to set things up manually, download `_s` from github. The first thing you want to do is copy the `_s` directory and change the name to something else - Like, say, `megatherium` - then you'll need to do a three-step find and replace on the name in all the templates. 1. Search for `'_s'` (inside single quotations) to capture the text domain. 2. Search for `_s_` to capture all the function names. From 4227e37e4772672ab5ae14fd5a4cf1570d9cc566 Mon Sep 17 00:00:00 2001 From: obenland Date: Tue, 30 Jul 2013 11:19:38 -0700 Subject: [PATCH 03/15] _s: Remove three column layouts. We don't register a second sidebar and styles seem to be incomplete. Let's revisit this once we have a more modular way of putting `_s` together. Closes #199. --- layouts/content-sidebar-sidebar.css | 22 ---------------------- layouts/sidebar-content-sidebar.css | 22 ---------------------- layouts/sidebar-sidebar-content.css | 22 ---------------------- 3 files changed, 66 deletions(-) delete mode 100644 layouts/content-sidebar-sidebar.css delete mode 100644 layouts/sidebar-content-sidebar.css delete mode 100644 layouts/sidebar-sidebar-content.css diff --git a/layouts/content-sidebar-sidebar.css b/layouts/content-sidebar-sidebar.css deleted file mode 100644 index 4c73a7f3..00000000 --- a/layouts/content-sidebar-sidebar.css +++ /dev/null @@ -1,22 +0,0 @@ -/* -Theme Name: _s -Layout: Content-Sidebar-Sidebar -*/ - -.content-area { - float: left; - width: 100%; -} -.site-content { - margin: 0 40% 0 0; -} -.site-main .widget-area { - float: left; - margin: 0 0 0 -40%; - overflow: hidden; - width: 20%; -} -.site-footer { - clear: both; - width: 100%; -} diff --git a/layouts/sidebar-content-sidebar.css b/layouts/sidebar-content-sidebar.css deleted file mode 100644 index a2dc79a1..00000000 --- a/layouts/sidebar-content-sidebar.css +++ /dev/null @@ -1,22 +0,0 @@ -/* -Theme Name: _s -Layout: Sidebar-Content-Sidebar -*/ - -.content-area { - float: left; - width: 100%; -} -.site-content { - margin: 0 20%; -} -.site-main .widget-area { - float: left; - margin: 0 0 0 -100%; - overflow: hidden; - width: 20%; -} -.site-footer { - clear: both; - width: 100%; -} diff --git a/layouts/sidebar-sidebar-content.css b/layouts/sidebar-sidebar-content.css deleted file mode 100644 index 3daa3fc0..00000000 --- a/layouts/sidebar-sidebar-content.css +++ /dev/null @@ -1,22 +0,0 @@ -/* -Theme Name: _s -Layout: Sidebar-Sidebar-Content -*/ - -.content-area { - float: right; - margin: 0 0 0 -40%; - width: 100%; -} -.site-content { - margin: 0 0 0 40%; -} -.site-main .widget-area { - float: left; - overflow: hidden; - width: 20%; -} -.site-footer { - clear: both; - width: 100%; -} \ No newline at end of file From 1f15c20995faa1d44526ddbbd0678591fdd89a9e Mon Sep 17 00:00:00 2001 From: obenland Date: Tue, 30 Jul 2013 11:58:13 -0700 Subject: [PATCH 04/15] _s: Make theme headers translatable. Props @grappler. Fixes #203. --- README.md | 4 +++- style.css | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1cc8b2f2..aa076d6c 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,13 @@ Getting Started If you want to keep it simple, head over to http://underscores.me and generate your `_s` based theme from there. You just input the name of the theme you want to create, click the "Generate" button, and you get your ready-to-awesomize starter theme. -If you want to set things up manually, download `_s` from github. The first thing you want to do is copy the `_s` directory and change the name to something else - Like, say, `megatherium` - then you'll need to do a three-step find and replace on the name in all the templates. +If you want to set things up manually, download `_s` from github. The first thing you want to do is copy the `_s` directory and change the name to something else - Like, say, `megatherium` - then you'll need to do a five-step find and replace on the name in all the templates. 1. Search for `'_s'` (inside single quotations) to capture the text domain. 2. Search for `_s_` to capture all the function names. 3. Search for  _s (with a space before it) to capture DocBlocks. 4. Search for `_s-` to capture prefixed handles. +5. Search for `Text Domain: _s` in style.css. OR @@ -34,6 +35,7 @@ OR * Search for: `_s_` and replace with: `megatherium_` * Search for:  _s and replace with:  Megatherium * Search for: `_s-` and replace with: `megatherium-` +* Search for: `Text Domain: _s` and replace with: `Text Domain: megatherium` in style.css. Then, update the stylesheet header in style.css and the links in footer.php with your own information. Next, update or delete this readme. diff --git a/style.css b/style.css index e4a75664..50367bf5 100644 --- a/style.css +++ b/style.css @@ -7,6 +7,7 @@ Description: Hi. I'm a starter theme called _s, or underscores< Version: 1.3-wpcom License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html +Text Domain: _s Tags: This theme, like WordPress, is licensed under the GPL. From 810e499b9355e1635da11cde14ad401da3da5d15 Mon Sep 17 00:00:00 2001 From: obenland Date: Tue, 30 Jul 2013 12:12:45 -0700 Subject: [PATCH 05/15] _s: Use `
` element for main content. See: http://www.w3.org/TR/html51/grouping-content.html#the-main-element Props @BFTrick for initial patch. Fixes #222. --- 404.php | 5 +++-- archive.php | 4 ++-- footer.php | 2 +- header.php | 2 +- image.php | 4 ++-- inc/jetpack.php | 2 +- index.php | 4 ++-- layouts/content-sidebar.css | 4 ++-- layouts/sidebar-content.css | 4 ++-- page.php | 4 ++-- search.php | 4 ++-- single.php | 4 ++-- 12 files changed, 22 insertions(+), 21 deletions(-) diff --git a/404.php b/404.php index d2c2de6f..950cf977 100644 --- a/404.php +++ b/404.php @@ -7,8 +7,9 @@ get_header(); ?> +
-
+
@@ -50,7 +51,7 @@ get_header(); ?>
-
+
\ No newline at end of file diff --git a/archive.php b/archive.php index b55cb95f..f808fd6a 100644 --- a/archive.php +++ b/archive.php @@ -10,7 +10,7 @@ get_header(); ?>
-
+
@@ -95,7 +95,7 @@ get_header(); ?> -
+
diff --git a/footer.php b/footer.php index 7dd82a8b..95646bab 100644 --- a/footer.php +++ b/footer.php @@ -8,7 +8,7 @@ */ ?> - +