diff --git a/wp-content/themes/twentyfifteen/readme.txt b/wp-content/themes/twentyfifteen/readme.txt index aee7f17345..cd64accda9 100644 --- a/wp-content/themes/twentyfifteen/readme.txt +++ b/wp-content/themes/twentyfifteen/readme.txt @@ -1,16 +1,16 @@ === 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: 4.1 -Tested up to: 4.1 -Stable tag: 4.1 +Requires at least: WordPress 4.1s +Tested up to: WordPress 4.3-trunk +Version: 1.2 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html +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 == Description == Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty Fifteen's simple, straightforward typography is readable on a wide variety of screen sizes, and suitable for multiple languages. We designed it using a mobile-first approach, meaning your content takes center-stage, regardless of whether your visitors arrive by smartphone, tablet, laptop, or desktop computer. -* Responsive Layout +* Mobile-first, Responsive Layout * Custom Colors * Custom Header * Social Links @@ -18,75 +18,48 @@ 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. +For more information about Twenty Fifteen please go to http://codex.wordpress.org/Twenty_Fifteen. + == 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. -3. Click Activate to use your new theme right away. +1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button. +2. Type in Twenty Fifteen in the search form and press the 'Enter' key on your keyboard. +3. Click on the 'Activate' button to use your new theme right away. +4. Go to http://codex.wordpress.org/Twenty_Fifteen for a guide on how to customize this theme. +5. Navigate to Appearance > Customize in your admin panel and customize to taste. -== Frequently Asked Questions == +== Copyright == -= How do I change the color scheme? = +Twenty Fifteen WordPress Theme, Copyright 2014-2015 WordPress.org & Automattic.com +Twenty Fifteen is distributed under the terms of the GNU GPL -You can change the colors of your site easily using Twenty Fifteen. +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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -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. 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. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -= How do I add the Social Links to the sidebar? = +Twenty Fifteen Theme bundles the following third-party resources: -Twenty Fifteen allows you display links to your social media profiles, like Twitter and Facebook, with icons. +HTML5 Shiv v3.7.0, Copyright 2014 Alexander Farkas +Licenses: MIT/GPL2 +Source: https://github.com/aFarkas/html5shiv -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 it's available. +Genericons icon font, Copyright 2013-2015 Automattic.com +License: GNU GPL, Version 2 (or later) +Source: http://www.genericons.com -Available icons: (Linking to any of the following sites will automatically display its icon in your social menu). +== Changelog == -* Codepen -* Digg -* Dribbble -* Dropbox -* Facebook -* Flickr -* Foursquare -* GitHub -* Google+ -* Instagram -* LinkedIn -* Email (mailto: links) -* Pinterest -* Pocket -* PollDaddy -* Reddit -* RSS Feed (URLs with /feed/) -* Spotify -* StumbleUpon -* Tumblr -* Twitch -* Twitter -* Vimeo -* WordPress -* YouTube += 1.2 = +* Released May 6, 2015: http://codex.wordpress.org/Twenty_Fifteen_Theme_Changelog#Version_1.2 -Social networks that aren't currently supported will be indicated by a generic share icon. += 1.1 = +* Released April 23, 2015: http://codex.wordpress.org/Twenty_Fifteen_Theme_Changelog#Version_1.1 -= How do I add a description for my menu link in navigation? = - -Twenty Fifteen sports a menu design that's easy to navigate -- especially when you add menu descriptions. - -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 248px. -3. Featured Images are 825px wide by 510px high. += 1.0 = +* Initial release December 18, 2014 diff --git a/wp-includes/version.php b/wp-includes/version.php index 00b073675f..e0a695350b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32486'; +$wp_version = '4.3-alpha-32487'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.