Compare commits

...

111 Commits
4.2.2 ... 4.1.1

Author SHA1 Message Date
Andrew Nacin
921ff2746d Tag 4.1.1
Built from https://develop.svn.wordpress.org/@31478


git-svn-id: http://core.svn.wordpress.org/tags/4.1.1@31459 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-18 23:34:42 +00:00
Andrew Nacin
da742c0489 Bump $tinymce_version in the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@31477


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-18 22:08:23 +00:00
Andrew Nacin
29a8d70a31 Update @since in [31084]. see #30843.
Built from https://develop.svn.wordpress.org/branches/4.1@31476


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31457 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-18 21:56:23 +00:00
Andrew Nacin
67990a8e87 Remove errant string.
Built from https://develop.svn.wordpress.org/branches/4.1@31475


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-18 21:46:22 +00:00
Dominik Schilling
49ec4553c3 About: Add changelog for 4.1.1.
Built from https://develop.svn.wordpress.org/branches/4.1@31474


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-18 20:25:23 +00:00
Helen Hou-Sandí
4a877ade5a Revert [31198] from the 4.1 branch, as it is an incomplete fix that introduces more problems than the tiny issue it was attempting to solve.
see #30725.

Built from https://develop.svn.wordpress.org/branches/4.1@31468


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-17 14:11:25 +00:00
Dion Hulse
4ff80ae587 Fix the display of Audio and Video in the Media Library when using IE8 and below.
This delays the execution of instantiating of the MediaElement.js player until the render is complete, and the node is in the DOM.
Although it's a bug that this is needed in the first place, this will cover us until a new MediaElement.ks release is made.

Props afercia.
Fixes #31058 for 4.1.

Built from https://develop.svn.wordpress.org/branches/4.1@31444


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-13 05:54:26 +00:00
Dion Hulse
8518481173 TinyMCE: ensure the image toolbar stays visible when the image is much wider than the editor.
Props iseulde.
Merges [31362] to the 4.1 branch.
Fixes #30696.

Built from https://develop.svn.wordpress.org/branches/4.1@31437


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 06:02:24 +00:00
Dion Hulse
1c36669bce TinyMCE: select the iframe element by id. Needed as some browser extensions insert extra elements in the page.
Props iseulde.
Merges [31180] to the 4.1 branch.
Fixes #30785.

Built from https://develop.svn.wordpress.org/branches/4.1@31436


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31417 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 06:00:23 +00:00
Dion Hulse
0c28c25442 Revert [31080] from the 4.1 branch and replace it with a small function in an already changed file.
By doing this, we avoid shipping 400KB of changed CSS for such a minor css addition.

See https://build.trac.wordpress.org/changeset/31061 for the full size of [31080] in build.
See #30895.

Built from https://develop.svn.wordpress.org/branches/4.1@31435


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 05:37:22 +00:00
Dion Hulse
f7eb6f17e3 Move the (recently added) .notice admin notices below the first H2, same as the .updated and .error notices.
Props sippis.
Merges [31023] to the 4.1 branch.
Fixes #30885.

Built from https://develop.svn.wordpress.org/branches/4.1@31434


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31415 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 05:21:22 +00:00
Dion Hulse
e2825e3004 In paginate_links(), don't override custom format arguments when setting up default 'add_args'.
Since 4.1 [29780], the default value of the 'add_args' argument in
paginate_links() has been determined by parsing the current URL. This change
had the side effect of overriding custom values of 'format' that changed the
pagination query var, with the result that plugins using `paginate_links()`
with a custom format generated the incorrect links unless explicitly
declaring 'add_args=false' to prevent the default values from overriding. We
fix this behavior by parsing URL query vars into the 'add_args' array only
after the explicit function params have been parsed, and by skipping the
current page's pagination query var when doing this parsing (to avoid the
override).

Props obenland.
Merges [31203], [31432] to the 4.1 branch.
Fixes #30831.

Built from https://develop.svn.wordpress.org/branches/4.1@31433


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 02:20:22 +00:00
Dion Hulse
f7b1a10f47 Bump 4.1.1 version numbers & dates.
Built from https://develop.svn.wordpress.org/branches/4.1@31431


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 01:35:22 +00:00
Dion Hulse
281b8022e1 Prevent IE9 and lower displaying the download file dialogue when attempting
to upload using the `html4` Plupload handler.

The HTML4 Plupload handler uses a hidden iframe to POST the upload form, and
unfortunately Internet Explorer 9 doesn't support the `application/json`
content-type which `wp_send_json_success()` and requires `text/html` instead.

This partially reverts [30354], keeping the better error messages.

Merges [31429] to the 4.1 branch.
Fixes #31037.

Built from https://develop.svn.wordpress.org/branches/4.1@31430


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 01:33:24 +00:00
Dion Hulse
d349b9fdaf Ensure that WP_Customize_Setting::value() returns default value for setting if not dirty.
There was regression introduced by #28580 where only changed (dirty) settings now are POST'ed to the Customizer preview.

* Allow WP_Customize_Manager::post_value() to accept a second $default argument.
* Introduce WP_Customize_Manager::unsanitized_post_values() for accessing previously-private member variable _post_values.
* Do require_once instead of require for Customizer classes.
* Add unit tests for WP_Customize_Manager and WP_Customize_Setting.

Props westonruter, boonebgorges.
Merges [31329] [31339] [31342] [31360] to the 4.1 branch.
Fixes #30988.

Built from https://develop.svn.wordpress.org/branches/4.1@31410


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-11 06:25:23 +00:00
Dion Hulse
a8ac7d3dc1 jQuery UI: Add missing dependencies for puff and scale effects.
Props ocean90.
Merges [31273] to the 4.1 branch.
Fixes #31113.

Built from https://develop.svn.wordpress.org/branches/4.1@31398


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-10 01:46:24 +00:00
Dion Hulse
14fb3b11d6 Customizer: Improve IE 8 compatibility.
* Use square bracket notation for `default` keywords.
* Use Underscores `indexOf` for arrays.

Props westonruter, ocean90.
Merges [30991] to the 4.1 branch.
Fixes #30781.

Built from https://develop.svn.wordpress.org/branches/4.1@31397


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-10 01:41:24 +00:00
Dion Hulse
73ce260784 Support array values in WP_Date_Query::validate_date_values().
Introduced in [29925], `validate_date_values()` throws `_doing_it_wrong()`
notices when values passed as part of a `WP_Date_Query` do not reflect actual
dates. However, the validation did not account properly for the case where an
array of multiple values is passed, as when doing IN or BETWEEN queries.

Props dlh.
Merges [31179] to the 4.1 branch.
Fixes #31001.

Built from https://develop.svn.wordpress.org/branches/4.1@31396


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-10 01:14:23 +00:00
Dion Hulse
a496c6b42f Avoid an IE8 JS error when removing a MediaElement player.
Props afercia.
Merges [31386] to the 4.1 branch.
Fixes #31058.

Built from https://develop.svn.wordpress.org/branches/4.1@31395


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-10 01:01:22 +00:00
Dion Hulse
89150885b0 Revert [30696] pending further investigation.
Props johnbillion.
Merges [31390] to the 4.1 branch.
See #13071. Fixes #31011.

Built from https://develop.svn.wordpress.org/branches/4.1@31394


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-10 00:56:23 +00:00
Dion Hulse
cee0dfd66f Updates: Display plugin update rows even for plugins which are not hosted by WordPress.org or the HTTP request times out on.
See #29583.
Merges [31382] to the 4.1 branch.
Fixes #30767.

Built from https://develop.svn.wordpress.org/branches/4.1@31383


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-09 06:35:22 +00:00
Dion Hulse
7ba6f5dfd4 In wp_update_term(), limit duplicate slug checks to the same taxonomy as the updated term.
In 4.1 [30240], `wp_insert_term()` was modified to allow the creation of terms
with duplicate slugs, as long as the terms are in different taxonomies.
`wp_update_term()` didn't get the corresponding modification, with the result
that term updates fail when the term being updated shares a slug with an older
term, regardless of that older term's taxonomy.

Props ipm-frommen.
Merges [30985] to the 4.1 branch.
Fixes #30780.

Built from https://develop.svn.wordpress.org/branches/4.1@31378


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31359 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-09 03:59:21 +00:00
Dion Hulse
93cf0191c3 WP_Date_Query date validation should not fail for hour = 0.
Props ChriCo, tyxla.
Merges [31251] to the 4.1 branch.
Fixes #31067.

Built from https://develop.svn.wordpress.org/branches/4.1@31377


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-09 02:33:22 +00:00
Dion Hulse
ab103b5bf9 Default $parent in category_exists() should default to null rather than 0.
[29863] made the corresponding change in `term_exists()`. Failure to change the
default value in `category_exists()` meant that an unspecified value for
`$parent` would limit results to top-level categories.

Includes unit tests and corrected function documentation.

Props hissy.
Merges [31140] to the 4.1 branch.
Fixes #30975.

Built from https://develop.svn.wordpress.org/branches/4.1@31376


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31357 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-09 02:22:23 +00:00
Dion Hulse
6f1a6f77e8 The 4.1 branch is now for 4.1.1 development
Built from https://develop.svn.wordpress.org/branches/4.1@31375


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-09 02:10:24 +00:00
Helen Hou-Sandí
b7f0464ce4 Media: Prevent filter selects from jiggling when the spinner shows.
Merges [31197] to the 4.1 branch.

props valendesigns.
fixes #30725.

Built from https://develop.svn.wordpress.org/branches/4.1@31198


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31179 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-16 03:08:24 +00:00
Aaron Jorbin
18d810cf14 TinyMCE: Remove dashicon-no-alt.png, unused since [30694].
merges [31073] to 4.1 branch.

props kpdesign, MattyRob.
fixes #30791.


Built from https://develop.svn.wordpress.org/branches/4.1@31088


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-08 06:27:22 +00:00
Aaron Jorbin
0c2e698a04 Pass $resource_type to 'get_ancestors' filter.
The $resource_type argument was added to the get_ancestors() function in
[30141]. In that changeset, the documentation for the filter was updated to
indicate that it would receive $resource_type as a param, but the filter
itself was not updated accordingly.

Merges [30993] to 4.1 branch

Props tmatsuur, DrewAPicture.
Fixes #30843.


Built from https://develop.svn.wordpress.org/branches/4.1@31084


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-08 06:10:23 +00:00
Aaron Jorbin
c3e89ea432 Add context for 'Previous' and 'Next' strings in get_the_posts_pagination().
merges [31071] to 4.1 branch

props SergeyBiryukov
fixes #30762 for trunk.


Built from https://develop.svn.wordpress.org/branches/4.1@31082


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31063 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-08 05:57:22 +00:00
Aaron Jorbin
fa81716df2 Themes: Fix position of admin notice with .notice class.
merges [31054] to the 4.1 branch

props SergeyBiryukov
fixes #30895.


Built from https://develop.svn.wordpress.org/branches/4.1@31080


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-08 05:54:23 +00:00
Aaron Jorbin
9c1e85d376 Set the type attribute of the buttons for logging out of all sessions to buttons
By not setting this attribute, the buttons default to submit and as the first
submit button on the page, it causes pressing the enter key to log you out of
all sessions. This change restores the pre 4.1 behavior where pressing enter
while focused on a form field submits the form.

merges [31010] to the 4.1 branch

props ocean90

fixes #30871


Built from https://develop.svn.wordpress.org/branches/4.1@31076


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31057 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-08 04:42:26 +00:00
John Blackbourn
7f36f7b28f WordPress 4.1
Built from https://develop.svn.wordpress.org/branches/4.1@30974


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30961 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-18 18:17:24 +00:00
Andrew Nacin
9917bc6ea3 Cache-bust CDN URLs, as the images have been optimized.
Built from https://develop.svn.wordpress.org/branches/4.1@30973


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30960 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-18 18:15:21 +00:00
Andrew Nacin
4c59429498 About page: CDN images.
Merges [30971] to the 4.1 branch.

Built from https://develop.svn.wordpress.org/branches/4.1@30972


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30959 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-18 18:01:25 +00:00
Andrew Nacin
9b8bf43b51 Update theme POT files in the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@30970


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30957 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-18 17:02:23 +00:00
Andrew Nacin
0b64c326aa Bundled Themes: bump version numbers to coordinate with 4.1 release.
Merges [30967] to the 4.1 branch.

Built from https://develop.svn.wordpress.org/branches/4.1@30968


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-18 16:55:22 +00:00
Andrew Nacin
2921c659bc Update bundled theme POT files in the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@30966


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-18 01:33:44 +00:00
John Blackbourn
a71f4d4a62 4.1 RC3
Built from https://develop.svn.wordpress.org/branches/4.1@30964


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30951 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-18 00:18:23 +00:00
John Blackbourn
e4c35bd9f0 Twenty Fifteen: use better, universal sans-serif fonts for RTL, similar to Twenty Ten which also had serif fonts throughout.
Merges [30961] to the 4.1 branch.

Props iamtakashi
Fixes #30752.

Built from https://develop.svn.wordpress.org/branches/4.1@30962


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30950 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-17 22:44:22 +00:00
Andrew Nacin
ed60d52e69 Update individual term caches in get_terms().
Merges [30954] to the 4.1 branch.

props boonebgorges.
fixes #30749. see #21760.

Built from https://develop.svn.wordpress.org/branches/4.1@30959


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-17 17:36:43 +00:00
Andrew Nacin
a0d667ac2f Twenty Fifteen: Final RTL, editor-style, and search padding fixes.
Merges [30953], [30955], [30956] to the 4.1 branch.

Props iamtakashi, alex-ye.
fixes #30744, #30739, #30746.

Built from https://develop.svn.wordpress.org/branches/4.1@30958


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-17 17:36:23 +00:00
Andrew Nacin
6ace544904 About page RTL fixes.
Merges [30951] and [30952] to the 4.1 branch.

props helen, alex-ye.
fixes #30743, #30748.

Built from https://develop.svn.wordpress.org/branches/4.1@30957


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-17 17:31:23 +00:00
John Blackbourn
2fba9b2f63 About: Fix the WordPress badge.
`css-clean` (minifies our CSS) has an issue when using multiple backgrounds and background position together. Instead of relying on browser support for multiple backgrounds to display the WP logo as SVG, use the `.svg` CSS class.

Merges [30946] to the 4.1 branch.

Fixes #30735.

Built from https://develop.svn.wordpress.org/branches/4.1@30949


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30938 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 23:28:22 +00:00
John Blackbourn
3f08968a01 Pass locale to wordpress.org theme/plugin API.
In the future this will be used to return localized plugin/theme info.

Merges [30944] to the 4.1 branch.

See #30735.

Built from https://develop.svn.wordpress.org/branches/4.1@30948


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 23:24:23 +00:00
John Blackbourn
b07eaf34ef Twenty Fifteen: hide search input cancel button.
Merges [30945] to the 4.1 branch.

Fixes #30728.

Built from https://develop.svn.wordpress.org/branches/4.1@30947


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30936 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 23:20:23 +00:00
John Blackbourn
7486afd1f0 Add braces around a Docblock in an if statement, although not required by PHP, this is required by our coding standards for readability.
Introduced in 3.9 with r27365

Merges [30886] to the 4.1 branch.

See #25905

Built from https://develop.svn.wordpress.org/branches/4.1@30943


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30932 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 22:37:22 +00:00
John Blackbourn
de9f42c952 Editor, new DFW: fix fading out for the right sidebar in IE.
Merges [30853] to the 4.1 branch.

Fixes #30714.

Built from https://develop.svn.wordpress.org/branches/4.1@30942


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30931 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 22:31:21 +00:00
Sergey Biryukov
c69d37da64 Twenty Twelve: fix widget stacking problem in older IE browsers for Front Page template.
Merges [30868] to the 4.1 branch.

props TomasM, hiwhatsup.
see #28938.
Built from https://develop.svn.wordpress.org/branches/4.1@30941


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30930 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 22:24:22 +00:00
Sergey Biryukov
608ed06fc8 No need for wp_get_password_hint() to be prefixed as if it is private.
Merges [30855] to the 4.1 branch.

props nacin.
see #21243.
Built from https://develop.svn.wordpress.org/branches/4.1@30940


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 22:19:22 +00:00
Sergey Biryukov
01d91c36b7 Twenty Fifteen: fallback hex color for no-comments text should come first.
Merges [30910] to the 4.1 branch.

props iamtakashi.
see #30730.
Built from https://develop.svn.wordpress.org/branches/4.1@30939


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 22:09:22 +00:00
Sergey Biryukov
264ac59431 Twenty Fifteen: update scroll functionality to make sure child menu items are always reachable.
Merges [30838] to the 4.1 branch.

props iamtakashi.
see #30674.
Built from https://develop.svn.wordpress.org/branches/4.1@30938


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 22:08:23 +00:00
Sergey Biryukov
013133fe99 Twenty Fifteen, editor-style: remove margin-bottom from the gallery preview inside the editor.
Merges [30836] to the 4.1 branch.

props azaozz.
see #30697.
Built from https://develop.svn.wordpress.org/branches/4.1@30937


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30926 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 22:06:22 +00:00
Sergey Biryukov
7de0d9b820 Merge Twenty Fifteen commits [30834], [30845] to the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@30936


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 22:02:43 +00:00
Sergey Biryukov
49e9049b41 Merge Twenty Fifteen commits [30828], [30833], [30869] to the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@30935


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 22:02:22 +00:00
Andrew Nacin
d41a0696dc Fix MEjs styles for screen reader text and overflow on the volume slider.
Merges [30907] to the 4.1 branch.

props obenland.
see #30281.

Built from https://develop.svn.wordpress.org/branches/4.1@30934


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30923 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 21:41:22 +00:00
Andrew Nacin
911874c761 Twenty Fifteen: Use dynamic default color value instead of hardcoded color.
Merges [30932] to the 4.1 branch.

props iamtakashi.
see #30733.

Built from https://develop.svn.wordpress.org/branches/4.1@30933


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 21:39:22 +00:00
Andrew Nacin
84b9ec9070 Customizer: Add _wp_attachment_is_custom_background meta to uploaded background images.
Merges [30885] to the 4.1 branch.

props ocean90.
fixes #30707.

Built from https://develop.svn.wordpress.org/branches/4.1@30931


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30920 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 21:29:22 +00:00
Andrew Nacin
2b12434ad9 Last about page string. Merges [30929] to the 4.1 branch.
props celloexpressions.
fixes #30435.

Built from https://develop.svn.wordpress.org/branches/4.1@30930


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30919 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 21:28:24 +00:00
John Blackbourn
0e79ad1966 4.1 RC2
Built from https://develop.svn.wordpress.org/branches/4.1@30928


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30917 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 21:20:22 +00:00
John Blackbourn
2ca8a826ea Twenty Fifteen: Don't save unfiltered CSS in a setting.
Introduce `twentyfifteen_get_color_scheme_css( $colors )` which will be used for Underscore/Backbone and the PHP side. Let `twentyfifteen_color_scheme_css()` handle the color calculation on PHP side.

Merges [30893] to the 4.1 branch.

Fixes #30409.
Props ocean90

Built from https://develop.svn.wordpress.org/branches/4.1@30927


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30916 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 21:19:23 +00:00
John Blackbourn
ca16a486ec Twenty Fifteen: Remove various unnecessary esc_html() calls and replace various unnecessary esc_html_x() calls with _x().
Merges [30899], [30901], and [30905] into 4.1.

Props ocean90
Fixes #30724

Built from https://develop.svn.wordpress.org/branches/4.1@30926


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30915 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 20:52:21 +00:00
John Blackbourn
395e007a29 Twenty Fifteen: Remove esc_html() from blog description.
The blog description gets esc_html()'d *into* the DB. It's also escaped because the filter for `get_bloginfo()` is set to 'display'.

Merges [30897] to the 4.1 branch.

see #30724.

Built from https://develop.svn.wordpress.org/branches/4.1@30925


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30914 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 20:34:22 +00:00
John Blackbourn
1a427602c5 Twenty Fifteen: Don't escape translated strings.
Replace every unnecessary instance of `esc_html__()` and `esc_html_e()` with just `__()` and `_e()`.

Merges [30896] to the 4.1 branch.

see #30724.

Built from https://develop.svn.wordpress.org/branches/4.1@30924


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30913 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 20:33:22 +00:00
John Blackbourn
aea153bb20 Customizer: Export Preview instance to wp.customize.preview.
Merges [30891] to the 4.1 branch.

see #30409, #30726.

Built from https://develop.svn.wordpress.org/branches/4.1@30923


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 20:30:23 +00:00
John Blackbourn
9d8bc7aa6f Make the DFW paragraph on the About page narrower to mitigate an orphan in Firefox.
Merges [30921] to the 4.1 branch.

See #30435
Props melchoyce

Built from https://develop.svn.wordpress.org/branches/4.1@30922


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 20:03:23 +00:00
John Blackbourn
1b4e81a614 Background Updates: Pass back whether Group Writable support is being leveraged for an update to the WordPress.org API.
Merges [30860] to the 4.1 branch.

See #30245

Built from https://develop.svn.wordpress.org/branches/4.1@30920


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 19:54:23 +00:00
John Blackbourn
7cc8dd8985 Improve the fix for menu shakiness when over-scrolling. Recalculate heights on editor auto-resize.
Merges [30852] to the 4.1 branch.

See #30692.

Built from https://develop.svn.wordpress.org/branches/4.1@30918


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30908 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 19:43:22 +00:00
John Blackbourn
7736e255fc Fix menu shakiness when over-scrolling in Chrome and Safari on MacOS.
Merges [30844] to the 4.1 branch.

See #30692.

Built from https://develop.svn.wordpress.org/branches/4.1@30917


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30907 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 19:42:23 +00:00
John Blackbourn
2c5c4f0567 Customizer: Import missing wp.customize.Control.prototype._toggleActive.
Check also if `completeCallback` is set before calling it.

Merges [30871] to the 4.1 branch.

Props westonruter.
See #30701.

Built from https://develop.svn.wordpress.org/branches/4.1@30916


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30906 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 19:36:22 +00:00
John Blackbourn
3f71a916fa Customizer: Remove date filter from the Header/Background Image upload frames.
Adds an option to `wp.media.view.AttachmentsBrowser` to hide the date filter added in [29813].

Merges [30872] to the 4.1 branch.

See #30689.

Built from https://develop.svn.wordpress.org/branches/4.1@30915


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 19:21:22 +00:00
John Blackbourn
db3f2449d9 Remove caching for get_term_by() calls.
The new cache group scheme causes term invalidation to be overly broad, so
that busting the cache for one term will bust the cache for all terms in the
taxonomy. We'll have another go at more focused use of the 'last_changed'
incrementor in a future release.

Reverts [29915], [30073], [30080], [30108], [30112].

Merges [30900] to the 4.1 branch.

See #21760.

Built from https://develop.svn.wordpress.org/branches/4.1@30914


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30904 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 19:07:23 +00:00
Mark Jaquith
b67799149b Revert [30036].
Merges [30912] to the 4.1 branch.

see #18035
Built from https://develop.svn.wordpress.org/branches/4.1@30913


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30903 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 17:35:46 +00:00
John Blackbourn
b7cb613504 Customizer: Re-add the possibility to remove and restore a default background image.
Merges [30849] to the 4.1 branch.

Fixes #30683

Built from https://develop.svn.wordpress.org/branches/4.1@30911


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 17:10:22 +00:00
John Blackbourn
46ff132197 iOS: do not autofocus the readonly textarea with the code for wp-config.php in setup-config.php.
Merges [30843] to the 4.1 branch.

Fixes #30703.

Built from https://develop.svn.wordpress.org/branches/4.1@30909


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 15:53:21 +00:00
John Blackbourn
7dd30dce0a Do not autofocus text fields on page load on mobile devices. This is currently broken in many mobile browsers:
- iOS Safari opens the keyboard and auto-scrolls on the first tap anywhere on the screen triggering the click at an unexpected place. That makes it impossible to follow links or press buttons.
- Chrome on iOS opens the keyboard on load and may scroll the focused field off screen.
- The Android 4.4 browser only highlights the field, the user has to tap it to open the keyboard and type.

Merges [30842] to the 4.1 branch.

See #30703.

Built from https://develop.svn.wordpress.org/branches/4.1@30908


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 15:52:23 +00:00
John Blackbourn
88cd5c58d2 TinyMCE: remove reposition delay on showing the image toolbar. Not needed when no animation.
Merges [30829] to the 4.1 branch.

Fixes #30670.

Built from https://develop.svn.wordpress.org/branches/4.1@30906


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30896 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 15:11:22 +00:00
John Blackbourn
a4b0effcb6 Move a <code> tag out of a localised string on the About page.
Merges [30903] to the 4.1 branch.

Props pavelevap
See #30435

Built from https://develop.svn.wordpress.org/branches/4.1@30904


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30894 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 14:06:22 +00:00
John Blackbourn
3a78c06619 Autoprefixer for [30857].
Merges [30884] to the 4.1 branch.

See #30435.

Built from https://develop.svn.wordpress.org/branches/4.1@30902


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 13:43:22 +00:00
John Blackbourn
bc2b5e6574 Update/add plugin recommendation strings.
Update [30887], add a translation function to the Vine string.

Merges [30889] to the 4.1 branch.

Fixes #30337.

Built from https://develop.svn.wordpress.org/branches/4.1@30898


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 13:21:22 +00:00
John Blackbourn
337444a837 Updates to the 'Log out everywhere' implementation.
* Include a message and a disabled button when you're only logged in at one location.
 * Avoid leaking the session token in HTML.
 * Simplify, simplify, simplify.

Merges [30888] to the 4.1 branch.

Fixes #30264.

Built from https://develop.svn.wordpress.org/branches/4.1@30895


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 12:53:24 +00:00
John Blackbourn
dcf43205a0 Finalize two more about page strings.
Merges [30887] to the 4.1 branch.

See #30435

Built from https://develop.svn.wordpress.org/branches/4.1@30894


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 12:30:21 +00:00
John Blackbourn
20321d7cd9 Call it 'Distraction-free writing mode' and update the help string.
Merges [30890] to the 4.1 branch.

Fixes #30657.

Built from https://develop.svn.wordpress.org/branches/4.1@30892


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30882 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 12:15:24 +00:00
Andrew Nacin
d90f484c29 Update Akismet external to 3.0.4 in the 4.1 branch.
git-svn-id: http://core.svn.wordpress.org/branches/4.1@30875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-16 02:47:27 +00:00
John Blackbourn
409ea2798a Twenty Fourteen: remove Genericons as a dependency from loading the main stylesheet and IE-specific stylesheet.
Merges [30866] to the 4.1 branch.

See #30532.

Built from https://develop.svn.wordpress.org/branches/4.1@30883


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 23:00:24 +00:00
John Blackbourn
9a88013b03 Twenty Fifteen: remove Genericons as a dependency from loading the main stylesheet.
Merges [30865] to the 4.1 branch.

Props iamtakashi
See #30532.

