Commit Graph

1334 Commits

Author SHA1 Message Date
Konstantin Obenland 74e9b10a7a Merge branch 'pr/437'
Conflicts:
	inc/template-tags.php
2014-03-30 12:02:05 -07:00
Konstantin Obenland 7d24be9c97 _s: Resolve merge conflicts from master branch.
This also retains `$all_the_cool_cats` for some flavor. It has been
around since the initial fork of Toolbox and makes people smile:
https://twitter.com/TheFrosty/status/449581069231071232
2014-03-30 12:00:47 -07:00
Konstantin Obenland bd665b9d82 _s: Update pot file.
Last update was a good three months ago and we had some string changes
since then.

Fixes #434.
2014-03-30 10:40:43 -07:00
Konstantin Obenland 9a6b539bba _s: Formatting adjustments.
Improves readability of argument array and brings new comment in line with all other comments in this function.
2014-03-24 10:17:59 -07:00
Konstantin Obenland 7dc0ed3410 Merge pull request #445 from Automattic/speedy-cool-cats
_s: Optimize `_s_categorized_blog()`.
2014-03-24 10:00:47 -07:00
Mohammad Jangda 39a256b183 cool-cats: Limit number of categories fetched
We only need to know if there is more than one category so only fetch a
maximum of two categories. The rest of the categories are all gravy.
2014-03-24 16:46:38 +00:00
Mohammad Jangda ad2a2cd9b9 cool-cats: only fetch the ids to limit footprint
We don't really care much about the returned; all we want is the count
so there's no point in fetching all the category data.
2014-03-24 16:43:56 +00:00
Josh McCarty d193c519b4 Add support for html5 caption 2014-03-23 21:46:35 -07:00
Ulrich Pogson 5e62b8dc9e Remove html from string 2014-03-24 00:08:21 +01:00
Konstantin Kovshenin 87ca7b66ad Prefix transient. 2014-03-18 18:43:00 +04:00
Scott Smith adb609bfde Cleaned up gallery styles, per PR review 2014-03-07 15:22:06 -06:00
Konstantin Obenland 43241a811d Merge pull request #430 from philiparthurmoore/ditch-redundant-package-declaration
_s: Remove Redundant @package DocBlock Within Custom Header File
2014-03-07 07:50:20 -06:00
Philip Arthur Moore 16e0ca504d Remove redundant package DocBlock within custom header file 2014-03-07 06:41:14 -06:00
Konstantin Obenland 34aa212143 _s: Restore class delimiter in closing comment.
Removed in e3714be581.
2014-03-06 16:45:34 -06:00
Konstantin Obenland e3714be581 Merge pull request #424 from matthewsimo/master
_s: Add entry-footer class to footer elements in entries. Fixes #420.
2014-03-06 16:44:03 -06:00
Scott Smith 98c0f823e1 Add Gallery Styles
Patch for #425
2014-03-05 23:41:15 -06:00
Konstantin Obenland 0f689b25f4 _s: Restore default styles for `<img>` elements.
Lost in 651b89e497.
2014-03-05 20:41:56 -06:00
Matthew Simo e32f0ded99 Remove the entry-meta class from footer element's in content templates. Keep entry-footer class for this purpose. 2014-03-03 17:38:27 -06:00
Matthew Simo 1a8d576e65 Add entry-footer class to footer elements in an entry. 2014-03-03 17:12:51 -06:00
Konstantin Obenland 5de96cdb72 Merge pull request #419 from kovshenin/master
_s: Add HTML5 support for WordPress galleries.
2014-02-27 11:48:23 -08:00
Konstantin Kovshenin 9b0ae42c56 Maintain backwards compatibility for non-HTML5 galleries. 2014-02-27 13:42:24 -06:00
Konstantin Kovshenin 85bce0cc74 Add HTML5 support for WordPress galleries. 2014-02-27 13:27:00 -06:00
Konstantin Obenland 18928f50d6 Merge pull request #418 from emiluzelac/patch-13
_s: Improved comment specificity.
2014-02-25 08:52:33 -08:00
Konstantin Obenland 2fed8e49bd Merge pull request #417 from emiluzelac/patch-12
_s: Make WordPress.org URL available for translation.

Brings `_s` a little close to what has been the standard in default themes for a while.
2014-02-25 08:46:15 -08:00
Emil Uzelac 1eca4bfff5 Selector Hack
```*vertical-align: middle; /* Improves appearance and consistency in all browsers */``` does not apply to all browsers. 

