Commit Graph

1730 Commits

Author SHA1 Message Date
Scott Taylor
616680b56b Bump the MediaElement version in script-loader.php to 2.14.1.
See [27861].


Built from https://develop.svn.wordpress.org/trunk@27867


git-svn-id: http://core.svn.wordpress.org/trunk@27698 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-30 22:20:14 +00:00
Dominik Schilling
e5d3d82f74 MediaElement.js: Update version for [27811]. see #27570.
Built from https://develop.svn.wordpress.org/trunk@27817


git-svn-id: http://core.svn.wordpress.org/trunk@27651 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-28 14:11:15 +00:00
Scott Taylor
b1316b9392 Always localize mediaelement when passing settings to the page via JSON. wp-mediaelement only gets triggered for audio and video shortcodes, playlists need the path passed to the page as well, as they don't enqueue wp-mediaelement.
See #27509.


Built from https://develop.svn.wordpress.org/trunk@27734


git-svn-id: http://core.svn.wordpress.org/trunk@27571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-26 12:15:15 +00:00
Scott Taylor
eddc48def7 Don't make mce-view a dependency for media-audiovideo. Make media-audiovideo and wp-playlist dependencies for mce-view and only enqueue mce-view in the admin in wp_enqueue_media(). MCE views don't need to be included when media is loaded on the front end.
Fixes #27509.


Built from https://develop.svn.wordpress.org/trunk@27733


git-svn-id: http://core.svn.wordpress.org/trunk@27570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-26 12:11:14 +00:00
Drew Jaynes
7037289a98 Inline documentation for hooks in wp-includes/script-loader.php.
Fixes #27520.

Built from https://develop.svn.wordpress.org/trunk@27732


git-svn-id: http://core.svn.wordpress.org/trunk@27569 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-26 05:52:15 +00:00
Scott Taylor
615dd5331b Unifying media controls and supporting playlists in the editor:
* Support a `caption` attribute for audio and video shortcodes
* In `wp.media.audio|video`, rename `update` to `shortcode` to allow these models to share the same mixins as `wp.media.collection` subclasses
* When sending an audio or video shortcode to the editor, create a default caption if the user hasn't entered one. This currently only displays in the editor, not on the front end. Captions aren't tied to a specific attachment here because external sources are supported.
* In the `wp.mce.media` mixin, in the `edit` method, read `attr` instead of `data` when attempting to parse the encoded shortcode. `data` does not automatically update when the attribute changes. This was a blessing to debug.
* Add `wp.mce.media.PlaylistView` to support playlist views in TinyMCE
* Expose `WPPlaylistView` to global scope and suppress auto-parsing of playlist nodes when in the admin. Allow `WPPlaylistView` to be passed `metadata` on creation instead of requiring a JSON blob to be parsed.
* Remove all of the playlist logic from the `wpgallery` TinyMCE plugin.
* In `wp_prepare_attachment_for_js()` return more data for audio/video so that playlists can have parity in the admin/front end.

See #27320.


Built from https://develop.svn.wordpress.org/trunk@27640


git-svn-id: http://core.svn.wordpress.org/trunk@27483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-20 13:33:14 +00:00
Andrew Nacin
30fd56b3dc Only enqueue the image editor in the media modal in the admin.
props gcorne.
see #21811.

Built from https://develop.svn.wordpress.org/trunk@27625