Built from https://develop.svn.wordpress.org/branches/4.1@30882


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 22:59:23 +00:00
John Blackbourn
dc488ed5a0 Twenty Fifteen: remove fonts as a style dependency.
Merges [30832] to the 4.1 branch.

Props obenland, SergeyBiryukov.
Fixes #30678.

Built from https://develop.svn.wordpress.org/branches/4.1@30881


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 22:58:22 +00:00
John Blackbourn
45c28a1e96 Correct the height of the search type select element when searching the plugin directory.
Merges [30879] to the 4.1 branch.

Fixes #30719
Props pavelevap, eliorivero

Built from https://develop.svn.wordpress.org/branches/4.1@30880


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 22:34:24 +00:00
John Blackbourn
8e7db5e875 Fix search box position on the Add Plugins screen after resizing the window to narrower than 1000px and then back to wider than 1200px.
Merges [30830] to the 4.1 branch.

Fixes #30658.

Built from https://develop.svn.wordpress.org/branches/4.1@30878


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 22:31:28 +00:00
John Blackbourn
5b317eb250 Twenty Fifteen: remove license details for the image shown in the theme screenshot file as it is Creative Commons Zero, which doesn't require attribution.
Merges [30867] to the 4.1 branch.

Props iamtakashi
See #30156

Built from https://develop.svn.wordpress.org/branches/4.1@30877


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 22:02:24 +00:00
John Blackbourn
4812d2a5fa Clarify the behaviour of the wp_editor_set_quality and jpeg_quality filters.
Merges [30874] to the 4.1 branch.

Props DH-Shredder
See #29856

Built from https://develop.svn.wordpress.org/branches/4.1@30876


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 21:51:22 +00:00
John Blackbourn
296a23c662 Rename _wp_clear_update_cache() to wp_clean_update_cache().
This makes it match most cache-clearing functions, including the ones it wraps. Also no need for it to be prefixed as "private."

wp_clean_plugins_cache() doesn't always exist, so as a quick fix, clear the transient we care to clear.

Merges [30856] to the 4.1 branch.

Fixes #30369.

Built from https://develop.svn.wordpress.org/branches/4.1@30870


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 19:35:23 +00:00
John Blackbourn
709da31957 Avoid repeatedly calling is_tax( 'post_format', '...' ) in get_the_archive_title().
Merges [30854] to the 4.1 branch.

See #21995.

Built from https://develop.svn.wordpress.org/branches/4.1@30864


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 15:59:25 +00:00
John Blackbourn
8326ab1fc9 Customizer: Don't escape control descriptions in JavaScript templates.
Merges [30847] to the 4.1 branch.

Fixes #30682.

Built from https://develop.svn.wordpress.org/branches/4.1@30863


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 15:01:38 +00:00
John Blackbourn
b21241c5db TinyMCE: add another Edit translatable string for the tooltip of the Edit button on the image toolbar.
Merges [30839] to the 4.1 branch.

Props pavelevap
Fixes #30694

Built from https://develop.svn.wordpress.org/branches/4.1@30862


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 14:57:23 +00:00
John Blackbourn
23baee556e TinyMCE: make the tooltip for the remove button in the image toolbar translatable.
Merges [30835] to the 4.1 branch.

Props pavelevap
Fixes #30694

Built from https://develop.svn.wordpress.org/branches/4.1@30861


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 14:55:24 +00:00
Andrew Nacin
5d800b2ea7 About page design for 4.1.
Merges [30857] to the 4.1 branch.

props melchoyce and ryelle, who again outdid themselves.
see #30435.

Built from https://develop.svn.wordpress.org/branches/4.1@30859


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 10:51:24 +00:00
Andrew Nacin
5b0729aa10 About page updates.
* Live-update the number of active translations.
 * Finalize most strings.
 * Lazily remove links to admin-only screens based on cap checks.

Merges [30840] and [30841] to the 4.1 branch.

see #30435.

Built from https://develop.svn.wordpress.org/branches/4.1@30858


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 10:50:25 +00:00
John Blackbourn
5a40287f23 Revisions: Fix initial state of compareTwoMode.
Merges [30831] to the 4.1 branch.

Fixes #30672.

Built from https://develop.svn.wordpress.org/branches/4.1@30851


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-14 20:22:23 +00:00
John Blackbourn
bb16b3b284 Improve text for the DFW admin pointer. Remove the concatenation.
Props kpdesign, ianmjones.

Merges [30837] to the 4.1 branch.

See #30671.

Built from https://develop.svn.wordpress.org/branches/4.1@30850


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-14 19:59:22 +00:00
John Blackbourn
2fc06d04c5 In WP_Meta_Query, interpret 'value' correctly when used with EXISTS/NOT EXISTS.
As in earlier versions, EXISTS with a value is equivalent to '=', while NOT
EXISTS should always ignore 'value'.

Merges [30846] to the 4.1 branch.

Props barrykooij.
Fixes #30681

Built from https://develop.svn.wordpress.org/branches/4.1@30848


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30838 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-14 19:31:23 +00:00
John Blackbourn
deec4ec7ee 4.1 RC1
Built from https://develop.svn.wordpress.org/branches/4.1@30827


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30817 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-11 11:01:24 +00:00
John Blackbourn
2827fd2a64 Switch to (get_)the_posts_pagination() in Twenty Fifteen.
Merges [30824] to the 4.1 branch.

See #29808
Props obenland

Built from https://develop.svn.wordpress.org/branches/4.1@30826


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30816 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-11 10:37:23 +00:00
John Blackbourn
e2ad21e041 Rename (get_)the_pagination() to (get_)the_posts_pagination() for clarity.
Merges [30823] to the 4.1 branch

See #29808
Props obenland

Built from https://develop.svn.wordpress.org/branches/4.1@30825


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30815 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-11 10:35:22 +00:00
Andrew Nacin
7918030a9c About page text, first pass.
Merges [30821] to the 4.1 branch.

props johnbillion, helen, markjaquith, nacin.
see #30435.

Built from https://develop.svn.wordpress.org/branches/4.1@30822


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30812 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-11 10:16:43 +00:00
John Blackbourn
28c8a775ca Allow the type argument to be passed through get_the_pagination() as long as its value isn't array.
See #29808

Built from https://develop.svn.wordpress.org/branches/4.1@30819


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-11 09:37:23 +00:00
Andrew Nacin
1db4d4e970 Editor focus: Don't trigger when typing while the mouse is outside the editor.
Merges [30817] to the 4.1 branch.

props avryl.
fixes #20668.

Built from https://develop.svn.wordpress.org/branches/4.1@30818


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-11 09:35:22 +00:00
Andrew Nacin
96b5fdcc2d Fix the search field width in the media modal, media library grid and on the install new plugins screen.
Merges [30813] to the 4.1 branch.

props helen.
fixes #30658.

Built from https://develop.svn.wordpress.org/branches/4.1@30816


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30806 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-11 09:32:44 +00:00
Andrew Nacin
98211e7dcd TinyMCE, image toolbar: remove the animation and make the box-shadow lighter.
Merges [30812] to the 4.1 branch.

props melchoyce.
fixes #30664.

Built from https://develop.svn.wordpress.org/branches/4.1@30815


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30805 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-11 09:32:23 +00:00
Andrew Nacin
c103b48395 Merge Twenty Fifteen commits [30801-30806], [30808-30811] to the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@30814


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-11 09:30:26 +00:00
Gary Pendergast
3b5c56dda4 WPDB: In [30345,30346,30366,30375], we added sanity checks for saving posts containing emoji. We need to revert these checks for now, as they're not ready for release in 4.1.
See #21212.

Built from https://develop.svn.wordpress.org/branches/4.1@30807


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-10 22:58:28 +00:00
Andrew Nacin
28e0fefffd Branch 4.1
Built from https://develop.svn.wordpress.org/@30799

git-svn-id: http://core.svn.wordpress.org/branches/4.1@30789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-10 08:42:00 +00:00
151 changed files with 2181 additions and 2264 deletions

View File

@@ -1,6 +1,6 @@
WordPress - Web publishing software
Copyright 2014 by the contributors
Copyright 2015 by the contributors
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

View File

@@ -9,7 +9,7 @@
<body>
<h1 id="logo">
<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
<br /> Version 4.1
<br /> Version 4.1.1
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>

View File

@@ -27,7 +27,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s brings you a smoother writing and management experience.' ), $display_version ); ?></div>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you focus on your writing, and the new default theme lets you show it off in style.' ), $display_version ); ?></div>
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
@@ -41,110 +41,120 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
</a>
</h2>
<div class="changelog">
<div class="about-overview">
<?php if ( ( $locale = get_locale() ) && 'en_' === substr( $locale, 0, 3 ) ) : ?>
<embed src="//v.wordpress.com/bUdzKMro" type="application/x-shockwave-flash" width="640" height="360" allowscriptaccess="always" allowfullscreen="true" wmode="transparent"></embed>
<?php else : ?>
<img class="about-overview-img" src="//s.w.org/images/core/4.0/wp40.png" width="640" height="360" />
<?php endif; ?>
<div class="changelog point-releases">
<h3><?php echo _n( 'Maintenance Release', 'Maintenance Releases', 1 ); ?></h3>
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
'<strong>Version %1$s</strong> addressed %2$s bugs.', 21 ), '4.1.1', number_format_i18n( 21 ) ); ?>
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_4.1.1' ); ?>
</p>
</div>
<div class="changelog headline-feature">
<h2><?php _e( 'Introducing Twenty&nbsp;Fifteen' ); ?></h2>
<div class="featured-image">
<img src="//s.w.org/images/core/4.1/theme.png?0" />
</div>
<hr />
<div class="feature-section col two-col">
<div class="col-1">
<h3><?php _e( 'Manage your media with style' ); ?></h3>
<p><?php _e( 'Explore your uploads in a beautiful, endless grid. A new details preview makes viewing and editing any amount of media in sequence a snap.' ); ?></p>
<div class="feature-section">
<div class="col">
<h3><?php _e( 'Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.' ); ?></h3>
<p><?php printf( __( 'Twenty Fifteen has flawless language support, with help from <a href="%s">Google&#8217;s Noto font family</a>.' ), 'https://www.google.com/get/noto/' ); ?></p>
<p><?php _e( 'The straightforward typography is readable on any screen size.' ); ?></p>
<p><?php _e( 'Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.' ); ?></p>
</div>
<div class="col-2 last-feature">
<img src="//s.w.org/images/core/4.0/media.jpg" />
<div class="col">
<img class="" src="//s.w.org/images/core/4.1/mobile.png?0" />
</div>
</div>
<hr />
<div class="clear"></div>
</div>
<div class="feature-section col two-col">
<div class="col-1">
<div class="about-video about-video-embed">
<?php
echo wp_video_shortcode( array(
'mp4' => '//s.w.org/images/core/4.0/embed.mp4',
'ogv' => '//s.w.org/images/core/4.0/embed.ogv',
'webm' => '//s.w.org/images/core/4.0/embed.webm',
'loop' => true,
'autoplay' => true,
'width' => 500,
'height' => 352
) );
?>
</div>
</div>
<div class="col-2 last-feature">
<h3><?php _e( 'Working with embeds has never been easier' ); ?></h3>
<p><?php _e( 'Paste in a YouTube URL on a new line, and watch it magically become an embedded video. Now try it with a tweet. Oh yeah &#8212; embedding has become a visual experience. The editor shows a true preview of your embedded content, saving you time and giving you confidence.' ); ?></p>
<p><?php _e( 'We&#8217;ve expanded the services supported by default, too &#8212; you can embed videos from CollegeHumor, playlists from YouTube, and talks from TED. <a href="http://codex.wordpress.org/Embeds">Check out all of the embeds</a> that WordPress supports.' ); ?></p>
<hr />
<div class="changelog headline-feature dfw">
<h2><?php _e( 'Distraction-free writing' ); ?></h2>
<div class="feature-section">
<div class="dfw-container">
<img src="//s.w.org/images/core/4.1/focus.png?0" class="base-image" />
<img src="//s.w.org/images/core/4.1/focus1.png?0" class="overlay-image fade-in" />
<img src="//s.w.org/images/core/4.1/focus2.png?0" class="overlay-image fade-in" />
<img src="//s.w.org/images/core/4.1/focus3.png?0" class="overlay-image from-left" />
</div>
<h3><em><?php _e( 'Just write.' ); ?></em></h3>
<p><?php _e( 'Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on <strong>distraction-free writing mode</strong>. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.' ); ?></p>
</div>
</div>
<hr />
<hr />
<div class="changelog feature-list finer-points">
<h2><?php _e( 'The Finer Points' ); ?></h2>
<div class="feature-section col two-col">
<div class="col-1">
<h3><?php _e( 'Focus on your content' ); ?></h3>
<p><?php _e( 'Writing and editing is smoother and more immersive with an editor that expands to fit your content as you write, and keeps the formatting tools available at all times.' ); ?></p>
<div>
<svg viewBox="-30 -30 160 160"><path d="M57.9,28.9h-7.9c-1.6,0-3.2,0.3-4.7,1c-1.5,0.7-2.7,1.6-3.7,2.7l-4.7-14.2H21.7L9.2,55.3h8.9l3.9-10.5h14.9v21.1H10.5 c-2.9,0-5.4-1-7.4-3.1C1,60.6,0,58.1,0,55.3V18.4c0-2.9,1-5.4,3.1-7.4c2.1-2.1,4.5-3.1,7.4-3.1h36.8c2.9,0,5.4,1,7.4,3.1 c2.1,2.1,3.1,4.5,3.1,7.4V28.9z M34.3,39.5H23.6l5.3-15.4L34.3,39.5z M52.6,34.2h36.8c2.9,0,5.4,1,7.4,3.1c2.1,2.1,3.1,4.5,3.1,7.4 v36.8c0,2.9-1,5.4-3.1,7.4c-2.1,2.1-4.5,3.1-7.4,3.1H52.6c-2.9,0-5.4-1-7.4-3.1c-2.1-2.1-3.1-4.5-3.1-7.4V44.7c0-2.9,1-5.4,3.1-7.4 C47.3,35.2,49.8,34.2,52.6,34.2z M90.8,60.5v-5.7H74.1V43.4H68v11.4H51.3v5.7h6.7c0.3,2.3,1.1,4.7,2.2,7.2c1.2,2.5,2.7,4.7,4.5,6.6 c-2.2,0.9-4.5,1.7-6.9,2.3s-4.1,0.9-5.2,0.9l0.3,1.4c0.2,0.9,0.4,2,0.6,3.3c0.2,1.3,0.3,2.3,0.2,3.1c2.2,0,4.9-0.6,8.1-1.7 c3.2-1.1,6.3-2.6,9.2-4.3c2.9,1.8,6,3.2,9.3,4.3c3.3,1.1,6.1,1.7,8.3,1.7c0-0.5,0-1.1,0.1-1.8c0.1-0.7,0.2-1.4,0.3-2 c0.1-0.7,0.2-1.3,0.3-1.9c0.1-0.6,0.2-1.1,0.3-1.4l0.1-0.6c-1.2,0-3-0.3-5.4-1c-2.5-0.7-4.8-1.4-7.1-2.3c1.8-2,3.3-4.2,4.4-6.6 s1.9-4.8,2.2-7.1H90.8z M70.7,70.7c-2.7-2.5-4.4-5.8-5.3-10.2h11c-0.9,4.4-2.7,7.7-5.3,10.2l-0.2,0.2 C70.8,70.8,70.8,70.7,70.7,70.7z"/></svg>
<h4><?php _e( 'Choose a language' ); ?></h4>
<p><?php
$count = '<span id="translations-count">' . 40 . '</span>';
$string = __( 'Right now, WordPress %1$s is already translated into %2$s languages, with more always in progress. You can switch to any translation on the <a href="%3$s">General Settings</a> screen.' );
if ( ! current_user_can( 'manage_options' ) ) {
$string = strip_tags( $string );
}
echo sprintf( $string, $display_version, $count, admin_url( 'options-general.php' ) );
?></p>
</div>
<div class="col-2 last-feature">
<div class="about-video about-video-focus">
<?php
echo wp_video_shortcode( array(
'mp4' => '//s.w.org/images/core/4.0/focus.mp4',
'ogv' => '//s.w.org/images/core/4.0/focus.ogv',
'webm' => '//s.w.org/images/core/4.0/focus.webm',
'loop' => true,
'autoplay' => true,
'width' => 500,
'height' => 281
) );
?>
</div>
</div>
</div>
<hr />
<div class="feature-section col two-col">
<div class="col-1">
<img src="//s.w.org/images/core/4.0/plugins.png" />
<div class="last-feature">
<svg viewBox="-30 -30 160 160"><path d="M35.3,26.5H5.9c-1.5,0-2.9-0.6-4.1-1.7C0.6,23.6,0,22.2,0,20.6c0-1.6,0.6-3,1.7-4.1c1.2-1.2,2.5-1.7,4.1-1.7h29.4 c1.6,0,3,0.6,4.1,1.7c1.2,1.2,1.7,2.5,1.7,4.1c0,1.6-0.6,3-1.7,4.1C38.3,25.9,36.9,26.5,35.3,26.5z M68.9,77.7 c-1.2,1.2-2.5,1.7-4.1,1.7H17.6c-1.6,0-3-0.6-4.1-1.7c-1.2-1.2-1.7-2.5-1.7-4.1V38.2c0-1.6,0.6-3,1.7-4.1c1.2-1.2,2.5-1.7,4.1-1.7 h47.1c1.6,0,3,0.6,4.1,1.7c1.2,1.2,1.7,2.5,1.7,4.1v35.3C70.6,75.1,70,76.5,68.9,77.7z M76.5,61.8L100,85.3V26.5L76.5,50V61.8z"/></svg>
<h4><?php _e( 'Vine embeds' ); ?></h4>
<p><?php printf( __( 'Embedding videos from Vine is as simple as pasting a URL onto its own line in a post. See the <a href="%s">full list</a> of supported embeds.' ), 'http://codex.wordpress.org/Embeds' ); ?></p>
</div>
<div class="col-2 last-feature">
<h3 class="higher"><?php _e( 'Finding the right plugin' ); ?></h3>
<p><?php _e( 'There are more than 30,000 free and open source plugins in the WordPress plugin directory. WordPress 4.0 makes it easier to find the right one for your needs, with new metrics, improved search, and a more visual browsing experience.' ); ?></p>
<a href="<?php echo admin_url( 'plugin-install.php' ); ?>" class="button button-large button-primary"><?php _e( 'Browse plugins' ); ?></a>
<div>
<svg viewBox="-30 -30 160 160"><path d="M61.4,78.6V61.4L72.9,50v40H10V27.1h45.7L44.3,38.6H21.4v40H61.4z M44.3,10H90v45.7L78.6,50V32.4l-32,31.9l-8.1-8.1 l34.8-34.9H50L44.3,10z"/></svg>
<h4><?php _e( 'Log out everywhere' ); ?></h4>
<p><?php printf( __( 'If you&#8217;ve ever worried you forgot to sign out from a shared computer, you can now go to <a href="%s">your profile</a> and log out everywhere.' ), get_edit_profile_url() ); ?></p>
</div>
<div class="last-feature">
<svg viewBox="-30 -30 160 160"><path d="M35.1,30.1l4.7-5.8l46.4,46.4L80,75c-1.7,1.7-4.6,3.1-8.6,4.3c-4,1.1-7.7,1.7-11,1.7h-20L34,87.4 c-1.5,1.5-3.3,2.3-5.5,2.3c-2.1,0-3.9-0.8-5.5-2.3c-1.5-1.5-2.3-3.3-2.3-5.4c0-2.1,0.8-4,2.3-5.5l6.4-6.4v-20 c0-3.3,0.5-7,1.6-11.2C32.1,34.7,33.4,31.8,35.1,30.1z M76.2,21L59.6,37.7L49.9,28l16.7-16.7c0.9-0.9,2.1-1.2,3.7-0.8 c1.6,0.3,3,1.2,4.3,2.5c1.3,1.3,2.2,2.7,2.5,4.3C77.4,18.9,77.1,20.1,76.2,21z M72.4,50.5l16.7-16.7c0.9-0.9,2.1-1.2,3.7-0.9 c1.6,0.3,3,1.1,4.3,2.5c1.3,1.3,2.2,2.7,2.5,4.3c0.3,1.6,0,2.8-0.9,3.7L82,60.1L72.4,50.5z"/><path d="M10.9,40.4l3.4,6.8L21,48l-4.7,5.2l1.3,7.5l-6.8-3.4l-6.8,3.4l1.3-7.5L0.7,48l6.8-0.8L10.9,40.4z"/></svg>
<h4><?php _e( 'Plugin recommendations' ); ?></h4>
<p><?php
$string = __( 'The <a href="%s">plugin installer</a> suggests plugins for you to try. Recommendations are based on the plugins you and other users have installed.' );
if ( ! current_user_can( 'install_plugins' ) ) {
$string = strip_tags( $string );
}
echo sprintf( $string, network_admin_url( 'plugin-install.php?tab=recommended' ) );
?></p>
</div>
</div>
</div>
<hr />
<div class="changelog under-the-hood">
<h3><?php _e( 'Under the Hood' ); ?></h3>
<div class="changelog feature-list">
<h2><?php _e( 'Under the Hood' ); ?></h3>
<div class="feature-section col three-col">
<div class="feature-section col two-col">
<div>
<h4><?php _e( 'Customizer API' ); ?></h4>
<p><?php _e( 'Contexts, panels, and a wider array of controls are now supported in the customizer.' ); ?></p>
</div>
<div>
<h4><?php _e( 'Query Ordering' ); ?></h4>
<p><?php
/* translators: 1: "ORDER BY" (SQL), 2: "WP_Query" */
printf( __( 'Developers have more flexibility creating %1$s clauses through %2$s.' ), '<code>ORDER&nbsp;BY</code>', '<code>WP_Query</code>' );
?></p>
<h4><?php _e( 'Complex Queries' ); ?></h4>
<p><?php printf( __( 'Metadata, date, and term queries now support advanced conditional logic, like nested clauses and multiple operators &mdash; %s.' ), '<code>A&nbsp;AND&nbsp;(&nbsp;B&nbsp;OR&nbsp;C&nbsp;)</code>' ); ?></p>
<h4><?php _e( 'Customizer API' ); ?></h4>
<p><?php _e( 'Expanded JavaScript APIs in the customizer enable a new media experience as well as dynamic and contextual controls, sections, and panels.' ); ?></p>
</div>
<div class="last-feature">
<h4><?php _e( 'External Libraries' ); ?></h4>
<p><?php _e( 'Updated libraries: TinyMCE&nbsp;4.1.3, jQuery&nbsp;1.11.1, MediaElement&nbsp;2.15.' ); ?></p>
<h4><?php
/* translators: %s: "<title>" tag */
printf( __( '%s tags in themes' ), '<code>&lt;title&gt;</code>' );
?></h4>
<p><?php
printf( __( '%s tells WordPress to handle the complexities of document titles.' ), "<code>add_theme_support( 'title-tag' )</code>" );
?></p>
<h4><?php _e( 'Developer Reference' ); ?></h4>
<p><?php printf( __( 'Continued improvements to inline code documentation have made the <a href="%s">developer reference</a> more complete than ever.' ), 'https://developer.wordpress.org/reference/' ); ?></p>
</div>
</div>
@@ -159,10 +169,21 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php
is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
</div>
</div>
</div>
<script>
jQuery(document).ready( function($) {
$.ajax( 'https://api.wordpress.org/translations/core/1.0/?version=4.1',
{ 'type' : 'HEAD' } ).done( function( data, textStatus, jqXHR ) {
var count = jqXHR.getResponseHeader( 'X-Translations-Count' );
if ( count ) {
$( '#translations-count' ).text( count );
}
});
});
</script>
<?php
include( ABSPATH . 'wp-admin/admin-footer.php' );

View File

@@ -32,6 +32,8 @@ if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['actio
require_once( ABSPATH . 'wp-admin/admin.php' );
header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
@@ -46,8 +48,6 @@ if ( ! current_user_can( 'upload_files' ) ) {
wp_die( __( 'You do not have permission to upload files.' ) );
}
header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
// just fetch the detail form for that attachment
if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
$post = get_post( $id );

View File

@@ -82,7 +82,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s brings you a smoother writing and management experience.' ), $display_version ); ?></div>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you focus on your writing, and the new default theme lets you show it off in style.' ), $display_version ); ?></div>
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

View File

