diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/twentyfourteen/functions.php | 14 | ||||
| -rw-r--r-- | themes/twentyfourteen/inc/template-tags.php | 2 | ||||
| -rw-r--r-- | themes/twentyfourteen/readme.txt | 11 | ||||
| -rw-r--r-- | themes/twentyfourteen/rtl.css | 4 | ||||
| -rw-r--r-- | themes/twentyfourteen/style.css | 106 |
5 files changed, 105 insertions, 32 deletions
diff --git a/themes/twentyfourteen/functions.php b/themes/twentyfourteen/functions.php index 74141dc3..b815e77e 100644 --- a/themes/twentyfourteen/functions.php +++ b/themes/twentyfourteen/functions.php @@ -545,3 +545,17 @@ require get_template_directory() . '/inc/customizer.php'; if ( ! class_exists( 'Featured_Content' ) && 'plugins.php' !== $GLOBALS['pagenow'] ) { require get_template_directory() . '/inc/featured-content.php'; } + +/** + * Add an `is_customize_preview` function if it is missing. + * + * Enables installing Twenty Fourteen in WordPress versions before 4.0.0 when the + * `is_customize_preview` function was introduced. + */ +if ( ! function_exists( 'is_customize_preview' ) ) : +function is_customize_preview() { + global $wp_customize; + + return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview(); +} +endif; diff --git a/themes/twentyfourteen/inc/template-tags.php b/themes/twentyfourteen/inc/template-tags.php index f63ee828..1d35d0d5 100644 --- a/themes/twentyfourteen/inc/template-tags.php +++ b/themes/twentyfourteen/inc/template-tags.php @@ -140,7 +140,7 @@ function twentyfourteen_categorized_blog() { set_transient( 'twentyfourteen_category_count', $all_the_cool_cats ); } - if ( 1 !== (int) $all_the_cool_cats ) { + if ( $all_the_cool_cats > 1 || is_preview() ) { // This blog has more than 1 category so twentyfourteen_categorized_blog should return true return true; } else { diff --git a/themes/twentyfourteen/readme.txt b/themes/twentyfourteen/readme.txt index f27dfa4a..20e7d8c0 100644 --- a/themes/twentyfourteen/readme.txt +++ b/themes/twentyfourteen/readme.txt @@ -1,8 +1,8 @@ === Twenty Fourteen === Contributors: the WordPress team Requires at least: WordPress 3.6 -Tested up to: WordPress 4.8-trunk -Stable tag: 1.9 +Tested up to: WordPress 4.9-trunk +Stable tag: 2.0 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: blog, news, two-columns, three-columns, left-sidebar, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, accessibility-ready @@ -22,7 +22,7 @@ For more information about Twenty Fourteen please go to https://codex.wordpress. == Copyright == -Twenty Fourteen WordPress Theme, Copyright 2013-2016 WordPress.org & Automattic.com +Twenty Fourteen WordPress Theme, Copyright 2013-2017 WordPress.org & Automattic.com Twenty Fourteen is Distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify @@ -50,6 +50,11 @@ Source: http://www.genericons.com == Changelog == += 2.0 = +* Released: June 8, 2017 + +https://codex.wordpress.org/Twenty_Fourteen_Theme_Changelog#Version_2.0 + = 1.9 = * Released: December 6, 2016 diff --git a/themes/twentyfourteen/rtl.css b/themes/twentyfourteen/rtl.css index af7f6f46..5ff7312c 100644 --- a/themes/twentyfourteen/rtl.css +++ b/themes/twentyfourteen/rtl.css @@ -335,6 +335,10 @@ td { margin: 0 20px 0 0; } +.widget_text ul, +.widget_text ol { + margin: 0 10px 12px 0; +} /** * 7.2 Content Sidebar Widgets diff --git a/themes/twentyfourteen/style.css b/themes/twentyfourteen/style.css index afa33f61..b0a35544 100644 --- a/themes/twentyfourteen/style.css +++ b/themes/twentyfourteen/style.css @@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentyfourteen/ Author: the WordPress team Author URI: https://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.9 +Version: 2.0 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: blog, news, two-columns, three-columns, left-sidebar, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, accessibility-ready @@ -1347,55 +1347,70 @@ a.post-thumbnail:hover { /* Mediaelements */ -.hentry .mejs-container { +.hentry .mejs-container, +.widget .mejs-container { margin: 12px 0 18px; } .hentry .mejs-mediaelement, -.hentry .mejs-container .mejs-controls { +.widget .mejs-mediaelement, +.hentry .mejs-container .mejs-controls, +.widget .mejs-container .mejs-controls { background: #000; } .hentry .mejs-controls .mejs-time-rail .mejs-time-loaded, -.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current { +.widget .mejs-controls .mejs-time-rail .mejs-time-loaded, +.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current, +.widget .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current { background: #fff; } -.hentry .mejs-controls .mejs-time-rail .mejs-time-current { +.hentry .mejs-controls .mejs-time-rail .mejs-time-current, +.widget .mejs-controls .mejs-time-rail .mejs-time-current { background: #24890d; } .hentry .mejs-controls .mejs-time-rail .mejs-time-total, -.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total { +.widget .mejs-controls .mejs-time-rail .mejs-time-total, +.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total, +.widget .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total { background: rgba(255, 255, 255, .33); } -.hentry .mejs-container .mejs-controls .mejs-time { +.hentry .mejs-container .mejs-controls .mejs-time, +.widget .mejs-container .mejs-controls .mejs-time { padding-top: 9px; } .hentry .mejs-controls .mejs-time-rail span, +.widget .mejs-controls .mejs-time-rail span, .hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total, -.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current { +.widget .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total, +.hentry .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current, +.widget .mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current { border-radius: 0; } -.hentry .mejs-overlay-loading { +.hentry .mejs-overlay-loading, +.widget .mejs-overlay-loading { background: transparent; } -.hentry .mejs-overlay-button { +.hentry .mejs-overlay-button, +.widget .mejs-overlay-button { background-color: #fff; background-image: none; border-radius: 2px; box-shadow: 1px 1px 1px rgba(0,0,0,.8); color: #000; height: 36px; - margin-left: -24px; + margin: -28px 0 0 -24px; /* Keep centered on video (container includes visible controls bar) */ width: 48px; } -.hentry .mejs-overlay-button:before { +.hentry .mejs-overlay-button:before, +.widget .mejs-overlay-button:before { -webkit-font-smoothing: antialiased; content: '\f452'; display: inline-block; @@ -1405,11 +1420,13 @@ a.post-thumbnail:hover { left: 10px; } -.hentry .mejs-controls .mejs-button button:focus { +.hentry .mejs-controls .mejs-button button:focus, +.widget .mejs-controls .mejs-button button:focus { outline: none; } -.hentry .mejs-controls .mejs-button button { +.hentry .mejs-controls .mejs-button button, +.widget .mejs-controls .mejs-button button { -webkit-font-smoothing: antialiased; background: none; color: #fff; @@ -1417,15 +1434,18 @@ a.post-thumbnail:hover { font: normal 16px/1 Genericons; } -.hentry .mejs-playpause-button.mejs-play button:before { +.hentry .mejs-playpause-button.mejs-play button:before, +.widget .mejs-playpause-button.mejs-play button:before { content: '\f452'; } -.hentry .mejs-playpause-button.mejs-pause button:before { +.hentry .mejs-playpause-button.mejs-pause button:before, +.widget .mejs-playpause-button.mejs-pause button:before { content: '\f448'; } -.hentry .mejs-volume-button.mejs-mute button:before { +.hentry .mejs-volume-button.mejs-mute button:before, +.widget .mejs-volume-button.mejs-mute button:before { content: '\f109'; font-size: 20px; position: absolute; @@ -1433,6 +1453,7 @@ a.post-thumbnail:hover { left: 0; } +.widget .mejs-volume-button.mejs-unmute button:before, .hentry .mejs-volume-button.mejs-unmute button:before { content: '\f109'; left: 0; @@ -1440,20 +1461,24 @@ a.post-thumbnail:hover { top: 0; } -.hentry .mejs-fullscreen-button button:before { +.hentry .mejs-fullscreen-button button:before, +.widget .mejs-fullscreen-button button:before { content: '\f474'; } -.hentry .mejs-fullscreen-button.mejs-unfullscreen button:before { +.hentry .mejs-fullscreen-button.mejs-unfullscreen button:before, +.widget .mejs-fullscreen-button.mejs-unfullscreen button:before { content: '\f406'; } -.hentry .mejs-overlay:hover .mejs-overlay-button { +.hentry .mejs-overlay:hover .mejs-overlay-button, +.widget .mejs-overlay:hover .mejs-overlay-button { background-color: #24890d; color: #fff; } -.hentry .mejs-controls .mejs-button button:hover { +.hentry .mejs-controls .mejs-button button:hover, +.widget .mejs-controls .mejs-button button:hover { color: #41a62a; } @@ -2526,7 +2551,8 @@ a.post-thumbnail:hover { .widget_nav_menu li, .widget_pages li, .widget_recent_comments li, -.widget_recent_entries li { +.widget_recent_entries li, +.widget_text li { border-top: 1px solid rgba(255, 255, 255, 0.2); padding: 8px 0 9px; } @@ -2538,7 +2564,8 @@ a.post-thumbnail:hover { .widget_nav_menu li:first-child, .widget_pages li:first-child, .widget_recent_comments li:first-child, -.widget_recent_entries li:first-child { +.widget_recent_entries li:first-child, +.widget_text li { border-top: 0; } @@ -2551,7 +2578,8 @@ a.post-thumbnail:hover { .widget_categories li li:last-child, .widget_nav_menu li li:last-child, -.widget_pages li li:last-child { +.widget_pages li li:last-child, +.widget_text li li:last-child { padding-bottom: 0; } @@ -2589,6 +2617,24 @@ a.post-thumbnail:hover { margin-bottom: 0; } +.widget_text ul, +.widget_text ol { + margin: 0 0 12px 10px; +} + +.widget_text li > ul, +.widget_text li > ol { + margin-bottom: 0; +} + +.widget_text ul { + list-style: disc inside; +} + +.widget_text ol { + list-style: decimal inside; +} + /** * 7.2 Content Sidebar Widgets @@ -2716,7 +2762,8 @@ a.post-thumbnail:hover { .content-sidebar .widget_recent_entries li, .content-sidebar .widget_categories li ul, .content-sidebar .widget_nav_menu li ul, -.content-sidebar .widget_pages li ul { +.content-sidebar .widget_pages li ul, +.content-sidebar .widget_text li ul { border-color: rgba(0, 0, 0, 0.1); } @@ -3973,7 +4020,8 @@ a.post-thumbnail:hover { .primary-sidebar .widget_nav_menu li, .primary-sidebar .widget_pages li, .primary-sidebar .widget_recent_comments li, - .primary-sidebar .widget_recent_entries li { + .primary-sidebar .widget_recent_entries li, + .primary-sidebar .widget_text li { border-top: 0; padding: 0 0 6px; } @@ -3993,7 +4041,8 @@ a.post-thumbnail:hover { .primary-sidebar .widget_nav_menu li:last-child, .primary-sidebar .widget_pages li:last-child, .primary-sidebar .widget_recent_comments li:last-child, - .primary-sidebar .widget_recent_entries li:last-child { + .primary-sidebar .widget_recent_entries li:last-child, + .primary-sidebar .widget_text li:last-child { padding: 0; } @@ -4002,7 +4051,8 @@ a.post-thumbnail:hover { .footer-sidebar .widget_pages li ul, .primary-sidebar .widget_categories li ul, .primary-sidebar .widget_nav_menu li ul, - .primary-sidebar .widget_pages li ul { + .primary-sidebar .widget_pages li ul, + .primary-sidebar .widget_text li ul { border-top: 0; margin-top: 6px; } |