git-svn-id: http://core.svn.wordpress.org/trunk@27468 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-19 21:16:14 +00:00
Andrew Nacin
deb8779af5 More translation cleanups.
Affects widgets (see #27112), custom headers (see #21785), theme installer (see #27055, reverts [27614]), and some media stuff. Untranslates some complicated strings that need additional study.

see #27453.

Built from https://develop.svn.wordpress.org/trunk@27620


git-svn-id: http://core.svn.wordpress.org/trunk@27463 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-19 08:18:14 +00:00
Scott Taylor
7ad4205f70 Add MCE views for audio and video shortcodes. When the shortcode does not contain a source that supports native playback, just show the filename.
* Remove the audio/video shortcode parsing from the `wpgallery` plugin.
* Make `mce-view` a dependency of `media-audiovideo`
* Introduce `wp.mce.video`, `wp.mce.audio`, `wp.mce.media`, and `wp.mce.media.View`
* Rename `wp.media.audio|video.shortcode()` to `wp.media.audio|video.update()` since it is called on Update and returns a `wp.shortcode` object now.
* In `wp.mce.View.render()`, fire a `ready` event when the placeholder is being parsed and pass the current node to the event handler.

See #27389, #27437.


Built from https://develop.svn.wordpress.org/trunk@27615


git-svn-id: http://core.svn.wordpress.org/trunk@27458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-19 07:02:15 +00:00
Scott Taylor
a17dd704c4 Create a new file, media-audiovideo.js, to house all of the audio and video JS code in core.
UX Changes:
* Don't add a menu item for "Add Audio|Video Source"
* In the Audio|Video Details modal, add buttons and some suggestive text for adding alternate playback sources
* Don't show "Create Audio|Video Playlist" menu items until the user has uploaded audio or video files

See #27437.


Built from https://develop.svn.wordpress.org/trunk@27608


git-svn-id: http://core.svn.wordpress.org/trunk@27451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-19 05:31:15 +00:00
Dominik Schilling
aaf723a8a8 Widget Customizer: Move preview script to wp_default_scripts().
Built from https://develop.svn.wordpress.org/trunk@27585


git-svn-id: http://core.svn.wordpress.org/trunk@27428 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-18 15:31:16 +00:00
Dominik Schilling
f48e3f5719 Widget Customizer: Move style/script registration to script loader. Update Gruntfile.js.
fixes #27356.
Built from https://develop.svn.wordpress.org/trunk@27525


git-svn-id: http://core.svn.wordpress.org/trunk@27368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-13 19:41:14 +00:00
Andrew Nacin
20948e27e8 Revert [27203], restore JIT color scheme stylesheets. Restores [27111].
fixes #27175. see #20729.

Built from https://develop.svn.wordpress.org/trunk@27515


git-svn-id: http://core.svn.wordpress.org/trunk@27358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-12 16:12:15 +00:00
Andrew Nacin
9aca2a65f8 Bring the theme browsing experience from 3.8 to the theme installer. First pass.
props matveb with assists from me and gcorne.
see #27055.

Built from https://develop.svn.wordpress.org/trunk@27499


git-svn-id: http://core.svn.wordpress.org/trunk@27341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-11 07:47:15 +00:00
Andrew Nacin
a589d9d757 Add header image uploads with cropping to the customizer.
props mcsf, ehg, gcorne.
see #21785.

Built from https://develop.svn.wordpress.org/trunk@27497


git-svn-id: http://core.svn.wordpress.org/trunk@27339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-11 04:13:16 +00:00
Andrew Ozz
05e23f7506 wpLink: stop using UI dialog, restyle the modal, add better responsive behaviour.
Fix UI dialog styling to match the rest of the admin styling.
Props avryl, see #26952
Built from https://develop.svn.wordpress.org/trunk@27494


git-svn-id: http://core.svn.wordpress.org/trunk@27336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-11 00:04:14 +00:00
Helen Hou-Sandí
4bb7e03548 At long last, a first pass at bringing the image editor into the media modal. props gcorne, DH-Shredder, tomauger. see #21811.
Built from https://develop.svn.wordpress.org/trunk@27445


git-svn-id: http://core.svn.wordpress.org/trunk@27292 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 22:55:14 +00:00
Scott Taylor
ff8844deae Add TinyMCE placeholders for audio and video shortcodes.
* Add `wp.media.mixin`.
* Add `wp.media.audio` and `wp.media.video`.
* Add `wp.media.model.PostAudio` and `wp.media.model.PostVideo`
* Add `wp.media.controller.AudioDetails` and `wp.media.controller.VideoDetails`.
* Add `wp.media.controller.ReplaceAudio` and `wp.media.controller.ReplaceVideo`.
* Add `wp.media.view.MediaFrame.AudioDetails` and `wp.media.view.MediaFrame.VideoDetails`.
* Add `wp.media.view.AudioDetails` and `wp.media.view.VideoDetails`.
* Update the `wpgallery` TinyMCE plugin.
* Display audio and video players in the media modal when shortcode is clicked.
* Provide a UI to edit shortcode attributes in the media modal.
* Provide a UI to replace the `src` media file in an `audio` or `video` shortcode.

See #27016.


Built from https://develop.svn.wordpress.org/trunk@27411


git-svn-id: http://core.svn.wordpress.org/trunk@27258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-05 15:06:14 +00:00
Andrew Ozz
7121bb490d Restyles the modal for attaching media to posts, take II (also some autoprefixer and imagemin). Props avryl, see #26952.
Built from https://develop.svn.wordpress.org/trunk@27403


git-svn-id: http://core.svn.wordpress.org/trunk@27250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-05 03:54:15 +00:00
Andrew Nacin
3028e6e7fb Add jquery.masonry.min.js. fixes #25351.
Built from https://develop.svn.wordpress.org/trunk@27389


git-svn-id: http://core.svn.wordpress.org/trunk@27237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-04 02:20:14 +00:00
Andrew Ozz
d896fa2487 Upgrade Plupload to 2.1.1, props kovshenin, see #25663
Built from https://develop.svn.wordpress.org/trunk@27316


git-svn-id: http://core.svn.wordpress.org/trunk@27168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-27 20:01:16 +00:00
Andrew Nacin
edb9364df1 Move comment-reply.js to the footer.
While it can function before the page is loaded, it works by moving the comment form, which is usually toward the bottom of the page. Please report any contraindications on the ticket.

props obenland.
fixes #12641.

Built from https://develop.svn.wordpress.org/trunk@27303


git-svn-id: http://core.svn.wordpress.org/trunk@27156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-26 22:27:15 +00:00
Andrew Nacin
13e868ac55 Decrement update count bubbles as plugins/themes are updated, live.
props gcorne, mitchoyoshitaka.
fixes #17703.

Built from https://develop.svn.wordpress.org/trunk@27280


git-svn-id: http://core.svn.wordpress.org/trunk@27136 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-26 06:55:14 +00:00
Andrew Nacin
1cb9788f1b Update the Masonry JavaScript library to version 3.
The new script handle is 'masonry'. The old 'jquery-masonry' handle is the official shiv that sits on top of the v3 library. While v3 no longer depends on jQuery, a theme or plugin may have bee
n implicitly loading jQuery though Masonry, rather than additionally declaring it as a dependency for themselves. Thus, the shiv is separate.

Themes should switch to 'masonry' and declare jQuery as a dependency on their own if they need it. Upgrade guide: http://masonry.desandro.com/appendix.html#upgrading-from-v2. imagesLoaded remai
ns included with Masonry here.

props shelob9.
fixes #25351.

Built from https://develop.svn.wordpress.org/trunk@27271


git-svn-id: http://core.svn.wordpress.org/trunk@27127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-25 19:53:15 +00:00
Scott Taylor
943f295d2e Add core support for Playlists and Video Playlists.
* Playlists operate like galleries in the admin. 
* Provide default UI and JS support in themes using MediaElement and Backbone. 
* The shortcodes are clickable, editable, and configurable using the media modal. 
* Playlists support images for each item, whether or not the current theme supports images for `attachment:audio` and `attachment:video`
* Playlists respond to `$content_width` and resize videos accordingly.
* All playlist data is included inline, using a script tag with `type="application/json"`, allowing anyone to unenqueue the WP playlist JS and roll their own.
* Playlist styles are minimal and work out of the box in the last 5 default themes. They inherit and adapt to the current theme's font styles, and their rules are easily overrideable.

See #26631.


Built from https://develop.svn.wordpress.org/trunk@27239


git-svn-id: http://core.svn.wordpress.org/trunk@27096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-24 18:08:16 +00:00
Dominik Schilling
4dd8be2568 Update Backbone to version 1.1.2.
props gcorne.
fixes #27182.
Built from https://develop.svn.wordpress.org/trunk@27233


git-svn-id: http://core.svn.wordpress.org/trunk@27090 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-22 15:42:14 +00:00
Sergey Biryukov
b1cf2bea46 Revert [27228], as it doesn't work with SCRIPT_DEBUG off.
see #27175.
Built from https://develop.svn.wordpress.org/trunk@27232


git-svn-id: http://core.svn.wordpress.org/trunk@27089 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-22 01:59:15 +00:00
Andrew Nacin
4e78f02a05 Make sure color schemes are registered when WP_Styles is initialized early.
fixes #27175. see #26669.

Built from https://develop.svn.wordpress.org/trunk@27228


git-svn-id: http://core.svn.wordpress.org/trunk@27085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-21 21:09:15 +00:00
Andrew Nacin
495c652e44 Remove accidental change in [27203]. see #20729.
Built from https://develop.svn.wordpress.org/trunk@27204


git-svn-id: http://core.svn.wordpress.org/trunk@27061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-20 07:00:13 +00:00
Andrew Nacin
0c47e9b732 Simplify how admin color schemes are enqueued.
Removes a piece of [27111].

fixes #20729.

Built from https://develop.svn.wordpress.org/trunk@27203


git-svn-id: http://core.svn.wordpress.org/trunk@27060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-20 06:59:13 +00:00
Helen Hou-Sandí
060cc19157 Make login styles standalone. see #12506.
Built from https://develop.svn.wordpress.org/trunk@27199


git-svn-id: http://core.svn.wordpress.org/trunk@27056 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-20 03:24:14 +00:00
Andrew Nacin
53c2618e7e Rename the old media.css file, used for the pre-3.5 media library. Clean up script-loader CSS registrations.
see #26669.

Built from https://develop.svn.wordpress.org/trunk@27181


git-svn-id: http://core.svn.wordpress.org/trunk@27042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-16 00:36:14 +00:00
Andrew Nacin
07adb0640f Update Backbone from 1.0 to 1.1.
Also update Underscore to 1.6. Includes the development versions of both, which are not included in the build.

Here is Backbone's changelog:
 * Made the return values of Collection’s `set`, `add`, `remove`, and `reset` more useful. Instead of returning `this`, they now return the changed (added, removed or updated) model or list of 
models. (This means they can no longer be chained.)
 * Backbone Views no longer automatically attach options passed to the constructor as `this.options` and Backbone Models no longer attach `url` and `urlRoot` options, but you can do it yourself if you prefer. (But if you extend `wp.Backbone.View`, options will be attached for you.)
 * All `"invalid"` events now pass consistent arguments. First the model in question, then the error object, then options.
 * You are no longer permitted to change the id of your model during `parse`. Use `idAttribute` instead.
 * On the other hand, `parse` is now an excellent place to extract and vivify incoming nested JSON into associated submodels.

See [27171] (next commit) for changes made to WordPress to be compatible with Backbone 1.1.

props gcorne, georgestephanis.
see #26799.

Built from https://develop.svn.wordpress.org/trunk@27170


git-svn-id: http://core.svn.wordpress.org/trunk@27035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-13 07:34:13 +00:00
Andrew Nacin
12a64b39db Fix the conditional enqueueing/printing of colors stylesheets, without breaking dependencies.
fixes #18380.
see #20729 which should properly fix this.

Built from https://develop.svn.wordpress.org/trunk@27111


git-svn-id: http://core.svn.wordpress.org/trunk@26978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-06 22:16:11 +00:00
Helen Hou-Sandí
0100dd772a Merge colors.css into wp-admin.css. Non-default color schemes became overloads rather than swaps in the 3.8 redesign. Benefits include:
* No more border-width, border-style, border-color insanity.
* Point releases are much less likely to require extra finagling to avoid rebuilding the color schemes.
* Yours truly has a better overall vision of ~14,000 lines of admin CSS and where we go from here.

1,065 net lines of red, y'all.
props helen, jorbin. fixes #18380.

Built from https://develop.svn.wordpress.org/trunk@27106


git-svn-id: http://core.svn.wordpress.org/trunk@26973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-06 06:25:18 +00:00
Andrew Ozz
864ab9ae56 Autosave:
- Move the 'Saving post' and 'Draft saved at...' strings from autosaveL10n to postL10n as they are used only there.
- Use the custom jQuery events 'before-autosave' and 'after-autosave' to show these messages.
- Separate autosave.suspend() for local and server so local autosaves can continue while server autosaves are suspended.
- Remove the recently added autosave.server.disable() and use autosave.server.suspend() instead.
- Bring back .button.disabled, button-primary.disabled and use .disabled to prevent multiple form submissions.
See #25272.

Built from https://develop.svn.wordpress.org/trunk@27038


git-svn-id: http://core.svn.wordpress.org/trunk@26914 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-27 00:28:13 +00:00
Dominik Schilling
2d9bf68585 Update to jQuery UI 1.10.4. fixes #26884.
Built from https://develop.svn.wordpress.org/trunk@27028


git-svn-id: http://core.svn.wordpress.org/trunk@26904 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-24 17:44:12 +00:00
Dominik Schilling
91f7d8e1b7 Update to jQuery 1.11.0. fixes #26926.
Built from https://develop.svn.wordpress.org/trunk@27027


git-svn-id: http://core.svn.wordpress.org/trunk@26903 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-24 17:40:13 +00:00
Andrew Ozz
855889f7aa TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876


git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 23:53:15 +00:00
Drew Jaynes
cd8cedc40d First there were two, and now there are three -- in the @since versions that came before and that shall be. And so it will be, says nacin.
Props JustinSainton, SergeyBiryukov, DrewAPicture.
Fixes #26713.

Built from https://develop.svn.wordpress.org/trunk@26868


git-svn-id: http://core.svn.wordpress.org/trunk@26754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-24 18:57:12 +00:00
Andrew Nacin
5b5a31e78e About page: Don't load zxcvbn, which is a dependency of an unused piece of user-profile.js.
Built from https://develop.svn.wordpress.org/trunk@26799


git-svn-id: http://core.svn.wordpress.org/trunk@26686 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-08 07:28:10 +00:00
Andrew Nacin
04a39763db Tell the script loader that colors-fresh should be treated as an RTL style, as explained (but omitted) in [26780]. see #26316.
Built from https://develop.svn.wordpress.org/trunk@26781


git-svn-id: http://core.svn.wordpress.org/trunk@26668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-07 09:08:11 +00:00
Andrew Nacin
aa1ac65bfc Admin color schemes: Manually handle RTL and minified versions of the CSS files on registration.
This bypasses WP_Styles entirely, which is much simpler for the moment, given that color schemes bypass WP_Styles for plenty already. The script loader is told to stop thinking of colors.css as an RTL-ified file. The colors-fresh handle, used directly on the login screen, needed to be (even before this commit).

fixes #26316.

Built from https://develop.svn.wordpress.org/trunk@26780


git-svn-id: http://core.svn.wordpress.org/trunk@26667 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-07 09:05:10 +00:00
Andrew Nacin
c09252b950 Core updates for the new color schemes.
* Update about page, there's now 8.
 * Display them four wide, not three, and ensure adequate spacing.
 * Use a dedicated nonce.
 * Push Light to the front in addition to Default.
 * Use user-profile.js on about.php. A few extra things are initialized but they are harmless.

see #26468, #26387.

Built from https://develop.svn.wordpress.org/trunk@26776


git-svn-id: http://core.svn.wordpress.org/trunk@26663 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-07 07:46:21 +00:00
Andrew Nacin
0617feaa30 Final SVG painter fixes.
* wp.svgPainter and now moved to wp-admin.
 * Restore !important background-image handling.
 * Delay executing the IE9-specific base64 code if we don't need it.
 * Make painted icons lose their color after hover at the same speed as dashicons (100ms).

props azaozz.
fixes #26333.

Built from https://develop.svn.wordpress.org/trunk@26693


git-svn-id: http://core.svn.wordpress.org/trunk@26583 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-05 22:01:10 +00:00
Andrew Nacin
acd61af260 Add Open Sans as a dependency to install.css and add Dashicons as a dependency to some other CSS files. see #26255.
Built from https://develop.svn.wordpress.org/trunk@26605


git-svn-id: http://core.svn.wordpress.org/trunk@26495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-04 11:19:10 +00:00
Andrew Ozz
e6dd5fbf48 Svg-painter:
- Clean up the JS, better names, etc.
- Convert the base64 encode/decode code from jQuery plugin to local use.
- Add missing icon colors for the default theme.
- Make it more error-proof.
Fixes #26333.
Built from https://develop.svn.wordpress.org/trunk@26601


git-svn-id: http://core.svn.wordpress.org/trunk@26491 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-04 04:13:11 +00:00
Andrew Nacin
618406d0e1 Declare dashicons dependency for wp-pointer.css and media-views.css.
props dd32.
see #26255.

Built from https://develop.svn.wordpress.org/trunk@26596


git-svn-id: http://core.svn.wordpress.org/trunk@26486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-04 00:34:10 +00:00
Andrew Nacin
dd465838e6 Rename colors-fresh.css to colors.css. fixes #26137.
Built from https://develop.svn.wordpress.org/trunk@26570


git-svn-id: http://core.svn.wordpress.org/trunk@26461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-03 18:16:11 +00:00
Dominik Schilling
cc11eeac5b Themes: Merge theme.css into wp-admin.css. fixes #25966.
Built from https://develop.svn.wordpress.org/trunk@26484


git-svn-id: http://core.svn.wordpress.org/trunk@26381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-30 17:32:10 +00:00