@@ -1,12 +1,24 @@
/*------------------------------------------------------------------------------
22.0 - About Pages
1.0 Global: About, Credits, Freedoms
1.1 Typography
1.2 Structure
1.3 Point Releases
2.0 About Page
2.1 Typography
2.2 Structure
3.0 Credits & Freedoms Pages
------------------------------------------------------------------------------*/
/*------------------------------------------------------------------------------
1.0 - Global: About, Credits, Freedoms
------------------------------------------------------------------------------*/
.about-wrap {
position: relative;
margin: 25px 20px 0 40px;
max-width: 1050px; /* readability */
font-size: 15px;
}
@@ -29,114 +41,10 @@
vertical-align: middle;
}
/* Typography */
.about-wrap p {
line-height: 1.6em;
font-size: 14px;
}
.about-wrap h1 {
margin: 0.2em 0 0 200px;
color: #333;
line-height: 1.2em;
font-size: 2.8em;
font-weight: 400;
}
.about-wrap h4 {
color: #222;
}
.about-wrap .about-text,
.about-wrap p.about-description,
.about-wrap li.wp-person a.web {
font-weight: normal;
line-height: 1.6em;
font-size: 19px;
}
.about-description {
margin-top: 1.4em;
}
.about-text {
margin: 1em 0 1em 200px;
min-height: 60px;
color: #777;
font-size: 24px;
}
.about-wrap .changelog h2.about-headline-callout {
margin: 1.1em 0 0.2em;
font-size: 2.4em;
font-weight: 300;
line-height: 1.3;
text-align: center;
}
.about-wrap h3 {
margin: 1em 0 .6em;
font-size: 1.5em;
line-height: 1.5em;
}
.about-wrap h3.higher {
margin-top: .5em;
}
.customize h3 {
margin-top: 1.75em;
text-align: center;
}
.about-wrap .feature-section h4 {
margin: 1.4em 0 0.6em 0;
font-size: 1.2em;
}
.about-wrap .feature-section p {
margin-top: 0.6em;
}
.about-wrap code,
.about-wrap ol li p {
font-size: 14px;
}
.about-wrap .button.button-large {
padding: 8px 20px 10px !important;
height: 46px !important;
font-size: 14px;
line-height: 28px !important;
}
/* 3.8 Images */
.about-wrap .about-overview-img {
margin: 0;
}
/* Point Releases */
.about-wrap .point-releases {
margin-top: 5px;
border-bottom: 1px solid #dfdfdf;
}
.about-wrap .changelog.point-releases h3 {
padding-top: 35px;
}
.about-wrap .changelog.point-releases h3:first-child {
padding-top: 7px;
}
/* WordPress Version Badge */
.wp-badge {
background: #0074a2 url(../images/w-logo-white.png?ver=20131202) no-repeat;
background: #0074a2, url(../images/wordpress-logo-white.svg?ver=20131110) no-repeat; /* multiple backgrounds are ignored by browsers that don't support SVGs */
background-position: center 24px;
-webkit-background-size: 85px 85px;
background-size: 85px 85px;
@@ -154,6 +62,9 @@
box-shadow: 0 1px 3px rgba(0,0,0,0.2);
}
.svg .wp-badge {
background-image: url(../images/wordpress-logo-white.svg?ver=20131110);
}
.about-wrap .wp-badge {
position: absolute;
@@ -173,93 +84,199 @@
font-size: 18px;
vertical-align: top;
border-width: 1px;
white-space: nowrap;
}
/* Changelog / Update screen */
/* 1.1 - Typography */
.about-overview {
margin-top: 40px;
margin-bottom: 40px;
text-align: center;
.about-wrap p {
line-height: 1.6em;
font-size: 14px;
}
.about-overview p {
margin: 1em auto 50px;
max-width: 770px;
font-size: 18px;
line-height: 1.5;
text-align: center;
.about-wrap h1 {
margin: 0.2em 0 0 200px;
color: #333;
line-height: 1.2em;
font-size: 2.8em;
font-weight: 400;
}
.about-wrap .feature-section {
margin-top: 40px;
padding-bottom: 20px;
.about-wrap h3 {
margin: 2em 0 .6em;
font-size: 1.25em;
line-height: 1.5em;
}
.about-wrap .feature-section.two-col > div {
.about-wrap h4 {
color: #222;
}
.about-wrap code,
.about-wrap ol li p {
font-size: 14px;
}
.about-wrap .about-description,
.about-wrap .about-text {
margin-top: 1.4em;
font-weight: normal;
line-height: 1.6em;
font-size: 19px;
}
.about-wrap .about-text {
margin: 1em 0 1em 200px;
min-height: 60px;
color: #777;
}
/* 1.2 - Structure */
.about-wrap .two-col > div {
position: relative;
width: 47.6%;
margin-left: 4.799999999%;
float: right;
}
.about-wrap .feature-section.three-col > div {
.about-wrap .three-col > div {
position: relative;
width: 29.95%;
margin-left: 4.999999999%;
float: right;
}
.about-wrap .feature-section.col .last-feature {
.about-wrap .col .last-feature {
margin-left: 0;
}
.about-wrap .under-the-hood .feature-section {
/* 1.3 - Point Releases */
.about-wrap .point-releases {
margin-top: 5px;
border-bottom: 1px solid #dfdfdf;
}
.about-wrap .changelog.point-releases h3 {
padding-top: 35px;
}
.about-wrap .changelog.point-releases h3:first-child {
padding-top: 7px;
}
/*------------------------------------------------------------------------------
2.0 - About Page
------------------------------------------------------------------------------*/
/* 2.1 - Typography */
.about-wrap .headline-feature h2 {
margin: 1.1em 0 0.2em;
font-size: 2.4em;
font-weight: 300;
line-height: 1.3;
text-align: center;
}
.about-wrap .feature-list h2 {
margin: 30px 0 15px;
text-align: center;
}
.about-wrap .dfw h3 {
margin-top: 1em;
text-align: center;
}
.about-wrap .feature-section h4 {
margin: 1.4em 0 0.6em 0;
font-size: 1.2em;
}
.about-wrap .feature-section p {
margin-top: 0.6em;
}
.about-wrap .dfw p {
max-width: 68%;
margin: 0 auto 20px;
}
/* 2.2 - Structure */
.about-wrap .featured-image {
text-align: center;
}
.about-wrap .feature-section {
overflow: hidden;
padding-bottom: 20px;
}
.about-wrap .headline-feature .feature-section {
margin: 0 auto;
max-width: 82%;
}
.about-wrap .headline-feature .feature-section .col:first-child {
float: right;
margin: 15px 0 0 5%;
width: 55%;
}
.about-wrap .headline-feature .feature-section .col:last-child {
float: left;
margin: 15px 0 40px;
width: 40%;
}
.about-wrap .feature-list .feature-section {
margin-top: 0;
}
.about-wrap .changelog .feature-section {
overflow: hidden;
.about-wrap .dfw .feature-section {
overflow: visible;
}
.about-wrap .feature-section.two-col div p {
margin-left: 3%;
}
.about-wrap .feature-section div p img {
float: left;
margin-right: 10px;
max-width: 20%;
}
/* responsive videos for 4.0 */
.about-video {
.about-wrap .dfw-container {
position: relative;
width: 100%;
height: 0;
overflow: hidden;
margin-top: 50px;
-webkit-box-shadow: 0 0 10px rgba( 0, 0, 0, 0.25 );
box-shadow: 0 0 10px rgba( 0, 0, 0, 0.25 );
}
.about-video-embed {
padding-bottom: 70.4%; /* 352 / 500 */
}
.about-video-focus {
padding-bottom: 56.2%; /* 281 / 500 */
}
.about-video .wp-video,
.about-video .mejs-container,
.about-video video {
.about-wrap .dfw-container .overlay-image {
position: absolute;
top: 0;
right: 0;
width: 100% !important;
height: 100% !important;
/* Cubic Bezier to speed up the slide-out of the full-width sidebar image */
-webkit-transition: 0.8s -webkit-transform cubic-bezier(.9,.03,1,.61),
0.65s opacity linear;
transition: 0.8s transform cubic-bezier(.9,.03,1,.61),
0.65s opacity linear;
}
.about-wrap .changelog li {
list-style-type: disc;
margin-right: 3em;
.about-wrap .dfw-container .overlay-image.fade-in {
opacity: 0;
}
.about-wrap .dfw-container .overlay-image.from-left {
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
}
.about-wrap .dfw-container:hover .overlay-image {
opacity: 1;
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
/* Cubic Bezier to speed up the slide-in of the full-width sidebar image */
-webkit-transition: 0.7s -webkit-transform cubic-bezier( 0, 0.8, 0.8, 1 ),
0.8s opacity linear;
transition: 0.7s transform cubic-bezier( 0, 0.8, 0.8, 1 ),
0.8s opacity linear;
}
/* Return to Dashboard Home link */
@@ -275,6 +292,29 @@
padding: 0 5px;
}
/* SVGs */
.about-wrap .feature-list svg {
float: right;
clear: right;
margin: 15px 0 0 15px ;
height: 90px;
width: 90px;
background-color: #cccccc;
-webkit-border-radius: 50%;
border-radius: 50%;
fill: #999;
border: 1px solid #c1c1c1;
}
.about-wrap .feature-list.finer-points h4,
.about-wrap .feature-list.finer-points p {
margin-right: 115px;
}
/*------------------------------------------------------------------------------
3.0 - Credits & Freedoms Pages
------------------------------------------------------------------------------*/
/* Credits */
.about-wrap h4.wp-people-group {
@@ -296,6 +336,16 @@
display: inline-block;
vertical-align: top;
margin-left: 10px;
padding-bottom: 15px;
height: 70px;
width: 280px;
}
.about-wrap ul.compact li.wp-person {
height: auto;
width: 180px;
padding-bottom: 0;
margin-bottom: 0;
}
.about-wrap li.wp-person img.gravatar {
@@ -311,31 +361,19 @@
height: 30px;
}
/* @todo: combine this */
.about-wrap li.wp-person {
height: 70px;
width: 280px;
padding-bottom: 15px;
}
.about-wrap ul.compact li.wp-person {
height: auto;
width: 180px;
padding-bottom: 0;
margin-bottom: 0;
}
.about-wrap #wp-people-group-validators + p.wp-credits-list {
margin-top: 0;
}
.about-wrap li.wp-person a.web {
display: block;
margin: 6px 0 2px;
font-size: 16px;
font-weight: normal;
line-height: 1.6em;
text-decoration: none;
}
.about-wrap #wp-people-group-validators + p.wp-credits-list {
margin-top: 0;
}
.about-wrap p.wp-credits-list a {
white-space: nowrap;
}
@@ -356,44 +394,33 @@
margin: 0.6em 0;
}
/* =Media Queries
-------------------------------------------------------------- */
/*------------------------------------------------------------------------------
4.0 - Media Queries
------------------------------------------------------------------------------*/
@media screen and ( max-width: 782px ) {
.about-wrap .feature-section.one-col > div,
.about-wrap .feature-section.two-col > div,
.about-wrap .feature-section.three-col > div {
.about-wrap .one-col > div,
.about-wrap .two-col > div,
.about-wrap .three-col > div {
width: 100%;
margin: 0 0 40px;
padding: 0 0 40px;
float: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}
.about-wrap .under-the-hood .feature-section > div,
.about-wrap .feature-section.col > div.last-feature {
.about-wrap .feature-list div,
.about-wrap .col > div.last-feature {
margin: 0;
padding: 0;
border-bottom: none;
}
}
/* Responsive release video */
@media screen and ( max-width: 710px ) {
.about-overview {
position: relative;
padding-bottom: 56.25%; /* 360 / 640 */
width: 100%;
height: 0;
.about-wrap .headline-feature .feature-section {
max-width: 100%;
}
.about-overview embed {
position: absolute;
top: 0;
right: 0;
width: 100%;
height: 100%;
.about-wrap .feature-list .feature-section {
padding: 0 0 40px;
}
}
@@ -404,11 +431,11 @@
}
.about-wrap h1,
.about-text {
.about-wrap .about-text {
margin-left: 0;
}
.about-text {
.about-wrap .about-text {
margin-bottom: 0.25em;
}
@@ -429,19 +456,25 @@
border-bottom: 1px solid #ccc;
}
.about-wrap .feature-section.three-col div {
width: 100%;
float: none;
.about-wrap .three-col div,
.about-wrap .headline-feature .feature-section div {
width: 100% !important;
float: none !important;
}
.about-wrap .three-col.about-updates .col-1 {
padding: 0;
float: none;
}
.about-wrap .three-col.about-updates .col-2 {
margin: 0 0 20px;
width: 100%;
float: none;
.about-wrap .dfw p {
max-width: 90%;
}
}
@media only screen and (max-width: 400px) {
.about-wrap .feature-list svg {
margin-top: 15px;
height: 65px;
width: 65px;
}
.about-wrap .feature-list.finer-points h4,
.about-wrap .feature-list.finer-points p {
margin-right: 80px;
}
}

View File

@@ -1,12 +1,24 @@
/*------------------------------------------------------------------------------
22.0 - About Pages
1.0 Global: About, Credits, Freedoms
1.1 Typography
1.2 Structure
1.3 Point Releases
2.0 About Page
2.1 Typography
2.2 Structure
3.0 Credits & Freedoms Pages
------------------------------------------------------------------------------*/
/*------------------------------------------------------------------------------
1.0 - Global: About, Credits, Freedoms
------------------------------------------------------------------------------*/
.about-wrap {
position: relative;
margin: 25px 40px 0 20px;
max-width: 1050px; /* readability */
font-size: 15px;
}
@@ -29,114 +41,10 @@
vertical-align: middle;
}
/* Typography */
.about-wrap p {
line-height: 1.6em;
font-size: 14px;
}
.about-wrap h1 {
margin: 0.2em 200px 0 0;
color: #333;
line-height: 1.2em;
font-size: 2.8em;
font-weight: 400;
}
.about-wrap h4 {
color: #222;
}
.about-wrap .about-text,
.about-wrap p.about-description,
.about-wrap li.wp-person a.web {
font-weight: normal;
line-height: 1.6em;
font-size: 19px;
}
.about-description {
margin-top: 1.4em;
}
.about-text {
margin: 1em 200px 1em 0;
min-height: 60px;
color: #777;
font-size: 24px;
}
.about-wrap .changelog h2.about-headline-callout {
margin: 1.1em 0 0.2em;
font-size: 2.4em;
font-weight: 300;
line-height: 1.3;
text-align: center;
}
.about-wrap h3 {
margin: 1em 0 .6em;
font-size: 1.5em;
line-height: 1.5em;
}
.about-wrap h3.higher {
margin-top: .5em;
}
.customize h3 {
margin-top: 1.75em;
text-align: center;
}
.about-wrap .feature-section h4 {
margin: 1.4em 0 0.6em 0;
font-size: 1.2em;
}
.about-wrap .feature-section p {
margin-top: 0.6em;
}
.about-wrap code,
.about-wrap ol li p {
font-size: 14px;
}
.about-wrap .button.button-large {
padding: 8px 20px 10px !important;
height: 46px !important;
font-size: 14px;
line-height: 28px !important;
}
/* 3.8 Images */
.about-wrap .about-overview-img {
margin: 0;
}
/* Point Releases */
.about-wrap .point-releases {
margin-top: 5px;
border-bottom: 1px solid #dfdfdf;
}
.about-wrap .changelog.point-releases h3 {
padding-top: 35px;
}
.about-wrap .changelog.point-releases h3:first-child {
padding-top: 7px;
}
/* WordPress Version Badge */
.wp-badge {
background: #0074a2 url(../images/w-logo-white.png?ver=20131202) no-repeat;
background: #0074a2, url(../images/wordpress-logo-white.svg?ver=20131110) no-repeat; /* multiple backgrounds are ignored by browsers that don't support SVGs */
background-position: center 24px;
-webkit-background-size: 85px 85px;
background-size: 85px 85px;
@@ -154,6 +62,9 @@
box-shadow: 0 1px 3px rgba(0,0,0,0.2);
}
.svg .wp-badge {
background-image: url(../images/wordpress-logo-white.svg?ver=20131110);
}
.about-wrap .wp-badge {
position: absolute;
@@ -173,93 +84,199 @@
font-size: 18px;
vertical-align: top;
border-width: 1px;
white-space: nowrap;
}
/* Changelog / Update screen */
/* 1.1 - Typography */
.about-overview {
margin-top: 40px;
margin-bottom: 40px;
text-align: center;
.about-wrap p {
line-height: 1.6em;
font-size: 14px;
}
.about-overview p {
margin: 1em auto 50px;
max-width: 770px;
font-size: 18px;
line-height: 1.5;
text-align: center;
.about-wrap h1 {
margin: 0.2em 200px 0 0;
color: #333;
line-height: 1.2em;
font-size: 2.8em;
font-weight: 400;
}
.about-wrap .feature-section {
margin-top: 40px;
padding-bottom: 20px;
.about-wrap h3 {
margin: 2em 0 .6em;
font-size: 1.25em;
line-height: 1.5em;
}
.about-wrap .feature-section.two-col > div {
.about-wrap h4 {
color: #222;
}
.about-wrap code,
.about-wrap ol li p {
font-size: 14px;
}
.about-wrap .about-description,
.about-wrap .about-text {
margin-top: 1.4em;
font-weight: normal;
line-height: 1.6em;
font-size: 19px;
}
.about-wrap .about-text {
margin: 1em 200px 1em 0;
min-height: 60px;
color: #777;
}
/* 1.2 - Structure */
.about-wrap .two-col > div {
position: relative;
width: 47.6%;
margin-right: 4.799999999%;
float: left;
}
.about-wrap .feature-section.three-col > div {
.about-wrap .three-col > div {
position: relative;
width: 29.95%;
margin-right: 4.999999999%;
float: left;
}
.about-wrap .feature-section.col .last-feature {
.about-wrap .col .last-feature {
margin-right: 0;
}
.about-wrap .under-the-hood .feature-section {
/* 1.3 - Point Releases */
.about-wrap .point-releases {
margin-top: 5px;
border-bottom: 1px solid #dfdfdf;
}
.about-wrap .changelog.point-releases h3 {
padding-top: 35px;
}
.about-wrap .changelog.point-releases h3:first-child {
padding-top: 7px;
}
/*------------------------------------------------------------------------------
2.0 - About Page
------------------------------------------------------------------------------*/
/* 2.1 - Typography */
.about-wrap .headline-feature h2 {
margin: 1.1em 0 0.2em;
font-size: 2.4em;
font-weight: 300;
line-height: 1.3;
text-align: center;
}
.about-wrap .feature-list h2 {
margin: 30px 0 15px;
text-align: center;
}
.about-wrap .dfw h3 {
margin-top: 1em;
text-align: center;
}
.about-wrap .feature-section h4 {
margin: 1.4em 0 0.6em 0;
font-size: 1.2em;
}
.about-wrap .feature-section p {
margin-top: 0.6em;
}
.about-wrap .dfw p {
max-width: 68%;
margin: 0 auto 20px;
}
/* 2.2 - Structure */
.about-wrap .featured-image {
text-align: center;
}
.about-wrap .feature-section {
overflow: hidden;
padding-bottom: 20px;
}
.about-wrap .headline-feature .feature-section {
margin: 0 auto;
max-width: 82%;
}
.about-wrap .headline-feature .feature-section .col:first-child {
float: left;
margin: 15px 5% 0 0;
width: 55%;
}
.about-wrap .headline-feature .feature-section .col:last-child {
float: right;
margin: 15px 0 40px;
width: 40%;
}
.about-wrap .feature-list .feature-section {
margin-top: 0;
}
.about-wrap .changelog .feature-section {
overflow: hidden;
.about-wrap .dfw .feature-section {
overflow: visible;
}
.about-wrap .feature-section.two-col div p {
margin-right: 3%;
}
.about-wrap .feature-section div p img {
float: right;
margin-left: 10px;
max-width: 20%;
}
/* responsive videos for 4.0 */
.about-video {
.about-wrap .dfw-container {
position: relative;
width: 100%;
height: 0;
overflow: hidden;
margin-top: 50px;
-webkit-box-shadow: 0 0 10px rgba( 0, 0, 0, 0.25 );
box-shadow: 0 0 10px rgba( 0, 0, 0, 0.25 );
}
.about-video-embed {
padding-bottom: 70.4%; /* 352 / 500 */
}
.about-video-focus {
padding-bottom: 56.2%; /* 281 / 500 */
}
.about-video .wp-video,
.about-video .mejs-container,
.about-video video {
.about-wrap .dfw-container .overlay-image {
position: absolute;
top: 0;
left: 0;
width: 100% !important;
height: 100% !important;
/* Cubic Bezier to speed up the slide-out of the full-width sidebar image */
-webkit-transition: 0.8s -webkit-transform cubic-bezier(.9,.03,1,.61),
0.65s opacity linear;
transition: 0.8s transform cubic-bezier(.9,.03,1,.61),
0.65s opacity linear;
}
.about-wrap .changelog li {
list-style-type: disc;
margin-left: 3em;
.about-wrap .dfw-container .overlay-image.fade-in {
opacity: 0;
}
.about-wrap .dfw-container .overlay-image.from-left {
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
}
.about-wrap .dfw-container:hover .overlay-image {
opacity: 1;
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
/* Cubic Bezier to speed up the slide-in of the full-width sidebar image */
-webkit-transition: 0.7s -webkit-transform cubic-bezier( 0, 0.8, 0.8, 1 ),
0.8s opacity linear;
transition: 0.7s transform cubic-bezier( 0, 0.8, 0.8, 1 ),
0.8s opacity linear;
}
/* Return to Dashboard Home link */
@@ -275,6 +292,29 @@
padding: 0 5px;
}
/* SVGs */
.about-wrap .feature-list svg {
float: left;
clear: left;
margin: 15px 15px 0 0 ;
height: 90px;
width: 90px;
background-color: #cccccc;
-webkit-border-radius: 50%;
border-radius: 50%;
fill: #999;
border: 1px solid #c1c1c1;
}
.about-wrap .feature-list.finer-points h4,
.about-wrap .feature-list.finer-points p {
margin-left: 115px;
}
/*------------------------------------------------------------------------------
3.0 - Credits & Freedoms Pages
------------------------------------------------------------------------------*/
/* Credits */
.about-wrap h4.wp-people-group {
@@ -296,6 +336,16 @@
display: inline-block;
vertical-align: top;
margin-right: 10px;
padding-bottom: 15px;
height: 70px;
width: 280px;
}
.about-wrap ul.compact li.wp-person {
height: auto;
width: 180px;
padding-bottom: 0;
margin-bottom: 0;
}
.about-wrap li.wp-person img.gravatar {
@@ -311,31 +361,19 @@
height: 30px;
}
/* @todo: combine this */
.about-wrap li.wp-person {
height: 70px;
width: 280px;
padding-bottom: 15px;
}
.about-wrap ul.compact li.wp-person {
height: auto;
width: 180px;
padding-bottom: 0;
margin-bottom: 0;
}
.about-wrap #wp-people-group-validators + p.wp-credits-list {
margin-top: 0;
}
.about-wrap li.wp-person a.web {
display: block;
margin: 6px 0 2px;
font-size: 16px;
font-weight: normal;
line-height: 1.6em;
text-decoration: none;
}
.about-wrap #wp-people-group-validators + p.wp-credits-list {
margin-top: 0;
}
.about-wrap p.wp-credits-list a {
white-space: nowrap;
}
@@ -356,44 +394,33 @@
margin: 0.6em 0;
}
/* =Media Queries
-------------------------------------------------------------- */
/*------------------------------------------------------------------------------
4.0 - Media Queries
------------------------------------------------------------------------------*/
@media screen and ( max-width: 782px ) {
.about-wrap .feature-section.one-col > div,
.about-wrap .feature-section.two-col > div,
.about-wrap .feature-section.three-col > div {
.about-wrap .one-col > div,
.about-wrap .two-col > div,
.about-wrap .three-col > div {
width: 100%;
margin: 0 0 40px;
padding: 0 0 40px;
float: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}
.about-wrap .under-the-hood .feature-section > div,
.about-wrap .feature-section.col > div.last-feature {
.about-wrap .feature-list div,
.about-wrap .col > div.last-feature {
margin: 0;
padding: 0;
border-bottom: none;
}
}
/* Responsive release video */
@media screen and ( max-width: 710px ) {
.about-overview {
position: relative;
padding-bottom: 56.25%; /* 360 / 640 */
width: 100%;
height: 0;
.about-wrap .headline-feature .feature-section {
max-width: 100%;
}
.about-overview embed {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
.about-wrap .feature-list .feature-section {
padding: 0 0 40px;
}
}
@@ -404,11 +431,11 @@
}
.about-wrap h1,
.about-text {
.about-wrap .about-text {
margin-right: 0;
}
.about-text {
.about-wrap .about-text {
margin-bottom: 0.25em;
}
@@ -429,19 +456,25 @@
border-bottom: 1px solid #ccc;
}
.about-wrap .feature-section.three-col div {
width: 100%;
float: none;
.about-wrap .three-col div,
.about-wrap .headline-feature .feature-section div {
width: 100% !important;
float: none !important;
}
.about-wrap .three-col.about-updates .col-1 {
padding: 0;
float: none;
}
.about-wrap .three-col.about-updates .col-2 {
margin: 0 0 20px;
width: 100%;
float: none;
.about-wrap .dfw p {
max-width: 90%;
}
}
@media only screen and (max-width: 400px) {
.about-wrap .feature-list svg {
margin-top: 15px;
height: 65px;
width: 65px;
}
.about-wrap .feature-list.finer-points h4,
.about-wrap .feature-list.finer-points p {
margin-left: 80px;
}
}

View File

@@ -400,6 +400,7 @@ ol.ol-decimal > li {
code {
font-family: Consolas, Monaco, monospace;
direction: ltr;
unicode-bidi: embed;
}
kbd,
@@ -954,6 +955,10 @@ th.action-links {
margin-left: 20px;
}
.filter-items {
float: right;
}
.filter-links {
display: inline-block;
margin: 0;
@@ -988,27 +993,30 @@ th.action-links {
}
.wp-filter .search-form {
margin: 10px;
position: absolute;
left: 0;
top: 0;
float: left;
margin: 10px 0;
}
.wp-filter .search-form input[type="search"] {
margin: 0;
padding: 3px 5px;
max-width: 280px;
width: 100%;
width: 280px;
max-width: 100%;
font-size: 16px;
font-weight: 300;
line-height: 1.5;
}
.wp-filter .search-form select {
height: 33px;
margin: 0;
height: 32px;
vertical-align: top;
}
.wp-filter .search-form.search-plugins {
display: inline-block;
}
.wp-filter .drawer-toggle {
display: inline-block;
margin: 0 10px;
@@ -1205,11 +1213,17 @@ th.action-links {
}
}
@media only screen and (max-width: 910px) {
@media only screen and (max-width: 1000px) {
.filter-items {
float: none;
}
.wp-filter .media-toolbar-primary,
.wp-filter .media-toolbar-secondary,
.wp-filter .search-form {
float: none; /* Remove float from media-views.css */
position: relative;
margin: 20px 0;
max-width: 100%;
}
}
@@ -1252,7 +1266,8 @@ div.error {
.notice p,
div.updated p,
div.error p {
div.error p,
.form-table td .notice p {
margin: 0.5em 0;
padding: 2px;
}

View File

@@ -400,6 +400,7 @@ ol.ol-decimal > li {
code {
font-family: Consolas, Monaco, monospace;
direction: ltr;
unicode-bidi: embed;
}
kbd,
@@ -954,6 +955,10 @@ th.action-links {
margin-right: 20px;
}
.filter-items {
float: left;
}
.filter-links {
display: inline-block;
margin: 0;
@@ -988,27 +993,30 @@ th.action-links {
}
.wp-filter .search-form {
margin: 10px;
position: absolute;
right: 0;
top: 0;
float: right;
margin: 10px 0;
}
.wp-filter .search-form input[type="search"] {
margin: 0;
padding: 3px 5px;
max-width: 280px;
width: 100%;
width: 280px;
max-width: 100%;
font-size: 16px;
font-weight: 300;
line-height: 1.5;
}
.wp-filter .search-form select {
height: 33px;
margin: 0;
height: 32px;
vertical-align: top;
}
.wp-filter .search-form.search-plugins {
display: inline-block;
}
.wp-filter .drawer-toggle {
display: inline-block;
margin: 0 10px;
@@ -1205,11 +1213,17 @@ th.action-links {
}
}
@media only screen and (max-width: 910px) {
@media only screen and (max-width: 1000px) {
.filter-items {
float: none;
}
.wp-filter .media-toolbar-primary,
.wp-filter .media-toolbar-secondary,
.wp-filter .search-form {
float: none; /* Remove float from media-views.css */
position: relative;
margin: 20px 0;
max-width: 100%;
}
}
@@ -1252,7 +1266,8 @@ div.error {
.notice p,
div.updated p,
div.error p {
div.error p,
.form-table td .notice p {
margin: 0.5em 0;
padding: 2px;
}

View File

@@ -581,6 +581,7 @@ p.customize-section-description {
.customize-control-upload .current,
.customize-control-image .current,
.customize-control-background .current,
.customize-control-header .current {
margin-bottom: 8px;
}
@@ -605,9 +606,14 @@ p.customize-section-description {
}
.customize-control-upload .remove-button,
.customize-control-upload .default-button,
.customize-control-upload .upload-button,
.customize-control-image .remove-button,
.customize-control-image .default-button,
.customize-control-image .upload-button,
.customize-control-background .remove-button,
.customize-control-background .default-button,
.customize-control-background .upload-button,
.customize-control-header button.new,
.customize-control-header button.remove {
white-space: normal;
@@ -617,6 +623,7 @@ p.customize-section-description {
.customize-control-upload .current .container,
.customize-control-image .current .container,
.customize-control-background .current .container,
.customize-control-header .current .container {
overflow: hidden;
-webkit-border-radius: 2px;
@@ -626,12 +633,14 @@ p.customize-section-description {
}
.customize-control-upload .current .container,
.customize-control-background .current .container,
.customize-control-image .current .container {
min-height: 40px;
}
.customize-control-upload .placeholder,
.customize-control-image .placeholder,
.customize-control-background .placeholder,
.customize-control-header .placeholder {
width: 100%;
position: relative;
@@ -641,6 +650,7 @@ p.customize-section-description {
.customize-control-upload .inner,
.customize-control-image .inner,
.customize-control-background .inner,
.customize-control-header .inner {
display: none;
position: absolute;
@@ -652,6 +662,7 @@ p.customize-section-description {
}
.customize-control-upload .inner,
.customize-control-background .inner,
.customize-control-image .inner {
display: block;
min-height: 40px;
@@ -659,6 +670,7 @@ p.customize-section-description {
.customize-control-upload .inner,
.customize-control-image .inner,
.customize-control-background .inner,
.customize-control-header .inner,
.customize-control-header .inner .dashicons {
line-height: 20px;
@@ -775,6 +787,7 @@ p.customize-section-description {
.customize-control-upload .actions,
.customize-control-image .actions,
.customize-control-background .actions,
.customize-control-header .actions {
margin-bottom: 32px;
}
@@ -791,14 +804,19 @@ p.customize-section-description {
.customize-control-upload img,
.customize-control-image img,
.customize-control-background img,
.customize-control-header img {
width: 100%;
-webkit-border-radius: 2px;
border-radius: 2px;
}
.customize-control-upload .remove-button
.customize-control-image .remove-button
.customize-control-upload .remove-button,
.customize-control-upload .default-button,
.customize-control-image .remove-button,
.customize-control-image .default-button,
.customize-control-background .remove-button,
.customize-control-background .default-button,
.customize-control-header .remove {
float: right;
margin-left: 3px;
@@ -806,6 +824,7 @@ p.customize-section-description {
.customize-control-upload .upload-button,
.customize-control-image .upload-button,
.customize-control-background .upload-button,
.customize-control-header .new {
float: left;
}

File diff suppressed because one or more lines are too long

View File

@@ -581,6 +581,7 @@ p.customize-section-description {
.customize-control-upload .current,
.customize-control-image .current,
.customize-control-background .current,
.customize-control-header .current {
margin-bottom: 8px;
}
@@ -605,9 +606,14 @@ p.customize-section-description {
}
.customize-control-upload .remove-button,
.customize-control-upload .default-button,
.customize-control-upload .upload-button,
.customize-control-image .remove-button,
.customize-control-image .default-button,
.customize-control-image .upload-button,
.customize-control-background .remove-button,
.customize-control-background .default-button,
.customize-control-background .upload-button,
.customize-control-header button.new,
.customize-control-header button.remove {
white-space: normal;
@@ -617,6 +623,7 @@ p.customize-section-description {
.customize-control-upload .current .container,
.customize-control-image .current .container,
.customize-control-background .current .container,
.customize-control-header .current .container {
overflow: hidden;
-webkit-border-radius: 2px;
@@ -626,12 +633,14 @@ p.customize-section-description {
}
.customize-control-upload .current .container,
.customize-control-background .current .container,
.customize-control-image .current .container {
min-height: 40px;
}
.customize-control-upload .placeholder,
.customize-control-image .placeholder,
.customize-control-background .placeholder,
.customize-control-header .placeholder {
width: 100%;
position: relative;
@@ -641,6 +650,7 @@ p.customize-section-description {
.customize-control-upload .inner,
.customize-control-image .inner,
.customize-control-background .inner,
.customize-control-header .inner {
display: none;
position: absolute;
@@ -652,6 +662,7 @@ p.customize-section-description {
}
.customize-control-upload .inner,
.customize-control-background .inner,
.customize-control-image .inner {
display: block;
min-height: 40px;
@@ -659,6 +670,7 @@ p.customize-section-description {
.customize-control-upload .inner,
.customize-control-image .inner,
.customize-control-background .inner,
.customize-control-header .inner,
.customize-control-header .inner .dashicons {
line-height: 20px;
@@ -775,6 +787,7 @@ p.customize-section-description {
.customize-control-upload .actions,
.customize-control-image .actions,
.customize-control-background .actions,
.customize-control-header .actions {
margin-bottom: 32px;
}
@@ -791,14 +804,19 @@ p.customize-section-description {
.customize-control-upload img,
.customize-control-image img,
.customize-control-background img,
.customize-control-header img {
width: 100%;
-webkit-border-radius: 2px;
border-radius: 2px;
}
.customize-control-upload .remove-button
.customize-control-image .remove-button
.customize-control-upload .remove-button,
.customize-control-upload .default-button,
.customize-control-image .remove-button,
.customize-control-image .default-button,
.customize-control-background .remove-button,
.customize-control-background .default-button,
.customize-control-header .remove {
float: left;
margin-right: 3px;
@@ -806,6 +824,7 @@ p.customize-section-description {
.customize-control-upload .upload-button,
.customize-control-image .upload-button,
.customize-control-background .upload-button,
.customize-control-header .new {
float: right;
}

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;right:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:left}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) no-repeat center right}.image-align-left-label{background:url(../images/align-left.png) no-repeat center right}.image-align-center-label{background:url(../images/align-center.png) no-repeat center right}.image-align-right-label{background:url(../images/align-right.png) no-repeat center right}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:none}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:left;font-size:11px;margin:8px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 0 5px 5px}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:right}#gallery-settings .describe{padding:5px;width:100%;clear:both;cursor:default;background:#fff}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-left:15px}#gallery-settings .align .field label{margin:0 3px 0 1em}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 0 -8px 25px;text-align:left;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-right:5px}#sort-buttons span{margin-left:25px}p.media-types{padding:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.image-align-none-label{background-image:url(../images/align-none-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-left-label{background-image:url(../images/align-left-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}.image-align-center-label{background-image:url(../images/align-center-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-right-label{background-image:url(../images/align-right-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}}
div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;right:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:left}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) center right no-repeat}.image-align-left-label{background:url(../images/align-left.png) center right no-repeat}.image-align-center-label{background:url(../images/align-center.png) center right no-repeat}.image-align-right-label{background:url(../images/align-right.png) center right no-repeat}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:none}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:left;font-size:11px;margin:8px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 0 5px 5px}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:right}#gallery-settings .describe{padding:5px;width:100%;clear:both;cursor:default;background:#fff}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-left:15px}#gallery-settings .align .field label{margin:0 3px 0 1em}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 0 -8px 25px;text-align:left;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-right:5px}#sort-buttons span{margin-left:25px}p.media-types{padding:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.image-align-none-label{background-image:url(../images/align-none-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-left-label{background-image:url(../images/align-left-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}.image-align-center-label{background-image:url(../images/align-center-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-right-label{background-image:url(../images/align-right-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}}

View File

@@ -1 +1 @@
div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:right}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) no-repeat center left}.image-align-left-label{background:url(../images/align-left.png) no-repeat center left}.image-align-center-label{background:url(../images/align-center.png) no-repeat center left}.image-align-right-label{background:url(../images/align-right.png) no-repeat center left}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:none}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:right;font-size:11px;margin:8px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 5px 5px 0}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:left}#gallery-settings .describe{padding:5px;width:100%;clear:both;cursor:default;background:#fff}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px}#gallery-settings .align .field label{margin:0 1em 0 3px}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px}#sort-buttons span{margin-right:25px}p.media-types{padding:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.image-align-none-label{background-image:url(../images/align-none-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-left-label{background-image:url(../images/align-left-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}.image-align-center-label{background-image:url(../images/align-center-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-right-label{background-image:url(../images/align-right-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}}
div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:right}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) center left no-repeat}.image-align-left-label{background:url(../images/align-left.png) center left no-repeat}.image-align-center-label{background:url(../images/align-center.png) center left no-repeat}.image-align-right-label{background:url(../images/align-right.png) center left no-repeat}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:none}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:right;font-size:11px;margin:8px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 5px 5px 0}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:left}#gallery-settings .describe{padding:5px;width:100%;clear:both;cursor:default;background:#fff}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px}#gallery-settings .align .field label{margin:0 1em 0 3px}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px}#sort-buttons span{margin-right:25px}p.media-types{padding:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.image-align-none-label{background-image:url(../images/align-none-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-left-label{background-image:url(../images/align-left-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}.image-align-center-label{background-image:url(../images/align-center-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-right-label{background-image:url(../images/align-right-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}}

View File

@@ -1256,7 +1256,7 @@ table.links-table {
.focus-on .wrap > h2,
.focus-on #wpfooter,
.focus-on .postbox-container,
.focus-on .postbox-container > *,
.focus-on div.updated,
.focus-on div.error,
.focus-on div.notice,
@@ -1278,7 +1278,7 @@ table.links-table {
.focus-off .wrap > h2,
.focus-off #wpfooter,
.focus-off .postbox-container,
.focus-off .postbox-container > *,
.focus-off div.updated,
.focus-off div.error,
.focus-off div.notice,

View File

@@ -1256,7 +1256,7 @@ table.links-table {
.focus-on .wrap > h2,
.focus-on #wpfooter,
.focus-on .postbox-container,
.focus-on .postbox-container > *,
.focus-on div.updated,
.focus-on div.error,
.focus-on div.notice,
@@ -1278,7 +1278,7 @@ table.links-table {
.focus-off .wrap > h2,
.focus-off #wpfooter,
.focus-off .postbox-container,
.focus-off .postbox-container > *,
.focus-off div.updated,
.focus-off div.error,
.focus-off div.notice,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -44,7 +44,7 @@ body.locale-he-il .press-this a.wp-switch-editor {
/* zn_CH: Enlarge font size, set font-size: normal */
.locale-zh-cn form.upgrade .hint { font-style: normal; font-size: 100%; }
/* Zn_CH: Distraction free writing.
/* Zn_CH: Distraction-free writing.
* More beautiful font for "Just write."
* Larger text for HTML/Visual mode.
*/

View File

@@ -44,7 +44,7 @@ body.locale-he-il .press-this a.wp-switch-editor {
/* zn_CH: Enlarge font size, set font-size: normal */
.locale-zh-cn form.upgrade .hint { font-style: normal; font-size: 100%; }
/* Zn_CH: Distraction free writing.
/* Zn_CH: Distraction-free writing.
* More beautiful font for "Just write."
* Larger text for HTML/Visual mode.
*/

View File

@@ -630,7 +630,7 @@ classes exist in paginate_links() but not seen in list table output. */
.wp-filter .view-switch {
display: inline-block;
vertical-align: middle;
padding: 14px 0;
padding: 15px 0;
margin: 0 0 0 20px;
}

View File

@@ -630,7 +630,7 @@ classes exist in paginate_links() but not seen in list table output. */
.wp-filter .view-switch {
display: inline-block;
vertical-align: middle;
padding: 14px 0;
padding: 15px 0;
margin: 0 20px 0 0;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1126,10 +1126,6 @@ audio, video {
*/
@media only screen and (max-width: 1120px) {
.media-frame.mode-grid .attachments-browser .media-toolbar-secondary {
float: none;
}
/* override for media-views.css */
#wp-media-grid .wp-filter .attachment-filters {
max-width: 100%;

View File

@@ -1126,10 +1126,6 @@ audio, video {
*/
@media only screen and (max-width: 1120px) {
.media-frame.mode-grid .attachments-browser .media-toolbar-secondary {
float: none;
}
/* override for media-views.css */
#wp-media-grid .wp-filter .attachment-filters {
max-width: 100%;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -60,6 +60,10 @@ class Custom_Background {
$this->admin_image_div_callback = $admin_image_div_callback;
add_action( 'admin_menu', array( $this, 'init' ) );
add_action( 'wp_ajax_custom-background-add', array( $this, 'ajax_background_add' ) );
// Unused since 3.5.0.
add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
}
@@ -464,23 +468,53 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
}
/**
* Unused since 3.5.0.
* AJAX handler for adding custom background context to an attachment.
*
* Triggered when the user adds a new background image from the
* Media Manager.
*
* @since 4.1.0
*/
public function ajax_background_add() {
check_ajax_referer( 'background-add', 'nonce' );
if ( ! current_user_can( 'edit_theme_options' ) ) {
wp_send_json_error();
}
$attachment_id = absint( $_POST['attachment_id'] );
if ( $attachment_id < 1 ) {
wp_send_json_error();
}
update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_stylesheet() );
wp_send_json_success();
}
/**
*
* @since 3.4.0
* @deprecated 3.5.0
*/
public function attachment_fields_to_edit( $form_fields ) {
return $form_fields;
}
/**
* Unused since 3.5.0.
*
* @since 3.4.0
* @deprecated 3.5.0
*/
public function filter_upload_tabs( $tabs ) {
return $tabs;
}
/**
*
* @since 3.4.0
* @deprecated 3.5.0
*/
public function wp_set_background_image() {
if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit;
$attachment_id = absint($_POST['attachment_id']);

View File

@@ -285,7 +285,7 @@ if ( 'post' == $post_type ) {
$title_and_editor .= '<p>' . __( 'Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. ') . '</p>';
$title_and_editor .= '<p>' . __( 'The Text mode allows you to enter HTML along with your post text. Line breaks will be converted to paragraphs automatically.' ) . '</p>';
$title_and_editor .= '<p>' . __( 'You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '</p>';
$title_and_editor .= '<p>' . __( 'You can enable distraction-free writing via the Fullscreen icon (last in the top row). This feature is not available for old browsers or devices with small screens, and requires that Editor Expand be enabled in Screen Options.' ) . '</p>';
$title_and_editor .= '<p>' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '</p>';
$title_and_editor .= '<p>' . __( 'Keyboard users: When you&#8217;re working in the visual editor, you can use <kbd>Alt + F10</kbd> to access the toolbar.' ) . '</p>';
get_current_screen()->add_help_tab( array(
@@ -647,7 +647,7 @@ if ( post_type_supports( $post_type, 'comments' ) )
wp_comment_reply();
?>
<?php if ( post_type_supports( $post_type, 'title' ) && '' === $post->post_title ) : ?>
<?php if ( ! wp_is_mobile() && post_type_supports( $post_type, 'title' ) && '' === $post->post_title ) : ?>
<script type="text/javascript">
try{document.post.title.focus();}catch(e){}
</script>

View File

@@ -155,6 +155,8 @@ do_meta_boxes(null, 'normal', $comment);
</div>
</form>
<?php if ( ! wp_is_mobile() ) : ?>
<script type="text/javascript">
try{document.post.name.focus();}catch(e){}
</script>
<?php endif;

View File

@@ -200,6 +200,9 @@ submit_button( __('Update') );
?>
</form>
</div>
<?php if ( ! wp_is_mobile() ) : ?>
<script type="text/javascript">
try{document.forms.edittag.name.focus();}catch(e){}
</script>
<?php endif;

View File

@@ -583,10 +583,14 @@ do_action( "{$taxonomy}_add_form", $taxonomy );
</div><!-- /col-container -->
</div><!-- /wrap -->
<?php if ( ! wp_is_mobile() ) : ?>
<script type="text/javascript">
try{document.forms.addtag['tag-name'].focus();}catch(e){}
</script>
<?php
endif;
$wp_list_table->inline_edit();
include( ABSPATH . 'wp-admin/admin-footer.php' );

View File

@@ -19,7 +19,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s brings you a smoother writing and management experience.' ), $display_version ); ?></div>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you focus on your writing, and the new default theme lets you show it off in style.' ), $display_version ); ?></div>
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

View File

@@ -1832,21 +1832,36 @@ function wp_ajax_update_widget() {
*/
function wp_ajax_upload_attachment() {
check_ajax_referer( 'media-form' );
/*
* This function does not use wp_send_json_success() / wp_send_json_error()
* as the html4 Plupload handler requires a text/html content-type for older IE.
* See https://core.trac.wordpress.org/ticket/31037
*/
if ( ! current_user_can( 'upload_files' ) ) {
wp_send_json_error( array(
'message' => __( "You don't have permission to upload files." ),
'filename' => $_FILES['async-upload']['name'],
echo wp_json_encode( array(
'success' => false,
'data' => array(
'message' => __( "You don't have permission to upload files." ),
'filename' => $_FILES['async-upload']['name'],
)
) );
wp_die();
}
if ( isset( $_REQUEST['post_id'] ) ) {
$post_id = $_REQUEST['post_id'];
if ( ! current_user_can( 'edit_post', $post_id ) ) {
wp_send_json_error( array(
'message' => __( "You don't have permission to attach files to this post." ),
'filename' => $_FILES['async-upload']['name'],
echo wp_json_encode( array(
'success' => false,
'data' => array(
'message' => __( "You don't have permission to attach files to this post." ),
'filename' => $_FILES['async-upload']['name'],
)
) );
wp_die();
}
} else {
$post_id = null;
@@ -1858,20 +1873,30 @@ function wp_ajax_upload_attachment() {
if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ) ) ) {
$wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'], false );
if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
wp_send_json_error( array(
'message' => __( 'The uploaded file is not a valid image. Please try again.' ),
'filename' => $_FILES['async-upload']['name'],
echo wp_json_encode( array(
'success' => false,
'data' => array(
'message' => __( 'The uploaded file is not a valid image. Please try again.' ),
'filename' => $_FILES['async-upload']['name'],
)
) );
wp_die();
}
}
$attachment_id = media_handle_upload( 'async-upload', $post_id, $post_data );
if ( is_wp_error( $attachment_id ) ) {
wp_send_json_error( array(
'message' => $attachment_id->get_error_message(),
'filename' => $_FILES['async-upload']['name'],
echo wp_json_encode( array(
'success' => false,
'data' => array(
'message' => $attachment_id->get_error_message(),
'filename' => $_FILES['async-upload']['name'],
)
) );
wp_die();
}
if ( isset( $post_data['context'] ) && isset( $post_data['theme'] ) ) {
@@ -1885,7 +1910,12 @@ function wp_ajax_upload_attachment() {
if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) )
wp_die();
wp_send_json_success( $attachment );
echo wp_json_encode( array(
'success' => true,
'data' => $attachment,
) );
wp_die();
}
/**
@@ -2771,42 +2801,25 @@ function wp_ajax_parse_media_shortcode() {
*/
function wp_ajax_destroy_sessions() {
if ( empty( $_POST['user_id'] ) ) {
$user = new WP_Error();
} else {
$user = new WP_User( absint( $_POST['user_id'] ) );
if ( ! $user->exists() ) {
$user = new WP_Error();
} elseif ( ! current_user_can( 'edit_user', $user->ID ) ) {
$user = new WP_Error();
} elseif ( ! check_ajax_referer( sprintf( 'destroy_sessions_%d', $user->ID ), false, false ) ) {
$user = new WP_Error();
$user = get_userdata( (int) $_POST['user_id'] );
if ( $user ) {
if ( ! current_user_can( 'edit_user', $user->ID ) ) {
$user = false;
} elseif ( ! wp_verify_nonce( $_POST['nonce'], 'update-user_' . $user->ID ) ) {
$user = false;
}
}
if ( is_wp_error( $user ) ) {
if ( ! $user ) {
wp_send_json_error( array(
'message' => __( 'Could not log out user sessions. Please try again.' ),
) );
}
// 'token' is only set if the initiating user is viewing their own profile-editing screen.
if ( isset( $_POST['token'] ) ) {
$keep = wp_unslash( $_POST['token'] );
} else {
$keep = null;
}
$sessions = WP_Session_Tokens::get_instance( $user->ID );
/*
* If $keep is a string, then the current user is destroying all of their own sessions
* except the current one. If $keep is not a string, the current user is destroying all
* of another user's sessions with no exceptions.
*/
if ( is_string( $keep ) ) {
$sessions->destroy_others( $keep );
if ( $user->ID === get_current_user_id() ) {
$sessions->destroy_others( wp_get_session_token() );
$message = __( 'You are now logged out everywhere else.' );
} else {
$sessions->destroy_all();
@@ -2814,8 +2827,5 @@ function wp_ajax_destroy_sessions() {
$message = sprintf( __( '%s has been logged out.' ), $user->display_name );
}
wp_send_json_success( array(
'message' => $message
) );
wp_send_json_success( array( 'message' => $message ) );
}

View File

@@ -165,33 +165,35 @@ class WP_Media_List_Table extends WP_List_Table {
$views = $this->get_views();
?>
<div class="wp-filter">
<?php $this->view_switcher( $mode ); ?>
<div class="filter-items">
<?php $this->view_switcher( $mode ); ?>
<select class="attachment-filters" name="attachment-filter">
<?php
if ( ! empty( $views ) ) {
foreach ( $views as $class => $view ) {
echo "\t$view\n";
<select class="attachment-filters" name="attachment-filter">
<?php
if ( ! empty( $views ) ) {
foreach ( $views as $class => $view ) {
echo "\t$view\n";
}
}
}
?>
</select>
?>
</select>
<?php
$this->extra_tablenav( 'bar' );
$this->extra_tablenav( 'bar' );
/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
$views = apply_filters( "views_{$this->screen->id}", array() );
/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
$views = apply_filters( "views_{$this->screen->id}", array() );
// Back compat for pre-4.0 view links.
if ( ! empty( $views ) ) {
echo '<ul class="filter-links">';
foreach ( $views as $class => $view ) {
echo "<li class='$class'>$view</li>";
// Back compat for pre-4.0 view links.
if ( ! empty( $views ) ) {
echo '<ul class="filter-links">';
foreach ( $views as $class => $view ) {
echo "<li class='$class'>$view</li>";
}
echo '</ul>';
}
echo '</ul>';
}
?>
</div>
<div class="search-form">
<label for="media-search-input" class="screen-reader-text"><?php esc_html_e( 'Search Media' ); ?></label>

View File

@@ -1845,7 +1845,7 @@ class Language_Pack_Upgrader extends WP_Upgrader {
remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
if ( $parsed_args['clear_update_cache'] ) {
_wp_clear_update_cache();
wp_clean_update_cache();
}
return $results;
@@ -2076,6 +2076,7 @@ class Core_Upgrader extends WP_Upgrader {
'success' => true,
'fs_method' => $wp_filesystem->method,
'fs_method_forced' => defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' ),
'fs_method_direct' => !empty( $GLOBALS['_wp_filesystem_direct_method'] ) ? $GLOBALS['_wp_filesystem_direct_method'] : '',
'time_taken' => time() - $start_time,
'reported' => $wp_version,
'attempted' => $current->version,
@@ -2776,7 +2777,7 @@ class WP_Automatic_Updater {
}
// Clear existing caches
_wp_clear_update_cache();
wp_clean_update_cache();
wp_version_check(); // check for Core updates
wp_update_themes(); // Check for Theme updates

View File

@@ -928,10 +928,12 @@ function get_filesystem_method( $args = array(), $context = false, $allow_relaxe
// WordPress is creating files as the same owner as the WordPress files,
// this means it's safe to modify & create new files via PHP.
$method = 'direct';
$GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';
} else if ( $allow_relaxed_file_ownership ) {
// The $context directory is writable, and $allow_relaxed_file_ownership is set, this means we can modify files
// safely in this directory. This mode doesn't create new files, only alter existing ones.
$method = 'direct';
$GLOBALS['_wp_filesystem_direct_method'] = 'relaxed_ownership';
}
@fclose($temp_handle);

View File

@@ -28,11 +28,17 @@
*/
function plugins_api($action, $args = null) {
if ( is_array($args) )
$args = (object)$args;
if ( is_array( $args ) ) {
$args = (object) $args;
}
if ( !isset($args->per_page) )
if ( ! isset( $args->per_page ) ) {
$args->per_page = 24;
}
if ( ! isset( $args->locale ) ) {
$args->locale = get_locale();
}
/**
* Override the Plugin Install API arguments.
@@ -235,8 +241,15 @@ function install_plugins_favorites_form() {
function display_plugins_table() {
global $wp_list_table;
if ( current_filter() == 'install_plugins_favorites' && empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
return;
switch ( current_filter() ) {
case 'install_plugins_favorites' :
if ( empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
return;
}
break;
case 'install_plugins_recommended' :
echo '<p>' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '</p>';
break;
}
?>

View File

@@ -11,14 +11,17 @@
//
/**
* {@internal Missing Short Description}}
* Check whether a category exists.
*
* @since 2.0.0
*
* @param int|string $cat_name
* @return int
* @see term_exists()
*
* @param int|string $cat_name Category name.
* @param int $parent Optional. ID of parent term.
* @return mixed
*/
function category_exists($cat_name, $parent = 0) {
function category_exists( $cat_name, $parent = null ) {
$id = term_exists($cat_name, 'category', $parent);
if ( is_array($id) )
$id = $id['term_id'];

View File

@@ -2055,9 +2055,8 @@ final class WP_Internal_Pointers {
return;
}
$content = '<h3>' . __( 'Distraction Free Writing' ) . '</h3>';
$content .= '<p>' . __( 'Start typing, and the other elements fade away so you can focus. '
. 'Move your mouse out of the editor to reveal everything again.' ) . '</p>';
$content = '<h3>' . __( 'Distraction-Free Writing' ) . '</h3>';
$content .= '<p>' . __( 'Enable distraction-free writing mode, and everything surrounding the editor will fade away when you start typing. Move your mouse out of the editor to reveal everything again.' ) . '</p>';
if ( is_rtl() ) {
$position = array( 'edge' => 'left', 'align' => 'center', 'my' => 'left+40 top-11', 'at' => 'left top' );

View File

@@ -314,13 +314,20 @@ function get_theme_feature_list( $api = true ) {
* @param array|object $args Optional. Arguments to serialize for the Theme Info API.
* @return mixed
*/
function themes_api( $action, $args = null ) {
function themes_api( $action, $args = null ) {
if ( is_array($args) )
$args = (object)$args;
if ( is_array( $args ) ) {
$args = (object) $args;
}
if ( !isset($args->per_page) )
if ( ! isset( $args->per_page ) ) {
$args->per_page = 24;
}
if ( ! isset( $args->locale ) ) {
$args->locale = get_locale();
}
/**
* Filter arguments used to query for installer pages from the WordPress.org Themes API.
*
@@ -331,7 +338,7 @@ function get_theme_feature_list( $api = true ) {
* @param object $args Arguments used to query for installer pages from the WordPress.org Themes API.
* @param string $action Requested action. Likely values are 'theme_information',
* 'feature_list', or 'query_themes'.
*/
*/
$args = apply_filters( 'themes_api_args', $args, $action );
/**

View File

@@ -694,6 +694,7 @@ $_old_files = array(
'wp-includes/js/jquery/ui/jquery.ui.tabs.min.js',
'wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js',
'wp-includes/js/jquery/ui/jquery.ui.widget.min.js',
'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png',
);
/**

View File

@@ -133,7 +133,7 @@ function display_setup_form( $error = null ) {
<input name="admin_password" type="password" id="pass1" size="25" value="" />
<p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
<p><?php echo _wp_get_password_hint(); ?></p>
<p><?php echo wp_get_password_hint(); ?></p>
</td>
</tr>
<?php endif; ?>

View File

@@ -171,7 +171,7 @@ $('.contextual-help-tabs').delegate('a', 'click', function(e) {
});
$(document).ready( function() {
var checks, first, last, checked, sliced, mobileEvent, transitionTimeout, focusedRowActions,
var checks, first, last, checked, sliced, mobileEvent, transitionTimeout, focusedRowActions, $firstHeading,
lastClicked = false,
pageInput = $('input.current-page'),
currentPage = pageInput.val(),
@@ -194,6 +194,7 @@ $(document).ready( function() {
pinnedMenuTop = false,
pinnedMenuBottom = false,
menuTop = 0,
menuIsPinned = false,
height = {
window: $window.height(),
wpwrap: $wpwrap.height(),
@@ -367,9 +368,10 @@ $(document).ready( function() {
});
}
// Move .updated and .error alert boxes. Don't move boxes designed to be inline.
$('div.wrap h2:first').nextAll('div.updated, div.error').addClass('below-h2');
$('div.updated, div.error').not('.below-h2, .inline').insertAfter( $('div.wrap h2:first') );
// Move .notice, .updated and .error alert boxes. Don't move boxes designed to be inline.
$firstHeading = $( 'div.wrap h2:first' );
$firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' );
$( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading );
// Init screen meta
screenMeta.init();
@@ -541,19 +543,52 @@ $(document).ready( function() {
input.on('change', toggleUploadButton);
})();
function pinMenu() {
var windowPos = $window.scrollTop();
function pinMenu( event ) {
var windowPos = $window.scrollTop(),
resizing = ! event || event.type !== 'scroll';
if ( isIOS || isIE8 || $adminmenu.data( 'wp-responsive' ) ) {
return;
}
if ( height.menu + height.adminbar + 20 > height.wpwrap ) { // 20px "buffer"
if ( height.menu + height.adminbar < height.window ||
height.menu + height.adminbar + 20 > height.wpwrap ) {
unpinMenu();
return;
}
menuIsPinned = true;
if ( height.menu + height.adminbar > height.window ) {
// Check for overscrolling
if ( windowPos < 0 ) {
if ( ! pinnedMenuTop ) {
pinnedMenuTop = true;
pinnedMenuBottom = false;
$adminMenuWrap.css({
position: 'fixed',
top: '',
bottom: ''
});
}
return;
} else if ( windowPos + height.window > $document.height() - 1 ) {
if ( ! pinnedMenuBottom ) {
pinnedMenuBottom = true;
pinnedMenuTop = false;
$adminMenuWrap.css({
position: 'fixed',
top: '',
bottom: 0
});
}
return;
}
if ( windowPos > lastScrollPosition ) {
// Scrolling down
if ( pinnedMenuTop ) {
@@ -606,7 +641,7 @@ $(document).ready( function() {
bottom: ''
});
}
} else {
} else if ( resizing ) {
// Resizing
pinnedMenuTop = pinnedMenuBottom = false;
menuTop = windowPos + height.window - height.menu - height.adminbar - 1;
@@ -626,12 +661,21 @@ $(document).ready( function() {
lastScrollPosition = windowPos;
}
function resetHeights() {
height = {
window: $window.height(),
wpwrap: $wpwrap.height(),
adminbar: $adminbar.height(),
menu: $adminMenuWrap.height()
};
}
function unpinMenu() {
if ( isIOS ) {
if ( isIOS || ! menuIsPinned ) {
return;
}
pinnedMenuTop = pinnedMenuBottom = false;
pinnedMenuTop = pinnedMenuBottom = menuIsPinned = false;
$adminMenuWrap.css({
position: '',
top: '',
@@ -640,6 +684,8 @@ $(document).ready( function() {
}
function setPinMenu() {
resetHeights();
if ( $adminmenu.data('wp-responsive') ) {
$body.removeClass( 'sticky-menu' );
unpinMenu();
@@ -654,6 +700,9 @@ $(document).ready( function() {
if ( ! isIOS ) {
$window.on( 'scroll.pin-menu', pinMenu );
$document.on( 'tinymce-editor-init.pin-menu', function( event, editor ) {
editor.on( 'wp-autoresize', resetHeights );
});
}
window.wpResponsive = {
@@ -792,17 +841,7 @@ $(document).ready( function() {
window.wpResponsive.init();
setPinMenu();
$document.on( 'wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu', function() {
height.wpwrap = $wpwrap.height();
height.window = $window.height();
height.adminbar = $adminbar.height();
setPinMenu();
}).on( 'wp-collapse-menu.pin-menu', function() {
height.wpwrap = $wpwrap.height();
height.menu = $adminMenuWrap.height();
setPinMenu();
});
$document.on( 'wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu', setPinMenu );
});
// Fire a custom jQuery event at the end of window resize

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
/* globals _wpCustomizeHeader, _wpMediaViewsL10n */
/* globals _wpCustomizeHeader, _wpCustomizeBackground, _wpMediaViewsL10n */
(function( exports, $ ){
var Container, focus, api = wp.customize;
@@ -128,12 +128,12 @@
api.utils.areElementListsEqual = function ( listA, listB ) {
var equal = (
listA.length === listB.length && // if lists are different lengths, then naturally they are not equal
-1 === _.map( // are there any false values in the list returned by map?
-1 === _.indexOf( _.map( // are there any false values in the list returned by map?
_.zip( listA, listB ), // pair up each element between the two lists
function ( pair ) {
return $( pair[0] ).is( pair[1] ); // compare to see if each pair are equal
}
).indexOf( false ) // check for presence of false in map's return value
), false ) // check for presence of false in map's return value
);
return equal;
};
@@ -252,7 +252,9 @@
if ( ! $.contains( document, this.container ) ) {
// jQuery.fn.slideUp is not hiding an element if it is not in the DOM
this.container.toggle( active );
args.completeCallback();
if ( args.completeCallback ) {
args.completeCallback();
}
} else if ( active ) {
this.container.stop( true, true ).slideDown( duration, args.completeCallback );
} else {
@@ -820,7 +822,7 @@
// Watch for changes to the section state
inject = function ( sectionId ) {
var parentContainer;
if ( ! sectionId ) { // @todo allow a control to be embeded without a section, for instance a control embedded in the frontend
if ( ! sectionId ) { // @todo allow a control to be embedded without a section, for instance a control embedded in the frontend
return;
}
// Wait for the section to be registered
@@ -878,7 +880,9 @@
if ( ! $.contains( document, this.container ) ) {
// jQuery.fn.slideUp is not hiding an element if it is not in the DOM
this.container.toggle( active );
args.completeCallback();
if ( args.completeCallback ) {
args.completeCallback();
}
} else if ( active ) {
this.container.slideDown( args.duration, args.completeCallback );
} else {
@@ -913,6 +917,13 @@
*/
deactivate: Container.prototype.deactivate,
/**
* Re-use _toggleActive from Container class.
*
* @access private
*/
_toggleActive: Container.prototype._toggleActive,
dropdownInit: function() {
var control = this,
statuses = this.container.find('.dropdown-status'),
@@ -1049,18 +1060,17 @@
*/
initFrame: function() {
this.frame = wp.media({
// The title of the media modal.
title: this.params.button_labels.frame_title,
// Restrict the library to specified mime type.
library: {
type: this.params.mime_type
},
button: {
// Change the submit button label.
text: this.params.button_labels.frame_button
},
multiple: false
states: [
new wp.media.controller.Library({
title: this.params.button_labels.frame_title,
library: wp.media.query({ type: this.params.mime_type }),
multiple: false,
date: false
})
]
});
// When a file is selected, run a callback.
@@ -1133,6 +1143,40 @@
thumbnailSrc: function() {}
});
/**
* A control for uploading background images.
*
* @class
* @augments wp.customize.UploadControl
* @augments wp.customize.Control
* @augments wp.customize.Class
*/
api.BackgroundControl = api.UploadControl.extend({
/**
* When the control's DOM structure is ready,
* set up internal event bindings.
*/
ready: function() {
api.UploadControl.prototype.ready.apply( this, arguments );
},
/**
* Callback handler for when an attachment is selected in the media modal.
* Does an additional AJAX request for setting the background context.
*/
select: function() {
api.UploadControl.prototype.select.apply( this, arguments );
wp.ajax.post( 'custom-background-add', {
nonce: _wpCustomizeBackground.nonces.add,
wp_customize: 'on',
theme: api.settings.theme.stylesheet,
attachment_id: this.params.attachment.id
} );
}
});
/**
* @class
* @augments wp.customize.Control
@@ -1264,6 +1308,7 @@
title: l10n.chooseImage,
library: wp.media.query({ type: 'image' }),
multiple: false,
date: false,
priority: 20,
suggestedWidth: _wpCustomizeHeader.data.width,
suggestedHeight: _wpCustomizeHeader.data.height
@@ -1811,7 +1856,8 @@
color: api.ColorControl,
upload: api.UploadControl,
image: api.ImageControl,
header: api.HeaderControl
header: api.HeaderControl,
background: api.BackgroundControl
};
api.panelConstructor = {};
api.sectionConstructor = {};

File diff suppressed because one or more lines are too long

View File

@@ -803,6 +803,12 @@
mouseY = event.pageY;
} );
function recalcEditorRect() {
editorRect = $editor.offset();
editorRect.right = editorRect.left + $editor.outerWidth();
editorRect.bottom = editorRect.top + $editor.outerHeight();
}
function activate() {
if ( ! _isActive ) {
_isActive = true;
@@ -909,9 +915,7 @@
$overlay
// Always recalculate the editor area entering the overlay with the mouse.
.on( 'mouseenter.focus', function() {
editorRect = $editor.offset();
editorRect.right = editorRect.left + $editor.outerWidth();
editorRect.bottom = editorRect.top + $editor.outerHeight();
recalcEditorRect();
$window.on( 'scroll.focus', function() {
var nScrollY = window.pageYOffset;
@@ -937,24 +941,26 @@
} )
// Fade in when the mouse moves away form the editor area.
.on( 'mousemove.focus', function( event ) {
var nx = event.pageX,
ny = event.pageY;
var nx = event.clientX,
ny = event.clientY,
pageYOffset = window.pageYOffset,
pageXOffset = window.pageXOffset;
if ( x && y && ( nx !== x || ny !== y ) ) {
if (
( ny <= y && ny < editorRect.top ) ||
( ny >= y && ny > editorRect.bottom ) ||
( nx <= x && nx < editorRect.left ) ||
( nx >= x && nx > editorRect.right )
( ny <= y && ny < editorRect.top - pageYOffset ) ||
( ny >= y && ny > editorRect.bottom - pageYOffset ) ||
( nx <= x && nx < editorRect.left - pageXOffset ) ||
( nx >= x && nx > editorRect.right - pageXOffset )
) {
traveledX += Math.abs( x - nx );
traveledY += Math.abs( y - ny );
if ( (
ny <= editorRect.top - buffer ||
ny >= editorRect.bottom + buffer ||
nx <= editorRect.left - buffer ||
nx >= editorRect.right + buffer
ny <= editorRect.top - buffer - pageYOffset ||
ny >= editorRect.bottom + buffer - pageYOffset ||
nx <= editorRect.left - buffer - pageXOffset ||
nx >= editorRect.right + buffer - pageXOffset
) && (
traveledX > 10 ||
traveledY > 10
@@ -1123,7 +1129,7 @@
button.active( false );
} );
},
tooltip: 'Distraction Free Writing',
tooltip: 'Distraction-free writing mode',
shortcut: 'Alt+Shift+W'
} );
@@ -1151,6 +1157,7 @@
editor.on( 'blur', maybeFadeIn );
editor.on( 'focus', focus );
editor.on( 'blur', blur );
editor.on( 'wp-autoresize', recalcEditorRect );
};
mceUnbind = function() {
@@ -1158,6 +1165,7 @@
editor.off( 'blur', maybeFadeIn );
editor.off( 'focus', focus );
editor.off( 'blur', blur );
editor.off( 'wp-autoresize', recalcEditorRect );
};
if ( _isOn ) {

File diff suppressed because one or more lines are too long

View File

@@ -405,7 +405,7 @@ window.wp = window.wp || {};
this.set( {
to : this.revisions.get( state.to ),
from : this.revisions.get( state.from ),
compareTwoMode : this.revisions.get( state.compareTwoMode )
compareTwoMode : state.compareTwoMode
} );
// Start the router if browser supports History API

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
/* global ajaxurl, pwsL10n, _wpSessionMangager */
/* global ajaxurl, pwsL10n */
(function($){
function check_pass_strength() {
@@ -125,25 +125,19 @@
});
$( '#destroy-sessions' ).on( 'click', function( e ) {
var $this = $(this);
var data = {
action : 'destroy-sessions',
_ajax_nonce : _wpSessionMangager.nonce,
user_id : _wpSessionMangager.user_id,
token : $(this).data('token')
};
$.post( ajaxurl, data, function( response ) {
if ( response.success ) {
$this.prop( 'disabled', true );
$this.before( '<div class="updated inline"><p>' + response.data.message + '</p></div>' );
} else {
$this.before( '<div class="error inline"><p>' + response.data.message + '</p></div>' );
}
}, 'json' );
wp.ajax.post( 'destroy-sessions', {
nonce: $( '#_wpnonce' ).val(),
user_id: $( '#user_id' ).val()
}).done( function( response ) {
$this.prop( 'disabled', true );
$this.siblings( '.notice' ).remove();
$this.before( '<div class="notice notice-success inline"><p>' + response.message + '</p></div>' );
}).fail( function( response ) {
$this.siblings( '.notice' ).remove();
$this.before( '<div class="notice notice-error inline"><p>' + response.message + '</p></div>' );
});
e.preventDefault();
});

View File

@@ -1 +1 @@
!function(a){function b(){var b,c=a("#pass1").val(),d=a("#pass2").val();if(a("#pass-strength-result").removeClass("short bad good strong"),!c)return void a("#pass-strength-result").html(pwsL10n.empty);switch(b=wp.passwordStrength.meter(c,wp.passwordStrength.userInputBlacklist(),d)){case 2:a("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:a("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:a("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;case 5:a("#pass-strength-result").addClass("short").html(pwsL10n.mismatch);break;default:a("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}a(document).ready(function(){var c,d,e,f,g=a("#display_name");a("#pass1").val("").keyup(b),a("#pass2").val("").keyup(b),a("#pass-strength-result").show(),a(".color-palette").click(function(){a(this).siblings('input[name="admin_color"]').prop("checked",!0)}),g.length&&a("#first_name, #last_name, #nickname").bind("blur.user_profile",function(){var b=[],c={display_nickname:a("#nickname").val()||"",display_username:a("#user_login").val()||"",display_firstname:a("#first_name").val()||"",display_lastname:a("#last_name").val()||""};c.display_firstname&&c.display_lastname&&(c.display_firstlast=c.display_firstname+" "+c.display_lastname,c.display_lastfirst=c.display_lastname+" "+c.display_firstname),a.each(a("option",g),function(a,c){b.push(c.value)}),a.each(c,function(d,e){if(e){var f=e.replace(/<\/?[a-z][^>]*>/gi,"");c[d].length&&-1===a.inArray(f,b)&&(b.push(f),a("<option />",{text:f}).appendTo(g))}})}),c=a("#color-picker"),d=a("#colors-css"),e=a("input#user_id").val(),f=a('input[name="checkuser_id"]').val(),c.on("click.colorpicker",".color-option",function(){var b,c=a(this);if(!c.hasClass("selected")&&(c.siblings(".selected").removeClass("selected"),c.addClass("selected").find('input[type="radio"]').prop("checked",!0),e===f)){if(0===d.length&&(d=a('<link rel="stylesheet" />').appendTo("head")),d.attr("href",c.children(".css_url").val()),"undefined"!=typeof wp&&wp.svgPainter){try{b=a.parseJSON(c.children(".icon_colors").val())}catch(g){}b&&(wp.svgPainter.setColors(b),wp.svgPainter.paint())}a.post(ajaxurl,{action:"save-user-color-scheme",color_scheme:c.children('input[name="admin_color"]').val(),nonce:a("#color-nonce").val()})}})}),a("#destroy-sessions").on("click",function(b){var c=a(this),d={action:"destroy-sessions",_ajax_nonce:_wpSessionMangager.nonce,user_id:_wpSessionMangager.user_id,token:a(this).data("token")};a.post(ajaxurl,d,function(a){a.success?(c.prop("disabled",!0),c.before('<div class="updated inline"><p>'+a.data.message+"</p></div>")):c.before('<div class="error inline"><p>'+a.data.message+"</p></div>")},"json"),b.preventDefault()})}(jQuery);
!function(a){function b(){var b,c=a("#pass1").val(),d=a("#pass2").val();if(a("#pass-strength-result").removeClass("short bad good strong"),!c)return void a("#pass-strength-result").html(pwsL10n.empty);switch(b=wp.passwordStrength.meter(c,wp.passwordStrength.userInputBlacklist(),d)){case 2:a("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:a("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:a("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;case 5:a("#pass-strength-result").addClass("short").html(pwsL10n.mismatch);break;default:a("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}a(document).ready(function(){var c,d,e,f,g=a("#display_name");a("#pass1").val("").keyup(b),a("#pass2").val("").keyup(b),a("#pass-strength-result").show(),a(".color-palette").click(function(){a(this).siblings('input[name="admin_color"]').prop("checked",!0)}),g.length&&a("#first_name, #last_name, #nickname").bind("blur.user_profile",function(){var b=[],c={display_nickname:a("#nickname").val()||"",display_username:a("#user_login").val()||"",display_firstname:a("#first_name").val()||"",display_lastname:a("#last_name").val()||""};c.display_firstname&&c.display_lastname&&(c.display_firstlast=c.display_firstname+" "+c.display_lastname,c.display_lastfirst=c.display_lastname+" "+c.display_firstname),a.each(a("option",g),function(a,c){b.push(c.value)}),a.each(c,function(d,e){if(e){var f=e.replace(/<\/?[a-z][^>]*>/gi,"");c[d].length&&-1===a.inArray(f,b)&&(b.push(f),a("<option />",{text:f}).appendTo(g))}})}),c=a("#color-picker"),d=a("#colors-css"),e=a("input#user_id").val(),f=a('input[name="checkuser_id"]').val(),c.on("click.colorpicker",".color-option",function(){var b,c=a(this);if(!c.hasClass("selected")&&(c.siblings(".selected").removeClass("selected"),c.addClass("selected").find('input[type="radio"]').prop("checked",!0),e===f)){if(0===d.length&&(d=a('<link rel="stylesheet" />').appendTo("head")),d.attr("href",c.children(".css_url").val()),"undefined"!=typeof wp&&wp.svgPainter){try{b=a.parseJSON(c.children(".icon_colors").val())}catch(g){}b&&(wp.svgPainter.setColors(b),wp.svgPainter.paint())}a.post(ajaxurl,{action:"save-user-color-scheme",color_scheme:c.children('input[name="admin_color"]').val(),nonce:a("#color-nonce").val()})}})}),a("#destroy-sessions").on("click",function(b){var c=a(this);wp.ajax.post("destroy-sessions",{nonce:a("#_wpnonce").val(),user_id:a("#user_id").val()}).done(function(a){c.prop("disabled",!0),c.siblings(".notice").remove(),c.before('<div class="notice notice-success inline"><p>'+a.message+"</p></div>")}).fail(function(a){c.siblings(".notice").remove(),c.before('<div class="notice notice-error inline"><p>'+a.message+"</p></div>")}),b.preventDefault()})}(jQuery);

View File

@@ -1,6 +1,6 @@
/* global deleteUserSetting, setUserSetting, switchEditors, tinymce, tinyMCEPreInit */
/**
* Distraction Free Writing
* Distraction-Free Writing
* (wp-fullscreen)
*
* Access the API globally using the window.wp.editor.fullscreen variable.

View File

@@ -308,9 +308,11 @@ switch($step) {
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
<script>
(function(){
var el=document.getElementById('wp-config');
el.focus();
el.select();
if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
var el = document.getElementById('wp-config');
el.focus();
el.select();
}
})();
</script>
<?php

View File

@@ -242,7 +242,7 @@ function list_plugin_updates() {
foreach ( (array) $plugins as $plugin_file => $plugin_data) {
$info = plugins_api('plugin_information', array('slug' => $plugin_data->update->slug ));
if ( is_wp_error( $info ) ) {
continue;
$info = false;
}
// Get plugin compat for running version of WordPress.

View File

@@ -25,15 +25,6 @@ elseif ( ! get_userdata( $user_id ) )
wp_enqueue_script('user-profile');
wp_localize_script(
'user-profile',
'_wpSessionMangager',
array(
'user_id' => $user_id,
'nonce' => wp_create_nonce( sprintf( 'destroy_sessions_%d', $user_id ) ),
)
);
$title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
$submenu_file = 'users.php';
@@ -488,26 +479,37 @@ if ( $show_password_fields ) :
<p class="description"><?php _e( 'Type your new password again.' ); ?></p>
<br />
<div id="pass-strength-result"><?php _e( 'Strength indicator' ); ?></div>
<p class="description indicator-hint"><?php echo _wp_get_password_hint(); ?></p>
<p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
</td>
</tr>
<?php endif; ?>
<?php if ( IS_PROFILE_PAGE && ( count( $sessions->get_all() ) > 1 ) ) { ?>
<?php
if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
<tr class="user-sessions-wrap hide-if-no-js">
<th>&nbsp;</th>
<td aria-live="assertive">
<div class="destroy-sessions"><button class="button button-secondary" id="destroy-sessions" data-token="<?php echo esc_attr( wp_get_session_token() ); ?>"><?php _e( 'Log Out of All Other Sessions' ); ?></button></div>
<div class="destroy-sessions"><button type="button" disabled class="button button-secondary"><?php _e( 'Log Out of All Other Sessions' ); ?></button></div>
<p class="description">
<?php _e( 'You are only logged in at this location.' ); ?>
</p>
</td>
</tr>
<?php elseif ( IS_PROFILE_PAGE && count( $sessions->get_all() ) > 1 ) : ?>
<tr class="user-sessions-wrap hide-if-no-js">
<th>&nbsp;</th>
<td aria-live="assertive">
<div class="destroy-sessions"><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out of All Other Sessions' ); ?></button></div>
<p class="description">
<?php _e( 'Left your account logged in at a public computer? Lost your phone? This will log you out everywhere except your current browser.' ); ?>
</p>
</td>
</tr>
<?php } else if ( ! IS_PROFILE_PAGE && ( count( $sessions->get_all() ) > 0 ) ) { ?>
<?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all() ) : ?>
<tr class="user-sessions-wrap hide-if-no-js">
<th>&nbsp;</th>
<td>
<p><button class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out of All Sessions' ); ?></button></p>
<p><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out of All Sessions' ); ?></button></p>
<p class="description">
<?php
/* translators: 1: User's display name. */
@@ -516,7 +518,7 @@ if ( $show_password_fields ) :
</p>
</td>
</tr>
<?php } ?>
<?php endif; ?>
</table>

View File

@@ -398,7 +398,7 @@ if ( apply_filters( 'show_password_fields', true ) ) : ?>
<input name="pass2" type="password" id="pass2" autocomplete="off" />
<br />
<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
<p class="description indicator-hint"><?php echo _wp_get_password_hint(); ?></p>
<p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
</td>
</tr>
<tr>

View File

@@ -2,9 +2,9 @@
# This file is distributed under the GNU General Public License v2 or later.
msgid ""
msgstr ""
"Project-Id-Version: Twenty Eleven 1.9\n"
"Project-Id-Version: Twenty Eleven 2.0\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyeleven\n"
"POT-Creation-Date: 2014-09-03 00:45:45+00:00\n"
"POT-Creation-Date: 2014-12-18 16:59:49+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -162,7 +162,7 @@ msgstr ""
#: content-aside.php:46 content-featured.php:45 content-gallery.php:88
#: content-image.php:70 content-intro.php:19 content-link.php:46
#: content-page.php:21 content-quote.php:72 content-single.php:52
#: content-status.php:59 content.php:82 functions.php:606 functions.php:634
#: content-status.php:59 content.php:82 functions.php:609 functions.php:637
#: image.php:41
msgid "Edit"
msgstr ""
@@ -223,7 +223,7 @@ msgid ""
"\" rel=\"author\">%6$s</a></span></span>"
msgstr ""
#: content-image.php:41 functions.php:672
#: content-image.php:41 functions.php:675
msgid "View all posts by %s"
msgstr ""
@@ -266,7 +266,7 @@ msgstr ""
msgid "Featured"
msgstr ""
#. #-#-#-#-# twentyeleven.pot (Twenty Eleven 1.9) #-#-#-#-#
#. #-#-#-#-# twentyeleven.pot (Twenty Eleven 2.0) #-#-#-#-#
#. Author URI of the plugin/theme
#: footer.php:28
msgid "http://wordpress.org/"
@@ -324,69 +324,69 @@ msgstr ""
msgid "Hanoi Plant"
msgstr ""
#: functions.php:443
#: functions.php:446
msgid "Main Sidebar"
msgstr ""
#: functions.php:452
#: functions.php:455
msgid "Showcase Sidebar"
msgstr ""
#: functions.php:454
#: functions.php:457
msgid "The sidebar for the optional Showcase Template"
msgstr ""
#: functions.php:462
#: functions.php:465
msgid "Footer Area One"
msgstr ""
#: functions.php:464 functions.php:474 functions.php:484
#: functions.php:467 functions.php:477 functions.php:487
msgid "An optional widget area for your site footer"
msgstr ""
#: functions.php:472
#: functions.php:475
msgid "Footer Area Two"
msgstr ""
#: functions.php:482
#: functions.php:485
msgid "Footer Area Three"
msgstr ""
#: functions.php:506 single.php:18
#: functions.php:509 single.php:18
msgid "Post navigation"
msgstr ""
#: functions.php:507
#: functions.php:510
msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
msgstr ""
#: functions.php:508
#: functions.php:511
msgid "Newer posts <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: functions.php:606
#: functions.php:609
msgid "Pingback:"
msgstr ""
#. translators: 1: comment author, 2: date and time
#: functions.php:623
#: functions.php:626
msgid "%1$s on %2$s <span class=\"says\">said:</span>"
msgstr ""
#. translators: 1: date, 2: time
#: functions.php:629
#: functions.php:632
msgid "%1$s at %2$s"
msgstr ""
#: functions.php:638
#: functions.php:641
msgid "Your comment is awaiting moderation."
msgstr ""
#: functions.php:647
#: functions.php:650
msgid "Reply <span>&darr;</span>"
msgstr ""
#: functions.php:666
#: functions.php:669
msgid ""
"<span class=\"sep\">Posted on </span><a href=\"%1$s\" title=\"%2$s\" rel="
"\"bookmark\"><time class=\"entry-date\" datetime=\"%3$s\">%4$s</time></"

View File

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.org/themes/twentyeleven
Author: the WordPress team
Author URI: http://wordpress.org/
Description: The 2011 theme for WordPress is sophisticated, lightweight, and adaptable. Make it yours with a custom menu, header image, and background -- then go further with available theme options for light or dark color scheme, custom link colors, and three layout choices. Twenty Eleven comes equipped with a Showcase page template that transforms your front page into a showcase to show off your best content, widget support galore (sidebar, three footer areas, and a Showcase page widget area), and a custom "Ephemera" widget to display your Aside, Link, Quote, or Status posts. Included are styles for print and for the admin editor, support for featured images (as custom header images on posts and pages and as large images on featured "sticky" posts), and special styles for six different post formats.
Version: 1.9
Version: 2.0
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: dark, light, white, black, gray, one-column, two-columns, left-sidebar, right-sidebar, fixed-layout, responsive-layout, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-image-header, featured-images, flexible-header, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

View File

@@ -14,11 +14,11 @@ get_header(); ?>
<section class="error-404 not-found">
<header class="page-header">
<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'twentyfifteen' ); ?></h1>
<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'twentyfifteen' ); ?></h1>
</header><!-- .page-header -->
<div class="page-content">
<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyfifteen' ); ?></p>
<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyfifteen' ); ?></p>
<?php get_search_form(); ?>
</div><!-- .page-content -->

View File

@@ -45,7 +45,7 @@ get_header(); ?>
endwhile;
// Previous/next page navigation.
the_pagination( array(
the_posts_pagination( array(
'prev_text' => __( 'Previous page', 'twentyfifteen' ),
'next_text' => __( 'Next page', 'twentyfifteen' ),
'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',

View File

@@ -1 +0,0 @@
== Changelog ==

View File

@@ -50,7 +50,7 @@ if ( post_password_required() ) {
// If comments are closed and there are comments, let's leave a little note, shall we?
if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
?>
<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
<p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
<?php endif; ?>
<?php comment_form(); ?>

View File

@@ -28,16 +28,16 @@
<?php
/* translators: %s: Name of current post */
the_content( sprintf(
esc_html__( 'Continue reading %s', 'twentyfifteen' ),
__( 'Continue reading %s', 'twentyfifteen' ),
the_title( '<span class="screen-reader-text">', '</span>', false )
) );
wp_link_pages( array(
'before' => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
'after' => '</div>',
'link_before' => '<span>',
'link_after' => '</span>',
'pagelink' => '<span class="screen-reader-text">' . esc_html__( 'Page', 'twentyfifteen' ) . ' </span>%',
'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
'separator' => '<span class="screen-reader-text">, </span>',
) );
?>
@@ -53,7 +53,7 @@
<footer class="entry-footer">
<?php twentyfifteen_entry_meta(); ?>
<?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</footer>
<!-- .entry-footer -->

View File

@@ -12,7 +12,7 @@
<section class="no-results not-found">
<header class="page-header">
<h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'twentyfifteen' ); ?></h1>
<h1 class="page-title"><?php _e( 'Nothing Found', 'twentyfifteen' ); ?></h1>
</header><!-- .page-header -->
<div class="page-content">
@@ -23,12 +23,12 @@
<?php elseif ( is_search() ) : ?>
<p><?php esc_html_e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfifteen' ); ?></p>
<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfifteen' ); ?></p>
<?php get_search_form(); ?>
<?php else : ?>
<p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentyfifteen' ); ?></p>
<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentyfifteen' ); ?></p>
<?php get_search_form(); ?>
<?php endif; ?>

View File

@@ -22,16 +22,16 @@
<?php the_content(); ?>
<?php
wp_link_pages( array(
'before' => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
'after' => '</div>',
'link_before' => '<span>',
'link_after' => '</span>',
'pagelink' => '<span class="screen-reader-text">' . esc_html__( 'Page', 'twentyfifteen' ) . ' </span>%',
'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
'separator' => '<span class="screen-reader-text">, </span>',
) );
?>
</div><!-- .entry-content -->
<?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
</article><!-- #post-## -->

View File

@@ -25,12 +25,12 @@
<footer class="entry-footer">
<?php twentyfifteen_entry_meta(); ?>
<?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</footer><!-- .entry-footer -->
<?php else : ?>
<?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
<?php endif; ?>

View File

@@ -30,16 +30,16 @@
<?php
/* translators: %s: Name of current post */
the_content( sprintf(
esc_html__( 'Continue reading %s', 'twentyfifteen' ),
__( 'Continue reading %s', 'twentyfifteen' ),
the_title( '<span class="screen-reader-text">', '</span>', false )
) );
wp_link_pages( array(
'before' => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
'after' => '</div>',
'link_before' => '<span>',
'link_after' => '</span>',
'pagelink' => '<span class="screen-reader-text">' . esc_html__( 'Page', 'twentyfifteen' ) . ' </span>%',
'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
'separator' => '<span class="screen-reader-text">, </span>',
) );
?>
@@ -54,7 +54,7 @@
<footer class="entry-footer">
<?php twentyfifteen_entry_meta(); ?>
<?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</footer><!-- .entry-footer -->
</article><!-- #post-## -->

View File

@@ -379,10 +379,6 @@ a {
* 6.0 Galleries
*/
.gallery {
margin-bottom: 28px;
}
.gallery-item {
display: inline-block;
padding: 1.79104477%;
@@ -457,6 +453,10 @@ a {
* 8.0 RTL
*/
body.rtl {
font-family: Arial, Tahoma, sans-serif;
}
.rtl blockquote {
border-left: none;
border-right: 4px solid #707070;

View File

@@ -912,4 +912,4 @@ video {
.rtl .bypostauthor > article .fn:after {
right: 6px;
left: auto;
}
}

View File

@@ -86,4 +86,4 @@ Description: IE7 specific style.
.gallery-columns-9 .gallery-item {
max-width: 8%;
}
}

View File

@@ -22,7 +22,7 @@
*/
do_action( 'twentyfifteen_credits' );
?>
<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfifteen' ) ); ?>"><?php printf( esc_html__( 'Proudly powered by %s', 'twentyfifteen' ), 'WordPress' ); ?></a>
<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfifteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentyfifteen' ), 'WordPress' ); ?></a>
</div><!-- .site-info -->
</footer><!-- .site-footer -->

View File

@@ -150,8 +150,9 @@ if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
* @return string Google fonts URL for the theme.
*/
function twentyfifteen_fonts_url() {
$fonts = array();
$subsets = 'latin,latin-ext';
$fonts_url = '';
$fonts = array();
$subsets = 'latin,latin-ext';
/* translators: If there are characters in your language that are not supported by Noto Sans, translate this to 'off'. Do not translate into your own language. */
if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
@@ -181,10 +182,14 @@ function twentyfifteen_fonts_url() {
$subsets .= ',vietnamese';
}
return add_query_arg( array(
'family' => urlencode( implode( '|', $fonts ) ),
'subset' => urlencode( $subsets ),
), '//fonts.googleapis.com/css' );
if ( $fonts ) {
$fonts_url = add_query_arg( array(
'family' => urlencode( implode( '|', $fonts ) ),
'subset' => urlencode( $subsets ),
), '//fonts.googleapis.com/css' );
}
return $fonts_url;
}
endif;
@@ -201,7 +206,7 @@ function twentyfifteen_scripts() {
wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.2' );
// Load our main stylesheet.
wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri(), array( 'twentyfifteen-fonts', 'genericons' ) );
wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri() );
// Load the Internet Explorer specific stylesheet.
wp_enqueue_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style' ), '20141010' );
@@ -221,10 +226,10 @@ function twentyfifteen_scripts() {
wp_enqueue_script( 'twentyfifteen-keyboard-image-navigation', get_template_directory_uri() . '/js/keyboard-image-navigation.js', array( 'jquery' ), '20141010' );
}
wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20141010', true );
wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20141212', true );
wp_localize_script( 'twentyfifteen-script', 'screenReaderText', array(
'expand' => '<span class="screen-reader-text">' . esc_html__( 'expand child menu', 'twentyfifteen' ) . '</span>',
'collapse' => '<span class="screen-reader-text">' . esc_html__( 'collapse child menu', 'twentyfifteen' ) . '</span>',
'expand' => '<span class="screen-reader-text">' . __( 'expand child menu', 'twentyfifteen' ) . '</span>',
'collapse' => '<span class="screen-reader-text">' . __( 'collapse child menu', 'twentyfifteen' ) . '</span>',
) );
}
add_action( 'wp_enqueue_scripts', 'twentyfifteen_scripts' );

View File

@@ -248,7 +248,7 @@ body.searching #iconlist span.update:after, body.searching #iconlist span.new:af
float: none;
width: 100%;
}
#glyph .info {
width: 30%;
}
@@ -353,18 +353,18 @@ jQuery(document).ready(function() {
var $rows = jQuery('#iconlist div');
jQuery('#search').keyup(function() {
// remove update text when using search
jQuery('body').addClass('searching');
var val = jQuery.trim(jQuery(this).val()).replace(/ +/g, ' ').toLowerCase();
$rows.show().filter(function() {
var text = jQuery(this).text().replace(/\s+/g, ' ').toLowerCase();
return !~text.indexOf(val);
}).hide();
});
jQuery('input#search').focus();
// sort based on number
@@ -391,329 +391,329 @@ function toggleUACs() {
<div id="glyph">
</div>
<div class="description">
<p>Genericons are vector icons embedded in a webfont designed to be clean and simple keeping with a generic aesthetic. Use for instant HiDPI or to easily change colors on the fly.</p>
</div>
</div>
</div>
<div id="icons">
<div id="iconlist">
<!-- note, the text inside the HTML elements is purely for the seach -->
<div alt="f423" class="genericon genericon-404" title="genericon-404">404</div>
<div alt="f508" class="genericon genericon-activity" title="genericon-activity">activity</div>
<div alt="f509" class="genericon genericon-anchor" title="genericon-anchor">anchor</div>
<div alt="f101" class="genericon genericon-aside" title="genericon-aside">aside</div>
<div alt="f416" class="genericon genericon-attachment" title="genericon-attachment">attachment</div>
<div alt="f109" class="genericon genericon-audio" title="genericon-audio">audio</div>
<div alt="f471" class="genericon genericon-bold" title="genericon-bold">bold</div>
<div alt="f444" class="genericon genericon-book" title="genericon-book">book</div>
<div alt="f50a" class="genericon genericon-bug" title="genericon-bug">bug</div>
<div alt="f447" class="genericon genericon-cart" title="genericon-cart">cart</div>
<div alt="f301" class="genericon genericon-category" title="genericon-category">category</div>
<div alt="f108" class="genericon genericon-chat" title="genericon-chat">chat</div>
<div alt="f418" class="genericon genericon-checkmark" title="genericon-checkmark">checkmark</div>
<div alt="f405" class="genericon genericon-close" title="genericon-close">close</div>
<div alt="f406" class="genericon genericon-close-alt" title="genericon-close-alt">close-alt</div>
<div alt="f426" class="genericon genericon-cloud" title="genericon-cloud">cloud</div>
<div alt="f440" class="genericon genericon-cloud-download" title="genericon-cloud-download">cloud-download</div>
<div alt="f441" class="genericon genericon-cloud-upload" title="genericon-cloud-upload">cloud-upload</div>
<div alt="f462" class="genericon genericon-code" title="genericon-code">code</div>
<div alt="f216" class="genericon genericon-codepen" title="genericon-codepen">codepen</div>
<div alt="f445" class="genericon genericon-cog" title="genericon-cog">cog</div>
<div alt="f432" class="genericon genericon-collapse" title="genericon-collapse">collapse</div>
<div alt="f300" class="genericon genericon-comment" title="genericon-comment">comment</div>
<div alt="f305" class="genericon genericon-day" title="genericon-day">day</div>
<div alt="f221" class="genericon genericon-digg" title="genericon-digg">digg</div>
<div alt="f443" class="genericon genericon-document" title="genericon-document">document</div>
<div alt="f428" class="genericon genericon-dot" title="genericon-dot">dot</div>
<div alt="f502" class="genericon genericon-downarrow" title="genericon-downarrow">downarrow</div>
<div alt="f50b" class="genericon genericon-download" title="genericon-download">download</div>
<div alt="f436" class="genericon genericon-draggable" title="genericon-draggable">draggable</div>
<div alt="f201" class="genericon genericon-dribbble" title="genericon-dribbble">dribbble</div>
<div alt="f225" class="genericon genericon-dropbox" title="genericon-dropbox">dropbox</div>
<div alt="f433" class="genericon genericon-dropdown" title="genericon-dropdown">dropdown</div>
<div alt="f434" class="genericon genericon-dropdown-left" title="genericon-dropdown-left">dropdown-left</div>
<div alt="f411" class="genericon genericon-edit" title="genericon-edit">edit</div>
<div alt="f476" class="genericon genericon-ellipsis" title="genericon-ellipsis">ellipsis</div>
<div alt="f431" class="genericon genericon-expand" title="genericon-expand">expand</div>
<div alt="f442" class="genericon genericon-external" title="genericon-external">external</div>
<div alt="f203" class="genericon genericon-facebook" title="genericon-facebook">facebook</div>
<div alt="f204" class="genericon genericon-facebook-alt" title="genericon-facebook-alt">facebook-alt</div>
<div alt="f458" class="genericon genericon-fastforward" title="genericon-fastforward">fastforward</div>
<div alt="f413" class="genericon genericon-feed" title="genericon-feed">feed</div>
<div alt="f468" class="genericon genericon-flag" title="genericon-flag">flag</div>
<div alt="f211" class="genericon genericon-flickr" title="genericon-flickr">flickr</div>
<div alt="f226" class="genericon genericon-foursquare" title="genericon-foursquare">foursquare</div>
<div alt="f474" class="genericon genericon-fullscreen" title="genericon-fullscreen">fullscreen</div>
<div alt="f103" class="genericon genericon-gallery" title="genericon-gallery">gallery</div>
<div alt="f200" class="genericon genericon-github" title="genericon-github">github</div>
<div alt="f206" class="genericon genericon-googleplus" title="genericon-googleplus">googleplus</div>
<div alt="f218" class="genericon genericon-googleplus-alt" title="genericon-googleplus-alt">googleplus-alt</div>
<div alt="f50c" class="genericon genericon-handset" title="genericon-handset">handset</div>
<div alt="f461" class="genericon genericon-heart" title="genericon-heart">heart</div>
<div alt="f457" class="genericon genericon-help" title="genericon-help">help</div>
<div alt="f404" class="genericon genericon-hide" title="genericon-hide">hide</div>
<div alt="f505" class="genericon genericon-hierarchy" title="genericon-hierarchy">hierarchy</div>
<div alt="f409" class="genericon genericon-home" title="genericon-home">home</div>
<div alt="f102" class="genericon genericon-image" title="genericon-image">image</div>
<div alt="f455" class="genericon genericon-info" title="genericon-info">info</div>
<div alt="f215" class="genericon genericon-instagram" title="genericon-instagram">instagram</div>
<div alt="f472" class="genericon genericon-italic" title="genericon-italic">italic</div>
<div alt="f427" class="genericon genericon-key" title="genericon-key">key</div>
<div alt="f503" class="genericon genericon-leftarrow" title="genericon-leftarrow">leftarrow</div>
<div alt="f107" class="genericon genericon-link" title="genericon-link">link</div>
<div alt="f207" class="genericon genericon-linkedin" title="genericon-linkedin">linkedin</div>
<div alt="f208" class="genericon genericon-linkedin-alt" title="genericon-linkedin-alt">linkedin-alt</div>
<div alt="f417" class="genericon genericon-location" title="genericon-location">location</div>
<div alt="f470" class="genericon genericon-lock" title="genericon-lock">lock</div>
<div alt="f410" class="genericon genericon-mail" title="genericon-mail">mail</div>
<div alt="f422" class="genericon genericon-maximize" title="genericon-maximize">maximize</div>
<div alt="f419" class="genericon genericon-menu" title="genericon-menu">menu</div>
<div alt="f50d" class="genericon genericon-microphone" title="genericon-microphone">microphone</div>
<div alt="f421" class="genericon genericon-minimize" title="genericon-minimize">minimize</div>
<div alt="f50e" class="genericon genericon-minus" title="genericon-minus">minus</div>
<div alt="f307" class="genericon genericon-month" title="genericon-month">month</div>
<div alt="f50f" class="genericon genericon-move" title="genericon-move">move</div>
<div alt="f429" class="genericon genericon-next" title="genericon-next">next</div>
<div alt="f456" class="genericon genericon-notice" title="genericon-notice">notice</div>
<div alt="f506" class="genericon genericon-paintbrush" title="genericon-paintbrush">paintbrush</div>
<div alt="f219" class="genericon genericon-path" title="genericon-path">path</div>
<div alt="f448" class="genericon genericon-pause" title="genericon-pause">pause</div>
<div alt="f437" class="genericon genericon-phone" title="genericon-phone">phone</div>
<div alt="f473" class="genericon genericon-picture" title="genericon-picture">picture</div>
<div alt="f308" class="genericon genericon-pinned" title="genericon-pinned">pinned</div>
<div alt="f209" class="genericon genericon-pinterest" title="genericon-pinterest">pinterest</div>
<div alt="f210" class="genericon genericon-pinterest-alt" title="genericon-pinterest-alt">pinterest-alt</div>
<div alt="f452" class="genericon genericon-play" title="genericon-play">play</div>
<div alt="f439" class="genericon genericon-plugin" title="genericon-plugin">plugin</div>
<div alt="f510" class="genericon genericon-plus" title="genericon-plus">plus</div>
<div alt="f224" class="genericon genericon-pocket" title="genericon-pocket">pocket</div>
<div alt="f217" class="genericon genericon-polldaddy" title="genericon-polldaddy">polldaddy</div>
<div alt="f460" class="genericon genericon-portfolio" title="genericon-portfolio">portfolio</div>
<div alt="f430" class="genericon genericon-previous" title="genericon-previous">previous</div>
<div alt="f469" class="genericon genericon-print" title="genericon-print">print</div>
<div alt="f106" class="genericon genericon-quote" title="genericon-quote">quote</div>
<div alt="f511" class="genericon genericon-rating-empty" title="genericon-rating-empty">rating-empty</div>
<div alt="f512" class="genericon genericon-rating-full" title="genericon-rating-full">rating-full</div>
<div alt="f513" class="genericon genericon-rating-half" title="genericon-rating-half">rating-half</div>
<div alt="f222" class="genericon genericon-reddit" title="genericon-reddit">reddit</div>
<div alt="f420" class="genericon genericon-refresh" title="genericon-refresh">refresh</div>
<div alt="f412" class="genericon genericon-reply" title="genericon-reply">reply</div>
<div alt="f466" class="genericon genericon-reply-alt" title="genericon-reply-alt">reply-alt</div>
<div alt="f467" class="genericon genericon-reply-single" title="genericon-reply-single">reply-single</div>
<div alt="f459" class="genericon genericon-rewind" title="genericon-rewind">rewind</div>
<div alt="f501" class="genericon genericon-rightarrow" title="genericon-rightarrow">rightarrow</div>
<div alt="f400" class="genericon genericon-search" title="genericon-search">search</div>
<div alt="f438" class="genericon genericon-send-to-phone" title="genericon-send-to-phone">send-to-phone</div>
<div alt="f454" class="genericon genericon-send-to-tablet" title="genericon-send-to-tablet">send-to-tablet</div>
<div alt="f415" class="genericon genericon-share" title="genericon-share">share</div>
<div alt="f403" class="genericon genericon-show" title="genericon-show">show</div>
<div alt="f514" class="genericon genericon-shuffle" title="genericon-shuffle">shuffle</div>
<div alt="f507" class="genericon genericon-sitemap" title="genericon-sitemap">sitemap</div>
<div alt="f451" class="genericon genericon-skip-ahead" title="genericon-skip-ahead">skip-ahead</div>
<div alt="f450" class="genericon genericon-skip-back" title="genericon-skip-back">skip-back</div>
<div alt="f220" class="genericon genericon-skype" title="genericon-skype">skype</div>
<div alt="f424" class="genericon genericon-spam" title="genericon-spam">spam</div>
<div alt="f515" class="genericon genericon-spotify" title="genericon-spotify">spotify</div>
<div alt="f100" class="genericon genericon-standard" title="genericon-standard">standard</div>
<div alt="f408" class="genericon genericon-star" title="genericon-star">star</div>
<div alt="f105" class="genericon genericon-status" title="genericon-status">status</div>
<div alt="f449" class="genericon genericon-stop" title="genericon-stop">stop</div>
<div alt="f223" class="genericon genericon-stumbleupon" title="genericon-stumbleupon">stumbleupon</div>
<div alt="f463" class="genericon genericon-subscribe" title="genericon-subscribe">subscribe</div>
<div alt="f465" class="genericon genericon-subscribed" title="genericon-subscribed">subscribed</div>
<div alt="f425" class="genericon genericon-summary" title="genericon-summary">summary</div>
<div alt="f453" class="genericon genericon-tablet" title="genericon-tablet">tablet</div>
<div alt="f302" class="genericon genericon-tag" title="genericon-tag">tag</div>
<div alt="f303" class="genericon genericon-time" title="genericon-time">time</div>
<div alt="f435" class="genericon genericon-top" title="genericon-top">top</div>
<div alt="f407" class="genericon genericon-trash" title="genericon-trash">trash</div>
<div alt="f214" class="genericon genericon-tumblr" title="genericon-tumblr">tumblr</div>
<div alt="f516" class="genericon genericon-twitch" title="genericon-twitch">twitch</div>
<div alt="f202" class="genericon genericon-twitter" title="genericon-twitter">twitter</div>
<div alt="f446" class="genericon genericon-unapprove" title="genericon-unapprove">unapprove</div>
<div alt="f464" class="genericon genericon-unsubscribe" title="genericon-unsubscribe">unsubscribe</div>
<div alt="f401" class="genericon genericon-unzoom" title="genericon-unzoom">unzoom</div>
<div alt="f500" class="genericon genericon-uparrow" title="genericon-uparrow">uparrow</div>
<div alt="f304" class="genericon genericon-user" title="genericon-user">user</div>
<div alt="f104" class="genericon genericon-video" title="genericon-video">video</div>
<div alt="f517" class="genericon genericon-videocamera" title="genericon-videocamera">videocamera</div>
<div alt="f212" class="genericon genericon-vimeo" title="genericon-vimeo">vimeo</div>
<div alt="f414" class="genericon genericon-warning" title="genericon-warning">warning</div>
<div alt="f475" class="genericon genericon-website" title="genericon-website">website</div>
<div alt="f306" class="genericon genericon-week" title="genericon-week">week</div>
<div alt="f205" class="genericon genericon-wordpress" title="genericon-wordpress">wordpress</div>
<div alt="f504" class="genericon genericon-xpost" title="genericon-xpost">xpost</div>
<div alt="f213" class="genericon genericon-youtube" title="genericon-youtube">youtube</div>
<div alt="f402" class="genericon genericon-zoom" title="genericon-zoom">zoom</div>
</div>
<div id="temp" style="display: none;"></div>
</div>
<div id="footer">
<p>An <a href="http://automattic.com" rel="nofollow">Automattic</a> Portrayal</p>
<p>No designers were harmed in the making of this icon font.</p>
</div>
</div>
</body>
</html>
</html>

View File

@@ -207,7 +207,3 @@
.genericon-xpost:before { content: "\f504"; }
.genericon-youtube:before { content: "\f213"; }
.genericon-zoom:before { content: "\f402"; }

View File

@@ -24,7 +24,7 @@
<body <?php body_class(); ?>>
<div id="page" class="hfeed site">
<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'twentyfifteen' ); ?></a>
<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'twentyfifteen' ); ?></a>
<div id="sidebar" class="sidebar">
<header id="masthead" class="site-header" role="banner">
@@ -37,11 +37,11 @@
<?php endif;
$description = get_bloginfo( 'description', 'display' );
if ( ! empty( $description ) || is_customize_preview() ) : ?>
<p class="site-description"><?php echo esc_html( $description ); ?></p>
if ( $description || is_customize_preview() ) : ?>
<p class="site-description"><?php echo $description; ?></p>
<?php endif;
?>
<button class="secondary-toggle"><?php esc_html_e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
<button class="secondary-toggle"><?php _e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
</div><!-- .site-branding -->
</header><!-- .site-header -->

View File

@@ -21,7 +21,7 @@ get_header(); ?>
<nav id="image-navigation" class="navigation image-navigation">
<div class="nav-links">
<div class="nav-previous"><?php previous_image_link( false, esc_html__( 'Previous Image', 'twentyfifteen' ) ); ?></div><div class="nav-next"><?php next_image_link( false, esc_html__( 'Next Image', 'twentyfifteen' ) ); ?></div>
<div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentyfifteen' ) ); ?></div><div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentyfifteen' ) ); ?></div>
</div><!-- .nav-links -->
</nav><!-- .image-navigation -->
@@ -56,11 +56,11 @@ get_header(); ?>
<?php
the_content();
wp_link_pages( array(
'before' => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
'after' => '</div>',
'link_before' => '<span>',
'link_after' => '</span>',
'pagelink' => '<span class="screen-reader-text">' . esc_html__( 'Page', 'twentyfifteen' ) . ' </span>%',
'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
'separator' => '<span class="screen-reader-text">, </span>',
) );
?>
@@ -68,7 +68,7 @@ get_header(); ?>
<footer class="entry-footer">
<?php twentyfifteen_entry_meta(); ?>
<?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</footer><!-- .entry-footer -->
</article><!-- #post-## -->

View File

@@ -181,7 +181,7 @@ endif; // twentyfifteen_header_style
function twentyfifteen_header_background_color_css() {
$color_scheme = twentyfifteen_get_color_scheme();
$default_color = $color_scheme[1];
$header_background_color = get_theme_mod( 'header_background_color', '#ffffff' );
$header_background_color = get_theme_mod( 'header_background_color', $default_color );
// Don't do anything if the current color is the default.
if ( $header_background_color === $default_color ) {
@@ -225,7 +225,7 @@ add_action( 'wp_enqueue_scripts', 'twentyfifteen_header_background_color_css', 1
function twentyfifteen_sidebar_text_color_css() {
$color_scheme = twentyfifteen_get_color_scheme();
$default_color = $color_scheme[4];
$sidebar_link_color = get_theme_mod( 'sidebar_textcolor', '#333333' );
$sidebar_link_color = get_theme_mod( 'sidebar_textcolor', $default_color );
// Don't do anything if the current color is the default.
if ( $sidebar_link_color === $default_color ) {
@@ -353,4 +353,4 @@ function twentyfifteen_sidebar_text_color_css() {
wp_add_inline_style( 'twentyfifteen-style', sprintf( $css, $sidebar_link_color, $sidebar_text_color, $sidebar_border_color, $sidebar_border_focus_color ) );
}
add_action( 'wp_enqueue_scripts', 'twentyfifteen_sidebar_text_color_css', 11 );
add_action( 'wp_enqueue_scripts', 'twentyfifteen_sidebar_text_color_css', 11 );

View File

@@ -27,13 +27,8 @@ function twentyfifteen_customize_register( $wp_customize ) {
'transport' => 'postMessage',
) );
$wp_customize->add_setting( 'color_scheme_css', array(
'default' => '',
'transport' => 'postMessage',
) );
$wp_customize->add_control( 'color_scheme', array(
'label' => esc_html__( 'Base Color Scheme', 'twentyfifteen' ),
'label' => __( 'Base Color Scheme', 'twentyfifteen' ),
'section' => 'colors',
'type' => 'select',
'choices' => twentyfifteen_get_color_scheme_choices(),
@@ -48,8 +43,8 @@ function twentyfifteen_customize_register( $wp_customize ) {
) );
$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'sidebar_textcolor', array(
'label' => esc_html__( 'Header and Sidebar Text Color', 'twentyfifteen' ),
'description' => esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
'label' => __( 'Header and Sidebar Text Color', 'twentyfifteen' ),
'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
'section' => 'colors',
) ) );
@@ -64,13 +59,13 @@ function twentyfifteen_customize_register( $wp_customize ) {
) );
$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'header_background_color', array(
'label' => esc_html__( 'Header and Sidebar Background Color', 'twentyfifteen' ),
'description' => esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
'label' => __( 'Header and Sidebar Background Color', 'twentyfifteen' ),
'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
'section' => 'colors',
) ) );
// Add an additional description to the header image section.
$wp_customize->get_section( 'header_image' )->description = esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' );
$wp_customize->get_section( 'header_image' )->description = __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' );
}
add_action( 'customize_register', 'twentyfifteen_customize_register', 11 );
@@ -94,7 +89,7 @@ add_action( 'customize_register', 'twentyfifteen_customize_register', 11 );
function twentyfifteen_get_color_schemes() {
return apply_filters( 'twentyfifteen_color_schemes', array(
'default' => array(
'label' => esc_html__( 'Default', 'twentyfifteen' ),
'label' => __( 'Default', 'twentyfifteen' ),
'colors' => array(
'#f1f1f1',
'#ffffff',
@@ -105,7 +100,7 @@ function twentyfifteen_get_color_schemes() {
),
),
'dark' => array(
'label' => esc_html__( 'Dark', 'twentyfifteen' ),
'label' => __( 'Dark', 'twentyfifteen' ),
'colors' => array(
'#111111',
'#202020',
@@ -116,7 +111,7 @@ function twentyfifteen_get_color_schemes() {
),
),
'yellow' => array(
'label' => esc_html__( 'Yellow', 'twentyfifteen' ),
'label' => __( 'Yellow', 'twentyfifteen' ),
'colors' => array(
'#f4ca16',
'#ffdf00',
@@ -127,7 +122,7 @@ function twentyfifteen_get_color_schemes() {
),
),
'pink' => array(
'label' => esc_html__( 'Pink', 'twentyfifteen' ),
'label' => __( 'Pink', 'twentyfifteen' ),
'colors' => array(
'#ffe5d1',
'#e53b51',
@@ -138,7 +133,7 @@ function twentyfifteen_get_color_schemes() {
),
),
'purple' => array(
'label' => esc_html__( 'Purple', 'twentyfifteen' ),
'label' => __( 'Purple', 'twentyfifteen' ),
'colors' => array(
'#674970',
'#2e2256',
@@ -149,7 +144,7 @@ function twentyfifteen_get_color_schemes() {
),
),
'blue' => array(
'label' => esc_html__( 'Blue', 'twentyfifteen' ),
'label' => __( 'Blue', 'twentyfifteen' ),
'colors' => array(
'#e9f2f9',
'#55c3dc',
@@ -182,7 +177,7 @@ function twentyfifteen_get_color_scheme() {
}
endif; // twentyfifteen_get_color_scheme
if ( ! function_exists( 'twentyfifteen_get_color_scheme_control_options' ) ) :
if ( ! function_exists( 'twentyfifteen_get_color_scheme_choices' ) ) :
/**
* Returns an array of color scheme choices registered for Twenty Fifteen.
*
@@ -200,7 +195,7 @@ function twentyfifteen_get_color_scheme_choices() {
return $color_scheme_control_options;
}
endif; // twentyfifteen_get_color_scheme_control_options
endif; // twentyfifteen_get_color_scheme_choices
if ( ! function_exists( 'twentyfifteen_sanitize_color_scheme' ) ) :
/**
@@ -231,13 +226,34 @@ endif; // twentyfifteen_sanitize_color_scheme
*/
function twentyfifteen_color_scheme_css() {
$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
$color_scheme_css = get_theme_mod( 'color_scheme_css', '' );
// Don't do anything if the default color scheme is selected.
if ( 'default' === $color_scheme_option || empty( $color_scheme_css ) ) {
if ( 'default' === $color_scheme_option ) {
return;
}
$color_scheme = twentyfifteen_get_color_scheme();
// Convert main and sidebar text hex color to rgba.
$color_textcolor_rgb = twentyfifteen_hex2rgb( $color_scheme[3] );
$color_sidebar_textcolor_rgb = twentyfifteen_hex2rgb( $color_scheme[4] );
$colors = array(
'background_color' => $color_scheme[0],
'header_background_color' => $color_scheme[1],
'box_background_color' => $color_scheme[2],
'textcolor' => $color_scheme[3],
'secondary_textcolor' => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.7)', $color_textcolor_rgb ),
'border_color' => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.1)', $color_textcolor_rgb ),
'border_focus_color' => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.3)', $color_textcolor_rgb ),
'sidebar_textcolor' => $color_scheme[4],
'sidebar_border_color' => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.1)', $color_sidebar_textcolor_rgb ),
'sidebar_border_focus_color' => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.3)', $color_sidebar_textcolor_rgb ),
'secondary_sidebar_textcolor' => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.7)', $color_sidebar_textcolor_rgb ),
'meta_box_background_color' => $color_scheme[5],
);
$color_scheme_css = twentyfifteen_get_color_scheme_css( $colors );
wp_add_inline_style( 'twentyfifteen-style', $color_scheme_css );
}
add_action( 'wp_enqueue_scripts', 'twentyfifteen_color_scheme_css' );
@@ -250,7 +266,7 @@ add_action( 'wp_enqueue_scripts', 'twentyfifteen_color_scheme_css' );
* @since Twenty Fifteen 1.0
*/
function twentyfifteen_customize_control_js() {
wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls', 'iris', 'underscore', 'wp-util' ), '', true );
wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls', 'iris', 'underscore', 'wp-util' ), '20141216', true );
wp_localize_script( 'color-scheme-control', 'colorScheme', twentyfifteen_get_color_schemes() );
}
add_action( 'customize_controls_enqueue_scripts', 'twentyfifteen_customize_control_js' );
@@ -261,32 +277,46 @@ add_action( 'customize_controls_enqueue_scripts', 'twentyfifteen_customize_contr
* @since Twenty Fifteen 1.0
*/
function twentyfifteen_customize_preview_js() {
wp_enqueue_script( 'twentyfifteen-customize-preview', get_template_directory_uri() . '/js/customize-preview.js', array( 'customize-preview' ), '20141029', true );
wp_enqueue_script( 'twentyfifteen-customize-preview', get_template_directory_uri() . '/js/customize-preview.js', array( 'customize-preview' ), '20141216', true );
}
add_action( 'customize_preview_init', 'twentyfifteen_customize_preview_js' );
/**
* Output an Underscore template for generating CSS for the color scheme.
*
* The template generates the css dynamically for instant display in the Customizer
* preview, and to be saved in a `theme_mod` for display on the front-end.
* Returns CSS for the color schemes.
*
* @since Twenty Fifteen 1.0
*
* @param array $colors Color scheme colors.
* @return string Color scheme CSS.
*/
function twentyfifteen_color_scheme_css_template() {
?>
<script type="text/html" id="tmpl-twentyfifteen-color-scheme">
function twentyfifteen_get_color_scheme_css( $colors ) {
$colors = wp_parse_args( $colors, array(
'background_color' => '',
'header_background_color' => '',
'box_background_color' => '',
'textcolor' => '',
'secondary_textcolor' => '',
'border_color' => '',
'border_focus_color' => '',
'sidebar_textcolor' => '',
'sidebar_border_color' => '',
'sidebar_border_focus_color' => '',
'secondary_sidebar_textcolor' => '',
'meta_box_background_color' => '',
) );
$css = <<<CSS
/* Color Scheme */
/* Background Color */
body {
background-color: {{ data.background_color }};
background-color: {$colors['background_color']};
}
/* Sidebar Background Color */
body:before,
.site-header {
background-color: {{ data.header_background_color }};
background-color: {$colors['header_background_color']};
}
/* Box Background Color */
@@ -298,7 +328,7 @@ function twentyfifteen_color_scheme_css_template() {
.page-header,
.page-content,
.comments-area {
background-color: {{ data.box_background_color }};
background-color: {$colors['box_background_color']};
}
/* Box Background Color */
@@ -315,7 +345,7 @@ function twentyfifteen_color_scheme_css_template() {
.page-links a:hover,
.page-links a:focus,
.sticky-post {
color: {{ data.box_background_color }};
color: {$colors['box_background_color']};
}
/* Main Text Color */
@@ -328,7 +358,7 @@ function twentyfifteen_color_scheme_css_template() {
.widget_calendar tbody a,
.page-links a,
.sticky-post {
background-color: {{ data.textcolor }};
background-color: {$colors['textcolor']};
}
/* Main Text Color */
@@ -352,7 +382,7 @@ function twentyfifteen_color_scheme_css_template() {
.comment-list .reply a:focus,
.site-info a:hover,
.site-info a:focus {
color: {{ data.textcolor }};
color: {$colors['textcolor']};
}
/* Main Text Color */
@@ -369,7 +399,7 @@ function twentyfifteen_color_scheme_css_template() {
.pingback .edit-link a:hover,
.comment-list .reply a:hover,
.site-info a:hover {
border-color: {{ data.textcolor }};
border-color: {$colors['textcolor']};
}
/* Secondary Text Color */
@@ -389,8 +419,8 @@ function twentyfifteen_color_scheme_css_template() {
.widget_calendar tbody a:focus,
.page-links a:hover,
.page-links a:focus {
background-color: {{ data.textcolor }}; /* Fallback for IE7 and IE8 */
background-color: {{ data.secondary_textcolor }};
background-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
background-color: {$colors['secondary_textcolor']};
}
/* Secondary Text Color */
@@ -429,24 +459,24 @@ function twentyfifteen_color_scheme_css_template() {
.wp-caption-text,
.gallery-caption,
.comment-list .reply a {
color: {{ data.textcolor }}; /* Fallback for IE7 and IE8 */
color: {{ data.secondary_textcolor }};
color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
color: {$colors['secondary_textcolor']};
}
/* Secondary Text Color */
blockquote,
.logged-in-as a:hover,
.comment-author a:hover {
border-color: {{ data.textcolor }}; /* Fallback for IE7 and IE8 */
border-color: {{ data.secondary_textcolor }};
border-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
border-color: {$colors['secondary_textcolor']};
}
/* Border Color */
hr,
.dropdown-toggle:hover,
.dropdown-toggle:focus {
background-color: {{ data.textcolor }}; /* Fallback for IE7 and IE8 */
background-color: {{ data.border_color }};
background-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
background-color: {$colors['border_color']};
}
/* Border Color */
@@ -481,67 +511,67 @@ function twentyfifteen_color_scheme_css_template() {
.comment-list .trackback,
.comment-list .reply a,
.no-comments {
border-color: {{ data.textcolor }}; /* Fallback for IE7 and IE8 */
border-color: {{ data.border_color }};
border-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
border-color: {$colors['border_color']};
}
/* Border Focus Color */
a:focus,
button:focus,
input:focus {
outline-color: {{ data.textcolor }}; /* Fallback for IE7 and IE8 */
outline-color: {{ data.border_focus_color }};
outline-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
outline-color: {$colors['border_focus_color']};
}
input:focus,
textarea:focus {
border-color: {{ data.textcolor }}; /* Fallback for IE7 and IE8 */
border-color: {{ data.border_focus_color }};
border-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
border-color: {$colors['border_focus_color']};
}
/* Sidebar Link Color */
.secondary-toggle:before {
color: {{ data.sidebar_textcolor }};
color: {$colors['sidebar_textcolor']};
}
.site-title a,
.site-description {
color: {{ data.sidebar_textcolor }};
color: {$colors['sidebar_textcolor']};
}
/* Sidebar Text Color */
.site-title a:hover,
.site-title a:focus {
color: {{ data.secondary_sidebar_textcolor }};
color: {$colors['secondary_sidebar_textcolor']};
}
/* Sidebar Border Color */
.secondary-toggle {
border-color: {{ data.sidebar_textcolor }}; /* Fallback for IE7 and IE8 */
border-color: {{ data.sidebar_border_color }};
border-color: {$colors['sidebar_textcolor']}; /* Fallback for IE7 and IE8 */
border-color: {$colors['sidebar_border_color']};
}
/* Sidebar Border Focus Color */
.secondary-toggle:hover,
.secondary-toggle:focus {
border-color: {{ data.sidebar_textcolor }}; /* Fallback for IE7 and IE8 */
border-color: {{ data.sidebar_border_focus_color }};
border-color: {$colors['sidebar_textcolor']}; /* Fallback for IE7 and IE8 */
border-color: {$colors['sidebar_border_focus_color']};
}
.site-title a {
outline-color: {{ data.sidebar_textcolor }}; /* Fallback for IE7 and IE8 */
outline-color: {{ data.sidebar_border_focus_color }};
outline-color: {$colors['sidebar_textcolor']}; /* Fallback for IE7 and IE8 */
outline-color: {$colors['sidebar_border_focus_color']};
}
/* Meta Background Color */
.entry-footer {
background-color: {{ data.meta_box_background_color }};
background-color: {$colors['meta_box_background_color']};
}
@media screen and (min-width: 38.75em) {
/* Main Text Color */
.page-header {
border-color: {{ data.textcolor }};
border-color: {$colors['textcolor']};
}
}
@@ -560,7 +590,7 @@ function twentyfifteen_color_scheme_css_template() {
.widget_calendar tbody a,
.widget_calendar tbody a:hover,
.widget_calendar tbody a:focus {
color: {{ data.header_background_color }};
color: {$colors['header_background_color']};
}
/* Sidebar Link Color */
@@ -569,7 +599,7 @@ function twentyfifteen_color_scheme_css_template() {
.widget-title,
.widget blockquote cite,
.widget blockquote small {
color: {{ data.sidebar_textcolor }};
color: {$colors['sidebar_textcolor']};
}
.widget button,
@@ -577,11 +607,11 @@ function twentyfifteen_color_scheme_css_template() {
.widget input[type="reset"],
.widget input[type="submit"],
.widget_calendar tbody a {
background-color: {{ data.sidebar_textcolor }};
background-color: {$colors['sidebar_textcolor']};
}
.textwidget a {
border-color: {{ data.sidebar_textcolor }};
border-color: {$colors['sidebar_textcolor']};
}
/* Sidebar Text Color */
@@ -592,7 +622,7 @@ function twentyfifteen_color_scheme_css_template() {
.widget blockquote,
.widget .wp-caption-text,
.widget .gallery-caption {
color: {{ data.secondary_sidebar_textcolor }};
color: {$colors['secondary_sidebar_textcolor']};
}
.widget button:hover,
@@ -605,11 +635,11 @@ function twentyfifteen_color_scheme_css_template() {
.widget input[type="submit"]:focus,
.widget_calendar tbody a:hover,
.widget_calendar tbody a:focus {
background-color: {{ data.secondary_sidebar_textcolor }};
background-color: {$colors['secondary_sidebar_textcolor']};
}
.widget blockquote {
border-color: {{ data.secondary_sidebar_textcolor }};
border-color: {$colors['secondary_sidebar_textcolor']};
}
/* Sidebar Border Color */
@@ -626,25 +656,56 @@ function twentyfifteen_color_scheme_css_template() {
.widget_nav_menu .sub-menu,
.widget_pages .children,
.widget abbr[title] {
border-color: {{ data.sidebar_border_color }};
border-color: {$colors['sidebar_border_color']};
}
.dropdown-toggle:hover,
.dropdown-toggle:focus,
.widget hr {
background-color: {{ data.sidebar_border_color }};
background-color: {$colors['sidebar_border_color']};
}
.widget input:focus,
.widget textarea:focus {
border-color: {{ data.sidebar_border_focus_color }};
border-color: {$colors['sidebar_border_focus_color']};
}
.sidebar a:focus,
.dropdown-toggle:focus {
outline-color: {{ data.sidebar_border_focus_color }};
outline-color: {$colors['sidebar_border_focus_color']};
}
}
CSS;
return $css;
}
/**
* Output an Underscore template for generating CSS for the color scheme.
*
* The template generates the css dynamically for instant display in the Customizer
* preview.
*
* @since Twenty Fifteen 1.0
*/
function twentyfifteen_color_scheme_css_template() {
$colors = array(
'background_color' => '{{ data.background_color }}',
'header_background_color' => '{{ data.header_background_color }}',
'box_background_color' => '{{ data.box_background_color }}',
'textcolor' => '{{ data.textcolor }}',
'secondary_textcolor' => '{{ data.secondary_textcolor }}',
'border_color' => '{{ data.border_color }}',
'border_focus_color' => '{{ data.border_focus_color }}',
'sidebar_textcolor' => '{{ data.sidebar_textcolor }}',
'sidebar_border_color' => '{{ data.sidebar_border_color }}',
'sidebar_border_focus_color' => '{{ data.sidebar_border_focus_color }}',
'secondary_sidebar_textcolor' => '{{ data.secondary_sidebar_textcolor }}',
'meta_box_background_color' => '{{ data.meta_box_background_color }}',
);
?>
<script type="text/html" id="tmpl-twentyfifteen-color-scheme">
<?php echo twentyfifteen_get_color_scheme_css( $colors ); ?>
</script>
<?php
}

View File

@@ -20,14 +20,14 @@ function twentyfifteen_comment_nav() {
if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
?>
<nav class="navigation comment-navigation" role="navigation">
<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
<h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
<div class="nav-links">
<?php
if ( $prev_link = get_previous_comments_link( esc_html__( 'Older Comments', 'twentyfifteen' ) ) ) :
if ( $prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) ) ) :
printf( '<div class="nav-previous">%s</div>', $prev_link );
endif;
if ( $next_link = get_next_comments_link( esc_html__( 'Newer Comments', 'twentyfifteen' ) ) ) :
if ( $next_link = get_next_comments_link( __( 'Newer Comments', 'twentyfifteen' ) ) ) :
printf( '<div class="nav-next">%s</div>', $next_link );
endif;
?>
@@ -46,13 +46,13 @@ if ( ! function_exists( 'twentyfifteen_entry_meta' ) ) :
*/
function twentyfifteen_entry_meta() {
if ( is_sticky() && is_home() && ! is_paged() ) {
printf( '<span class="sticky-post">%s</span>', esc_html__( 'Featured', 'twentyfifteen' ) );
printf( '<span class="sticky-post">%s</span>', __( 'Featured', 'twentyfifteen' ) );
}
$format = get_post_format();
if ( current_theme_supports( 'post-formats', $format ) ) {
printf( '<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
sprintf( '<span class="screen-reader-text">%s </span>', esc_html_x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
esc_url( get_post_format_link( $format ) ),
get_post_format_string( $format )
);
@@ -67,13 +67,13 @@ function twentyfifteen_entry_meta() {
$time_string = sprintf( $time_string,
esc_attr( get_the_date( 'c' ) ),
esc_html( get_the_date() ),
get_the_date(),
esc_attr( get_the_modified_date( 'c' ) ),
esc_html( get_the_modified_date() )
get_the_modified_date()
);
printf( '<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
esc_html_x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
_x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
esc_url( get_permalink() ),
$time_string
);
@@ -82,16 +82,16 @@ function twentyfifteen_entry_meta() {
if ( 'post' == get_post_type() ) {
if ( is_singular() || is_multi_author() ) {
printf( '<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
esc_html_x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
_x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
esc_html( get_the_author() )
get_the_author()
);
}
$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
if ( $categories_list && twentyfifteen_categorized_blog() ) {
printf( '<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
esc_html_x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
_x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
$categories_list
);
}
@@ -99,7 +99,7 @@ function twentyfifteen_entry_meta() {
$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
if ( $tags_list ) {
printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
esc_html_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
$tags_list
);
}
@@ -110,7 +110,7 @@ function twentyfifteen_entry_meta() {
$metadata = wp_get_attachment_metadata();
printf( '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
_x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
esc_url( wp_get_attachment_url() ),
$metadata['width'],
$metadata['height']
@@ -119,7 +119,7 @@ function twentyfifteen_entry_meta() {
if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
echo '<span class="comments-link">';
comments_popup_link( esc_html__( 'Leave a comment', 'twentyfifteen' ), esc_html__( '1 Comment', 'twentyfifteen' ), esc_html__( '% Comments', 'twentyfifteen' ) );
comments_popup_link( __( 'Leave a comment', 'twentyfifteen' ), __( '1 Comment', 'twentyfifteen' ), __( '% Comments', 'twentyfifteen' ) );
echo '</span>';
}
}
@@ -234,7 +234,7 @@ function twentyfifteen_excerpt_more( $more ) {
$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
esc_url( get_permalink( get_the_ID() ) ),
/* translators: %s: Name of current post */
sprintf( esc_html__( 'Continue reading %s', 'twentyfifteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
sprintf( __( 'Continue reading %s', 'twentyfifteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
);
return ' &hellip; ' . $link;
}

View File

@@ -42,7 +42,7 @@ get_header(); ?>
endwhile;
// Previous/next page navigation.
the_pagination( array(
the_posts_pagination( array(
'prev_text' => __( 'Previous page', 'twentyfifteen' ),
'next_text' => __( 'Next page', 'twentyfifteen' ),
'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',

View File

@@ -47,8 +47,8 @@
} );
// Generate the CSS for the current Color Scheme.
function getCSS() {
var scheme = api( 'color_scheme' )(),
function updateCSS() {
var scheme = api( 'color_scheme' )(), css,
colors = _.object( colorSchemeKeys, colorScheme[ scheme ].colors );
// Merge in color scheme overrides.
@@ -64,15 +64,15 @@
colors.sidebar_border_color = Color( colors.sidebar_textcolor ).toCSS( 'rgba', 0.1 );
colors.sidebar_border_focus_color = Color( colors.sidebar_textcolor ).toCSS( 'rgba', 0.3 );
return cssTemplate( colors );
css = cssTemplate( colors );
api.previewer.send( 'update-color-scheme-css', css );
}
// Update the CSS whenever a color setting is changed.
_.each( colorSettings, function( setting ) {
api( setting, function( setting ) {
setting.bind( _.throttle( function() {
api( 'color_scheme_css' ).set( getCSS() );
}, 250 ) );
setting.bind( updateCSS );
} );
} );
} )( wp.customize );

View File

@@ -3,7 +3,8 @@
*/
( function( $ ) {
var $style = $( '#twentyfifteen-color-scheme-css' );
var $style = $( '#twentyfifteen-color-scheme-css' ),
api = wp.customize;
if ( ! $style.length ) {
$style = $( 'head' ).append( '<style type="text/css" id="twentyfifteen-color-scheme-css" />' )
@@ -11,24 +12,24 @@
}
// Site title.
wp.customize( 'blogname', function( value ) {
api( 'blogname', function( value ) {
value.bind( function( to ) {
$( '.site-title a' ).text( to );
} );
} );
// Site tagline.
wp.customize( 'blogdescription', function( value ) {
api( 'blogdescription', function( value ) {
value.bind( function( to ) {
$( '.site-description' ).text( to );
} );
} );
// Color Scheme CSS.
wp.customize( 'color_scheme_css', function( value ) {
value.bind( function( to ) {
$style.html( to );
api.bind( 'preview-ready', function() {
api.preview.bind( 'update-color-scheme-css', function( css ) {
$style.html( css );
} );
} );
} )( jQuery );
} )( jQuery );

View File

@@ -6,9 +6,9 @@
*/
( function( $ ) {
var $body, $window, $document, $sidebar, adminbarOffset, top = false,
bottom = false, windowWidth, windowHeight, lastWindowPos = 0,
topOffset = 0, documentHeight, sidebarHeight, resizeTimer;
var $body, $window, $sidebar, adminbarOffset, top = false,
bottom = false, windowWidth, windowHeight, lastWindowPos = 0,
topOffset = 0, bodyHeight, sidebarHeight, resizeTimer;
// Add dropdown toggle that display child menu items.
$( '.main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a' ).after( '<button class="dropdown-toggle" aria-expanded="false">' + screenReaderText.expand + '</button>' );
@@ -52,12 +52,12 @@
// Sidebar scrolling.
function resize() {
windowWidth = $window.width();
windowHeight = $window.height();
documentHeight = $document.height();
windowWidth = $window.width();
windowHeight = $window.height();
bodyHeight = $body.height();
sidebarHeight = $sidebar.height();
if ( 955 >= windowWidth ) {
if ( 955 > windowWidth ) {
top = bottom = false;
$sidebar.removeAttr( 'style' );
}
@@ -66,35 +66,37 @@
function scroll() {
var windowPos = $window.scrollTop();
if ( 955 <= windowWidth && sidebarHeight + adminbarOffset < documentHeight ) {
if ( sidebarHeight + adminbarOffset > windowHeight ) {
if ( windowPos > lastWindowPos ) {
if ( top ) {
top = false;
topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
$sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
} else if ( ! bottom && windowPos + windowHeight > sidebarHeight + $sidebar.offset().top ) {
bottom = true;
$sidebar.attr( 'style', 'position: fixed;bottom: 0;' );
}
} else if ( windowPos < lastWindowPos ) {
if ( bottom ) {
bottom = false;
topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
$sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
} else if ( ! top && windowPos + adminbarOffset < $sidebar.offset().top ) {
top = true;
$sidebar.attr( 'style', 'position: fixed;' );
}
} else {
top = bottom = false;
if ( 955 > windowWidth ) {
return;
}
if ( sidebarHeight + adminbarOffset > windowHeight ) {
if ( windowPos > lastWindowPos ) {
if ( top ) {
top = false;
topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
$sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
} else if ( ! bottom && windowPos + windowHeight > sidebarHeight + $sidebar.offset().top && sidebarHeight + adminbarOffset < bodyHeight ) {
bottom = true;
$sidebar.attr( 'style', 'position: fixed; bottom: 0;' );
}
} else if ( ! top ) {
top = true;
$sidebar.attr( 'style', 'position: fixed;' );
} else if ( windowPos < lastWindowPos ) {
if ( bottom ) {
bottom = false;
topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
$sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
} else if ( ! top && windowPos + adminbarOffset < $sidebar.offset().top ) {
top = true;
$sidebar.attr( 'style', 'position: fixed;' );
}
} else {
top = bottom = false;
topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
$sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
}
} else if ( ! top ) {
top = true;
$sidebar.attr( 'style', 'position: fixed;' );
}
lastWindowPos = windowPos;
@@ -106,10 +108,9 @@
}
$( document ).ready( function() {
$body = $( 'body' );
$body = $( document.body );
$window = $( window );
$document = $( document );
$sidebar = $( '#sidebar' ).first();
$sidebar = $( '#sidebar' ).first();
adminbarOffset = $body.is( '.admin-bar' ) ? $( '#wpadminbar' ).height() : 0;
$window

View File

@@ -19,4 +19,4 @@
window.location = url;
}
} );
} )( jQuery );
} )( jQuery );

View File

@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Twenty Fifteen 1.0\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyfifteen\n"
"POT-Creation-Date: 2014-12-04 12:59:53+00:00\n"
"POT-Creation-Date: 2014-12-14 12:26:59+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -113,31 +113,43 @@ msgstr ""
msgid "Add widgets here to appear in your sidebar."
msgstr ""
#: functions.php:160
#. translators: If there are characters in your language that are not supported
#. by Noto Sans, translate this to 'off'. Do not translate into your own
#. language.
#: functions.php:158
msgctxt "Noto Sans font: on or off"
msgid "on"
msgstr ""
#: functions.php:168
#. translators: If there are characters in your language that are not supported
#. by Noto Serif, translate this to 'off'. Do not translate into your own
#. language.
#: functions.php:163
msgctxt "Noto Serif font: on or off"
msgid "on"
msgstr ""
#: functions.php:176
#. translators: If there are characters in your language that are not supported
#. by Inconsolata, translate this to 'off'. Do not translate into your own
#. language.
#: functions.php:168
msgctxt "Inconsolata font: on or off"
msgid "on"
msgstr ""
#: functions.php:184
#. translators: To add an additional character subset specific to your
#. language, translate this to 'greek', 'cyrillic', 'devanagari' or
#. 'vietnamese'. Do not translate into your own language.
#: functions.php:173
msgctxt "Add new subset (greek, cyrillic, devanagari, vietnamese)"
msgid "no-subset"
msgstr ""
#: functions.php:238
#: functions.php:231
msgid "expand child menu"
msgstr ""
#: functions.php:239
#: functions.php:232
msgid "collapse child menu"
msgstr ""
@@ -278,17 +290,19 @@ msgid "Search Results for: %s"
msgstr ""
#: single.php:33
msgctxt "Next post link"
msgid ""
"<span class=\"meta-nav\">Next <span class=\"screen-reader-text\">post:</"
"span></span><span class=\"post-title\">%title</span>"
msgid "Next"
msgstr ""
#: single.php:34
msgctxt "Previous post link"
msgid ""
"<span class=\"meta-nav\">Previous <span class=\"screen-reader-text\">post:</"
"span></span><span class=\"post-title\">%title</span>"
msgid "Next post:"
msgstr ""
#: single.php:36
msgid "Previous"
msgstr ""
#: single.php:37
msgid "Previous post:"
msgstr ""
#. Theme Name of the plugin/theme

View File

@@ -1,9 +1,9 @@
=== Twenty Fifteen ===
Contributors: the WordPress team
Tags: black, blue, gray, pink, purple, white, yellow, dark, light, two-columns, left-sidebar, fixed-layout, responsive-layout, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready
Requires at least: 3.4
Requires at least: 4.1
Tested up to: 4.1
Stable tag:
Stable tag: 4.1
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -18,35 +18,31 @@ Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty
* Post Formats
* The GPL v2.0 or later license. :) Use it to make something cool.
== Credits ==
* screenshot.png image is from https://unsplash.imgix.net/29/fly.jpg released under the CC0 license https://unsplash.com/license
== Installation ==
1. In your admin panel, go to Appearance -> Themes and click the Add New button.
2. Click Upload and Choose File, then select the theme's .zip file. Click Install Now.
2. Click Upload and Choose File, then select the theme's ZIP file. Click Install Now.
3. Click Activate to use your new theme right away.
== Frequently Asked Questions ==
= How do I change the color scheme? =
You can change the colors of your site really easily using Twenty Fifteen.
1. Go to your Dashboard.
2. Click Appearance.
3. Click Customize.
You can change the colors of your site easily using Twenty Fifteen.
1. In your admin panel, go to Appearance -> Customize.
4. Now you will see the Customizer and a tab called 'Colors'. Click this tab.
5. You can now change your color scheme by selecting one of the predefined ones. Simple click on the radio button by the side of the scheme you want. You can preview the change in the Customizer.
5. You can now change your color scheme by selecting one of the predefined ones. Choose a color scheme you want from Base Color Scheme dropdown. You can preview the change in the Customizer.
6. Should you wish to create your own color scheme or modify an existing one, you can by selecting the colors for each area listed.
7. Once you are happy with your color changes you can click save and your changes will be reflected on your live site.
= How do I add the social links to the sidebar? =
= How do I add the Social Links to the sidebar? =
Twenty Fifteen allows you display links to your social media profiles, like Twitter and Facebook, with icons.
1. Create a new Custom Menu, and assign it to the Social Links Menu location.
2. Add links to each of your social services using the Links panel.
3. Icons for your social links will automatically appear if its available.
3. Icons for your social links will automatically appear if it's available.
Available icons: (Linking to any of the following sites will automatically display its icon in your social menu).
@@ -66,7 +62,7 @@ Available icons: (Linking to any of the following sites will automatically displ
* Pocket
* PollDaddy
* Reddit
* RSS Feed (urls with /feed/)
* RSS Feed (URLs with /feed/)
* Spotify
* StumbleUpon
* Tumblr
@@ -76,19 +72,21 @@ Available icons: (Linking to any of the following sites will automatically displ
* WordPress
* YouTube
Social networks that aren't currently supported will be indicated by a circular icon with a diagonal line through the center.
Social networks that aren't currently supported will be indicated by a generic share icon.
= How do I add a description for my menu link in navigation? =
Twenty Fifteen allows you to not only show a menu link title but also add a description for each menu item.
Twenty Fifteen sports a menu design that's easy to navigate -- especially when you add menu descriptions.
1. First up select the menu you want to add links and descriptions to.
2. Make sure under Screen Options you turn on Description. Without this you won't be able to add descriptions.
2. When in the Menu Structure section, you can click open the link and add a description.
3. Once you save the menu with your link, the new description should show up.
1. Visit the Menus page in your admin.
2. Use the Screen Options tab to "Show advanced menu properties".
3. Select "Description" there to start editing menu descriptions.
4. Select the menu you want to add links and descriptions to.
5. When in the Menu Structure section, you can click open the link and add a description.
6. Once you save the menu with your link, the new description should show up.
= Quick Specs =
1. The main content width is 660px.
2. The sidebar width is 247px.
3. Featured Images are 825px wide by 510px high.
2. The sidebar width is 248px.
3. Featured Images are 825px wide by 510px high.

View File

@@ -53,6 +53,66 @@ td {
* 2.0 Typography
*/
body,
button,
input[type="button"],
input[type="reset"],
input[type="submit"],
input,
select,
textarea,
blockquote cite,
blockquote small,
.post-password-form label,
.main-navigation .menu-item-description,
.post-navigation .meta-nav,
.post-navigation .post-title,
.pagination,
.image-navigation,
.comment-navigation,
.site-title,
.site-description,
.widget-title,
.widget_calendar caption,
.widget_rss .rss-date,
.widget_rss cite,
.author-heading,
.entry-footer,
.page-title,
.page-links,
.entry-caption,
.comments-title,
.comment-reply-title,
.comment-metadata,
.pingback .edit-link,
.comment-list .reply a,
.comment-form label,
.comment-notes,
.comment-awaiting-moderation,
.logged-in-as,
.form-allowed-tags,
.no-comments,
.wp-caption-text,
.gallery-caption {
font-family: Arial, Tahoma, sans-serif;
}
::-webkit-input-placeholder {
font-family: Arial, Tahoma, sans-serif;
}
:-moz-placeholder {
font-family: Arial, Tahoma, sans-serif;
}
::-moz-placeholder {
font-family: Arial, Tahoma, sans-serif;
}
:-ms-input-placeholder {
font-family: Arial, Tahoma, sans-serif;
}
blockquote {
border-right: 4px solid rgba(51, 51, 51, 0.7);
border-left: 0;
@@ -126,16 +186,6 @@ td {
left: 0;
}
.secondary-toggle:before {
right: 0;
left: auto;
}
.secondary-toggle.toggled-on:before {
right: 0;
left: auto;
}
.post-navigation .has-post-thumbnail a:before {
right: 0;
left: auto;
@@ -803,4 +853,4 @@ img.alignleft {
width: -webkit-calc(50% - 289px);
width: calc(50% - 289px);
}
}
}

View File

@@ -15,7 +15,7 @@ get_header(); ?>
<?php if ( have_posts() ) : ?>
<header class="page-header">
<h1 class="page-title"><?php printf( esc_html__( 'Search Results for: %s', 'twentyfifteen' ), get_search_query() ); ?></h1>
<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyfifteen' ), get_search_query() ); ?></h1>
</header><!-- .page-header -->
<?php
@@ -34,7 +34,7 @@ get_header(); ?>
endwhile;
// Previous/next page navigation.
the_pagination( array(
the_posts_pagination( array(
'prev_text' => __( 'Previous page', 'twentyfifteen' ),
'next_text' => __( 'Next page', 'twentyfifteen' ),
'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
@@ -50,4 +50,4 @@ get_header(); ?>
</main><!-- .site-main -->
</section><!-- .content-area -->
<?php get_footer(); ?>
<?php get_footer(); ?>

View File

@@ -30,8 +30,12 @@ get_header(); ?>
// Previous/next post navigation.
the_post_navigation( array(
'next_text' => _x( '<span class="meta-nav">Next <span class="screen-reader-text">post: </span></span><span class="post-title">%title</span>', 'Next post link', 'twentyfifteen' ),
'prev_text' => _x( '<span class="meta-nav">Previous <span class="screen-reader-text">post: </span></span><span class="post-title">%title</span>', 'Previous post link', 'twentyfifteen' )
'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentyfifteen' ) . '</span> ' .
'<span class="screen-reader-text">' . __( 'Next post:', 'twentyfifteen' ) . '</span> ' .
'<span class="post-title">%title</span>',
'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentyfifteen' ) . '</span> ' .
'<span class="screen-reader-text">' . __( 'Previous post:', 'twentyfifteen' ) . '</span> ' .
'<span class="post-title">%title</span>',
) );
// End the loop.

View File

@@ -558,6 +558,7 @@ input[type="search"] {
-webkit-appearance: textfield;
}
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
@@ -621,6 +622,11 @@ input[type="radio"] {
padding: 0;
}
.search-form input[type="submit"],
.widget .search-form input[type="submit"] {
padding: 0;
}
/**
* 6.0 Navigations
@@ -768,9 +774,8 @@ a:focus {
}
.social-navigation a:before {
content: "\f446";
content: "\f415";
font-size: 24px;
opacity: 0.3;
position: absolute;
top: 0;
left: 0;
@@ -778,128 +783,103 @@ a:focus {
.social-navigation a[href$="/feed/"]:before {
content: "\f413";
opacity: 1;
}
.social-navigation a[href*="codepen.io"]:before {
content: "\f216";
opacity: 1;
}
.social-navigation a[href*="digg.com"]:before {
content: "\f221";
opacity: 1;
}
.social-navigation a[href*="dribbble.com"]:before {
content: "\f201";
opacity: 1;
}
.social-navigation a[href*="dropbox.com"]:before {
content: "\f225";
opacity: 1;
}
.social-navigation a[href*="facebook.com"]:before {
content: "\f203";
opacity: 1;
}
.social-navigation a[href*="flickr.com"]:before {
content: "\f211";
opacity: 1;
}
.social-navigation a[href*="foursquare.com"]:before {
content: "\f226";
opacity: 1;
}
.social-navigation a[href*="plus.google.com"]:before {
content: "\f206";
opacity: 1;
}
.social-navigation a[href*="github.com"]:before {
content: "\f200";
opacity: 1;
}
.social-navigation a[href*="instagram.com"]:before {
content: "\f215";
opacity: 1;
}
.social-navigation a[href*="linkedin.com"]:before {
content: "\f208";
opacity: 1;
}
.social-navigation a[href*="pinterest.com"]:before {
content: "\f210";
opacity: 1;
}
.social-navigation a[href*="getpocket.com"]:before {
content: "\f224";
opacity: 1;
}
.social-navigation a[href*="polldaddy.com"]:before {
content: "\f217";
opacity: 1;
}
.social-navigation a[href*="reddit.com"]:before {
content: "\f222";
opacity: 1;
}
.social-navigation a[href*="stumbleupon.com"]:before {
content: "\f223";
opacity: 1;
}
.social-navigation a[href*="tumblr.com"]:before {
content: "\f214";
opacity: 1;
}
.social-navigation a[href*="twitter.com"]:before {
content: "\f202";
opacity: 1;
}
.social-navigation a[href*="vimeo.com"]:before {
content: "\f212";
opacity: 1;
}
.social-navigation a[href*="wordpress.com"]:before,
.social-navigation a[href*="wordpress.org"]:before {
content: "\f205";
opacity: 1;
}
.social-navigation a[href*="youtube.com"]:before {
content: "\f213";
opacity: 1;
}
.social-navigation a[href*="mailto:"]:before {
content: "\f410";
opacity: 1;
}
.social-navigation a[href*="spotify.com"]:before {
content: "\f515";
opacity: 1;
}
.social-navigation a[href*="twitch.tv"]:before {
content: "\f516";
opacity: 1;
}
.secondary-toggle {
@@ -922,10 +902,8 @@ a:focus {
.secondary-toggle:before {
color: #333;
content: "\f419";
line-height: 42px;
position: relative;
top: -1px;
left: 0;
line-height: 40px;
width: 40px;
}
.secondary-toggle:hover,
@@ -939,7 +917,8 @@ a:focus {
.secondary-toggle.toggled-on:before {
content: "\f405";
font-size: 32px;
top: 0;
position: relative;
top: 1px;
left: -1px;
}
@@ -1862,6 +1841,7 @@ a.post-thumbnail:focus {
}
.entry-footer a {
border-bottom: 1px solid transparent;
color: #707070;
color: rgba(51, 51, 51, 0.7);
}
@@ -2349,8 +2329,8 @@ a.post-thumbnail:focus {
.no-comments {
border-top: 1px solid #eaeaea;
border-top: 1px solid rgba(51, 51, 51, 0.1);
color: rgba(51, 51, 51, 0.7);
color: #707070;
color: rgba(51, 51, 51, 0.7);
font-family: "Noto Sans", sans-serif;
font-weight: 700;
padding-top: 1.6em;
@@ -2902,7 +2882,8 @@ p > video {
}
.secondary-toggle:before {
line-height: 56px;
line-height: 54px;
width: 54px;
}
.post-password-form label,
@@ -3494,7 +3475,8 @@ p > video {
}
.secondary-toggle:before {
line-height: 64px;
line-height: 62px;
width: 62px;
}
.post-password-form label,
@@ -5746,4 +5728,4 @@ p > video {
margin-top: 7.6923%;
padding: 3.84615% 0;
}
}
}

View File

@@ -234,10 +234,10 @@ function twentyfourteen_scripts() {
wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.0.3' );
// Load our main stylesheet.
wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri(), array( 'genericons' ) );
wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri() );
// Load the Internet Explorer specific stylesheet.
wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style', 'genericons' ), '20131205' );
wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20131205' );
wp_style_add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {

View File

@@ -2,9 +2,9 @@
# This file is distributed under the GNU General Public License v2 or later.
msgid ""
msgstr ""
"Project-Id-Version: Twenty Fourteen 1.2\n"
"Project-Id-Version: Twenty Fourteen 1.3\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyfourteen\n"
"POT-Creation-Date: 2014-09-03 00:45:47+00:00\n"
"POT-Creation-Date: 2014-12-18 16:59:51+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -108,15 +108,16 @@ msgstr ""
msgid "Edit"
msgstr ""
#: content-aside.php:46 content-audio.php:46 content-gallery.php:46
#: content-image.php:46 content-link.php:46 content-quote.php:46
#: content-video.php:46 content.php:54 inc/widgets.php:127 inc/widgets.php:172
msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
#. translators: %s: Name of current post
#: content-aside.php:48 content-audio.php:48 content-gallery.php:48
#: content-image.php:48 content-link.php:48 content-quote.php:48
#: content-video.php:48 content.php:56 inc/template-tags.php:219
msgid "Continue reading %s <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: content-aside.php:48 content-audio.php:48 content-gallery.php:48
#: content-image.php:48 content-link.php:48 content-page.php:22
#: content-quote.php:48 content-video.php:48 content.php:56 image.php:54
#: content-aside.php:53 content-audio.php:53 content-gallery.php:53
#: content-image.php:53 content-link.php:53 content-page.php:22
#: content-quote.php:53 content-video.php:53 content.php:61 image.php:54
msgid "Pages:"
msgstr ""
@@ -141,7 +142,7 @@ msgid ""
"searching can help."
msgstr ""
#. #-#-#-#-# twentyfourteen.pot (Twenty Fourteen 1.2) #-#-#-#-#
#. #-#-#-#-# twentyfourteen.pot (Twenty Fourteen 1.3) #-#-#-#-#
#. Author URI of the plugin/theme
#: footer.php:21
msgid "http://wordpress.org/"
@@ -188,21 +189,21 @@ msgctxt "Lato font: on or off"
msgid "on"
msgstr ""
#: functions.php:254
#: functions.php:258
msgid "Previous"
msgstr ""
#: functions.php:255
#: functions.php:259
msgid "Next"
msgstr ""
#: functions.php:372
#: functions.php:376
msgid "%d Article"
msgid_plural "%d Articles"
msgstr[0] ""
msgstr[1] ""
#: functions.php:491
#: functions.php:495
msgid "Page %s"
msgstr ""
@@ -232,53 +233,57 @@ msgid ""
"version %s. Please upgrade and try again."
msgstr ""
#: inc/customizer.php:19 inc/customizer.php:20
msgid "Background may only be visible on wide screens."
msgstr ""
#: inc/customizer.php:28
#: inc/customizer.php:24
msgid "Site Title Color"
msgstr ""
#: inc/customizer.php:31
#: inc/customizer.php:27
msgid "Display Site Title &amp; Tagline"
msgstr ""
#: inc/customizer.php:35 inc/featured-content.php:405
#: inc/customizer.php:31 inc/customizer.php:32
msgid "May only be visible on wide screens."
msgstr ""
#: inc/customizer.php:34 inc/customizer.php:35
msgid "Background may only be visible on wide screens."
msgstr ""
#: inc/customizer.php:40 inc/featured-content.php:403
msgid "Featured Content"
msgstr ""
#: inc/customizer.php:36 inc/featured-content.php:406
#: inc/customizer.php:41 inc/featured-content.php:404
msgid ""
"Use a <a href=\"%1$s\">tag</a> to feature your posts. If no posts match the "
"tag, <a href=\"%2$s\">sticky posts</a> will be displayed instead."
msgstr ""
#: inc/customizer.php:37 inc/customizer.php:102 inc/featured-content.php:407
#: inc/featured-content.php:416 inc/featured-content.php:476
#: inc/customizer.php:42 inc/customizer.php:108 inc/featured-content.php:405
#: inc/featured-content.php:414 inc/featured-content.php:474
msgctxt "featured content default tag slug"
msgid "featured"
msgstr ""
#: inc/customizer.php:50
#: inc/customizer.php:56
msgid "Layout"
msgstr ""
#: inc/customizer.php:54
#: inc/customizer.php:60
msgid "Grid"
msgstr ""
#: inc/customizer.php:55
#: inc/customizer.php:61
msgid "Slider"
msgstr ""
#. #-#-#-#-# twentyfourteen.pot (Twenty Fourteen 1.2) #-#-#-#-#
#. #-#-#-#-# twentyfourteen.pot (Twenty Fourteen 1.3) #-#-#-#-#
#. Theme Name of the plugin/theme
#: inc/customizer.php:99
#: inc/customizer.php:105
msgid "Twenty Fourteen"
msgstr ""
#: inc/customizer.php:102
#: inc/customizer.php:108
msgid ""
"The home page features your choice of up to 6 posts prominently displayed in "
"a grid or slider, controlled by a <a href=\"%1$s\">tag</a>; you can change "
@@ -287,7 +292,7 @@ msgid ""
"instead."
msgstr ""
#: inc/customizer.php:103
#: inc/customizer.php:109
msgid ""
"Enhance your site design by using <a href=\"%s\">Featured Images</a> for "
"posts you&rsquo;d like to stand out (also known as post thumbnails). This "
@@ -296,17 +301,17 @@ msgid ""
"title&mdash;and in the Featured Content area on the home page."
msgstr ""
#: inc/customizer.php:104
#: inc/customizer.php:110
msgid ""
"For an in-depth tutorial, and more tips and tricks, visit the <a href=\"%s"
"\">Twenty Fourteen documentation</a>."
msgstr ""
#: inc/featured-content.php:428
#: inc/featured-content.php:426
msgid "Tag Name"
msgstr ""
#: inc/featured-content.php:433
#: inc/featured-content.php:431
msgid "Don&rsquo;t display tag on front end."
msgstr ""
@@ -408,6 +413,10 @@ msgstr ""
msgid "More asides"
msgstr ""
#: inc/widgets.php:127 inc/widgets.php:172
msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: inc/widgets.php:162
msgid "This gallery contains <a href=\"%1$s\" rel=\"bookmark\">%2$s photo</a>."
msgid_plural ""

View File

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.org/themes/twentyfourteen
Author: the WordPress team
Author URI: http://wordpress.org/
Description: In 2014, our default theme lets you create a responsive magazine website with a sleek, modern design. Feature your favorite homepage content in either a grid or a slider. Use the three widget areas to customize your website, and change your content's layout with a full-width page template and a contributor page to show off your authors. Creating a magazine website with WordPress has never been easier.
Version: 1.2
Version: 1.3
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: black, green, white, light, dark, two-columns, three-columns, left-sidebar, right-sidebar, fixed-layout, responsive-layout, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, accessibility-ready

View File

@@ -2,9 +2,9 @@
# This file is distributed under the GNU General Public License v2 or later.
msgid ""
msgstr ""
"Project-Id-Version: Twenty Ten 1.7\n"
"Project-Id-Version: Twenty Ten 1.8\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyten\n"
"POT-Creation-Date: 2014-09-03 00:45:44+00:00\n"
"POT-Creation-Date: 2014-12-18 16:59:47+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -83,7 +83,7 @@ msgstr ""
msgid "Comments are closed."
msgstr ""
#. #-#-#-#-# twentyten.pot (Twenty Ten 1.7) #-#-#-#-#
#. #-#-#-#-# twentyten.pot (Twenty Ten 1.8) #-#-#-#-#
#. Author URI of the plugin/theme
#: footer.php:40
msgid "http://wordpress.org/"
@@ -145,88 +145,88 @@ msgstr ""
msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: functions.php:373
#: functions.php:376
msgid "%s <span class=\"says\">says:</span>"
msgstr ""
#: functions.php:376
#: functions.php:379
msgid "Your comment is awaiting moderation."
msgstr ""
#. translators: 1: date, 2: time
#: functions.php:383
#: functions.php:386
msgid "%1$s at %2$s"
msgstr ""
#: functions.php:383 functions.php:400
#: functions.php:386 functions.php:403
msgid "(Edit)"
msgstr ""
#: functions.php:400
#: functions.php:403
msgid "Pingback:"
msgstr ""
#: functions.php:420
#: functions.php:423
msgid "Primary Widget Area"
msgstr ""
#: functions.php:422
#: functions.php:425
msgid "Add widgets here to appear in your sidebar."
msgstr ""
#: functions.php:431
#: functions.php:434
msgid "Secondary Widget Area"
msgstr ""
#: functions.php:433
#: functions.php:436
msgid ""
"An optional secondary widget area, displays below the primary widget area in "
"your sidebar."
msgstr ""
#: functions.php:442
#: functions.php:445
msgid "First Footer Widget Area"
msgstr ""
#: functions.php:444 functions.php:455 functions.php:466 functions.php:477
#: functions.php:447 functions.php:458 functions.php:469 functions.php:480
msgid "An optional widget area for your site footer."
msgstr ""
#: functions.php:453
#: functions.php:456
msgid "Second Footer Widget Area"
msgstr ""
#: functions.php:464
#: functions.php:467
msgid "Third Footer Widget Area"
msgstr ""
#: functions.php:475
#: functions.php:478
msgid "Fourth Footer Widget Area"
msgstr ""
#: functions.php:511
#: functions.php:514
msgid ""
"<span class=\"%1$s\">Posted on</span> %2$s <span class=\"meta-sep\">by</"
"span> %3$s"
msgstr ""
#: functions.php:520 loop-attachment.php:36
#: functions.php:523 loop-attachment.php:36
msgid "View all posts by %s"
msgstr ""
#: functions.php:537
#: functions.php:540
msgid ""
"This entry was posted in %1$s and tagged %2$s. Bookmark the <a href=\"%3$s\" "
"title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
#: functions.php:539
#: functions.php:542
msgid ""
"This entry was posted in %1$s. Bookmark the <a href=\"%3$s\" title="
"\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
#: functions.php:541
#: functions.php:544
msgid ""
"Bookmark the <a href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark"
"\">permalink</a>."

View File

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.org/themes/twentyten
Description: The 2010 theme for WordPress is stylish, customizable, simple, and readable -- make it yours with a custom menu, header image, and background. Twenty Ten supports six widgetized areas (two in the sidebar, four in the footer) and featured images (thumbnails for gallery posts and custom header images for posts and pages). It includes stylesheets for print and the admin Visual Editor, special styles for posts in the "Asides" and "Gallery" categories, and has an optional one-column page template that removes the sidebar.
Author: the WordPress team
Author URI: http://wordpress.org/
Version: 1.7
Version: 1.8
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: black, blue, white, two-columns, fixed-layout, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu, flexible-header

Some files were not shown because too many files have changed in this diff Show More