Selector hack ```*``` is IE6/IE7 only. See https://gist.github.com/necolas/983116
2014-02-24 22:35:49 -06:00
Emil Uzelac a0700ff80e Sanitizing URL
Path was outdated. Please see https://github.com/Automattic/_s/pull/388
2014-02-24 20:42:06 -06:00
Konstantin Obenland 1e6e4d82ca Merge pull request #387 from aahan/patch-1
_s: Switch the order of text replacements.

Change ensures the textdomain in `style.css` is not replaced with the theme name, but rather with the theme slug. Broken in 1f15c20.
2014-02-24 16:22:52 -08:00
Takashi Irie cb528a14e4 Merge pull request #415 from emiluzelac/patch-11
Reword Inputs and Buttons with Forms.
2014-02-24 18:57:05 +00:00
Emil Uzelac d5d6d146ed Forms
Proposing to reword Inputs and Buttons with Forms. This way we can cover more than just couple of elements. Select feels like an outsider and textarea too, even though it's technically an input.

This will also be a perfect match with the rest :)

N.B. Something went wrong with my last proposal, sorry about that.
2014-02-23 18:16:53 -06:00
Tammie Lister e68c231ed1 Merge pull request #406 from grappler/remove-actions
Remove wpcom actions
2014-02-10 21:12:11 +00:00
Ulrich Pogson 88cdc5222e Remove wpcom actions 2014-02-10 21:19:41 +01:00
Ian Stewart ccb587cb26 Merge pull request #403 from karmatosed/master
Adds in specific classes rather than using wider navigation selector to prevent accidentally selecting, for example, posts tagged with navigation.
2014-02-10 12:01:39 -06:00
Tammie Lister 9f4d5a9188 Adds in specific classes rather than using wider navigation selector 2014-02-10 17:35:23 +00:00
Tammie Lister 8606665b5e Merge pull request #402 from sdavis2702/master
Fixed 'Media' table of contents number
2014-02-10 16:33:17 +00:00
Sean Davis 8349625b87 Fixed 'Media' table of contents number
The table of contents labeled both ‘Infinite scroll’ and ‘Media’ as
11.0. Media is 12.0.
2014-02-08 12:39:35 -06:00
Tammie Lister f873b94af0 Merge pull request #399 from karmatosed/master
Fix spelling of word Accessibility
2014-02-07 18:38:11 +00:00
Tammie Lister 1623325300 Fix spelling of word Accessibility 2014-02-07 18:37:28 +00:00
sixhours 50939d1ee4 Merge pull request #397 from karmatosed/master
Adds in comments and sections for style.css, props @karmatosed
2014-02-07 12:58:01 -05:00
sixhours 2a9c47e739 Merge pull request #398 from satrya/master
There is no more _s_comment() in inc/template-tags.php. Removing reference, props @satrya
2014-02-07 12:52:22 -05:00
Satrya c780103027 There is no more _s_comment() in inc/template-tags.php 2014-02-07 23:08:48 +07:00
Tammie Lister 651b89e497 Adds in comments and sections for style.css 2014-02-07 12:16:08 +00:00
Konstantin Obenland 5a3a9b0414 Merge pull request #394 from jeffgreendesign/patch-1
_s: Add missing word in documentation.
2014-02-06 16:49:05 -08:00
Jeff Green 4322e0b2a1 Update README.md
Add "in" to sentence.
2014-02-06 11:00:51 -05:00
Konstantin Obenland 4cfeb09681 Merge pull request #392 from mauryaratan/patch-1
_s: Update copyright year in license information.
2014-02-03 07:12:31 -08:00
Ram Ratan Maurya 7b8e1c4c2e Update Copyright Year 2014-02-03 17:05:12 +05:30
Konstantin Obenland 09720890a7 _s: Retrieve blog name with the correct context.
Passing `'display'` as the second argument will make the blog name filterable and runs it through `wp_texturize()`.

See https://core.trac.wordpress.org/ticket/26811
2014-01-24 09:54:05 -08:00
Aahan Krish 45b985d6d9 Fixed the order of text replacements
Proper order is necessary to do the intended text replacements.
2014-01-21 21:27:30 -08:00
obenland 96727271a0 Merge branch 'master' of https://github.com/Automattic/_s 2014-01-20 20:37:18 -08:00
obenland 0f2db471a7 Merge branch 'pr/366' 2014-01-20 20:34:51 -08:00
obenland 28a3044da9 _s: Minor formatting update. 2014-01-20 20:34:10 -08:00