Skip to content

Commit

Permalink
2.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
webmandesign committed May 15, 2019
1 parent 1dafef4 commit d60dcb9
Show file tree
Hide file tree
Showing 15 changed files with 115 additions and 30 deletions.
8 changes: 8 additions & 0 deletions assets/images/svg/social-icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
# Modern Changelog

## 2.4.1

* **Add**: Adding WhatsApp and Google social icon
* **Update**: Implementing WordPress 5.2 code updates
* **Fix**: Preventing PHP error after theme activation

### Files changed:

changelog.md
header.php
readme.txt
style.css
assets/images/svg/social-icons.svg
includes/frontend/class-header.php
includes/frontend/class-menu.php
includes/welcome/welcome.php
template-parts/admin/notice-welcome.php
template-parts/admin/welcome-demo.php
template-parts/admin/welcome-footer.php
template-parts/admin/welcome-header.php
template-parts/admin/welcome-promo.php
template-parts/admin/welcome-quickstart.php
template-parts/admin/welcome-wordpress.php


## 2.4.0

* **Update**: Navigation accessibility and touch screen functionality
Expand Down
8 changes: 7 additions & 1 deletion header.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 1.0.0
* @version 2.4.0
* @version 2.4.1
*/


Expand Down Expand Up @@ -40,6 +40,12 @@

<?php

if ( function_exists( 'wp_body_open' ) ) {
wp_body_open();
} else {
do_action( 'wp_body_open' );
}

do_action( 'tha_body_top' );

if ( ! apply_filters( 'wmhook_modern_disable_header', false ) ) {
Expand Down
10 changes: 2 additions & 8 deletions includes/frontend/class-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.4.0
* @version 2.4.1
*
* Contents:
*
Expand Down Expand Up @@ -328,7 +328,7 @@ public static function site_branding() {
* HTML Body classes
*
* @since 1.0.0
* @version 2.2.0
* @version 2.4.1
*
* @param array $classes
*/
Expand Down Expand Up @@ -380,12 +380,6 @@ public static function body_class( $classes = array() ) {

$post_id = get_the_ID();

// Privacy Policy page

if ( (int) get_option( 'wp_page_for_privacy_policy' ) === $post_id ) {
$classes[] = 'page-privacy-policy';
}

// Has featured image?
if ( has_post_thumbnail() ) {
Expand Down
8 changes: 5 additions & 3 deletions includes/frontend/class-menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.4.0
* @version 2.4.1
*
* Contents:
*
Expand Down Expand Up @@ -417,7 +417,7 @@ public static function get_menu_args_social( $items_wrap = '<ul data-id="%1$s" c
* Social links supported icons
*
* @since 2.0.0
* @version 2.2.3
* @version 2.4.1
*/
public static function social_links_icons() {

Expand All @@ -435,7 +435,8 @@ public static function social_links_icons() {
'facebook.com' => 'facebook',
'flickr.com' => 'flickr',
'foursquare.com' => 'foursquare',
'plus.google.com' => 'google-plus',
'plus.google.' => 'google-plus',
'google.' => 'google',
'github.com' => 'github',
'instagram.com' => 'instagram',
'linkedin.com' => 'linkedin',
Expand Down Expand Up @@ -465,6 +466,7 @@ public static function social_links_icons() {
'vimeo.com' => 'vimeo',
'vine.co' => 'vine',
'vk.com' => 'vk',
'wa.me' => 'whatsapp',
'wordpress.org' => 'wordpress',
'wordpress.com' => 'wordpress',
'xing.com' => 'xing',
Expand Down
5 changes: 3 additions & 2 deletions includes/welcome/welcome.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.2.0
* @version 2.4.1
*
* Contents:
*
Expand All @@ -24,7 +24,8 @@

if (
! is_admin()
|| ! Modern_Library_Customize::get_theme_mod( 'admin_welcome_page' )
// Modern_Library_Customize::get_theme_mod() does not work here yet.
|| ! get_theme_mod( 'admin_welcome_page', true )
) {
return;
}
Expand Down
8 changes: 4 additions & 4 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Contributors: webmandesign
Tags: one-column, two-columns, right-sidebar, grid-layout, flexible-header, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-image-header, featured-images, footer-widgets, full-width-template, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, blog, portfolio
Requires at least: 4.7.0
Tested up to: 5.1.1
Stable tag: 2.4.0
Tested up to: 5.2
Stable tag: 2.4.1
License: GNU General Public License v3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -37,8 +37,8 @@ Please see `changelog.md` file.

== Upgrade Notice ==

= 2.4.0 =
Improving accessibility, updating info, improving excerpt display, improving CSS variables functionality, fixing Gallery post format slideshow issue with new WordPress block editor.
= 2.4.1 =
Implementing WordPress 5.2 code updates, adding WhatsApp and Google social icon, preventing PHP error after theme activation.


== Resources ==
Expand Down
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Theme Name: Modern
Theme URI: https://www.webmandesign.eu/portfolio/modern-wordpress-theme/
Author: WebMan Design
Author URI: https://www.webmandesign.eu/
Version: 2.4.0
Version: 2.4.1
Text Domain: modern
Domain Path: /languages
License: GNU General Public License v3
Expand Down
9 changes: 8 additions & 1 deletion template-parts/admin/notice-welcome.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.4.0
* @version 2.4.1
*/





// Requirements check

if ( ! class_exists( 'Modern_Welcome' ) ) {
return;
}


// Helper variables

$theme_name = wp_get_theme( 'modern' )->get( 'Name' );
Expand Down
9 changes: 8 additions & 1 deletion template-parts/admin/welcome-demo.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.0.0
* @version 2.4.1
*/





// Requirements check

if ( ! class_exists( 'Modern_Welcome' ) ) {
return;
}


?>

<div class="wm-notes special">
Expand Down
9 changes: 8 additions & 1 deletion template-parts/admin/welcome-footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.4.0
* @version 2.4.1
*/





// Requirements check

if ( ! class_exists( 'Modern_Welcome' ) ) {
return;
}


?>

</div> <!-- /.welcome-content -->
Expand Down
9 changes: 8 additions & 1 deletion template-parts/admin/welcome-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.4.0
* @version 2.4.1
*/





// Requirements check

if ( ! class_exists( 'Modern_Welcome' ) ) {
return;
}


?>

<div class="wm-notes special">
Expand Down
9 changes: 8 additions & 1 deletion template-parts/admin/welcome-promo.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.4.0
* @version 2.4.1
*/





// Requirements check

if ( ! class_exists( 'Modern_Welcome' ) ) {
return;
}


?>

<div class="welcome-upgrade">
Expand Down
17 changes: 12 additions & 5 deletions template-parts/admin/welcome-quickstart.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.3.0
* @version 2.4.1
*/





// Requirements check

if ( ! class_exists( 'Modern_Welcome' ) ) {
return;
}


// Helper variables

$step = 0;
Expand All @@ -24,9 +31,9 @@

<h2 class="screen-reader-text"><?php esc_html_e( 'Quickstart Guide', 'modern' ); ?></h2>

<div class="feature-section three-col">
<div class="feature-section three-col has-3-columns" style="max-width: none;">

<div class="first-feature col">
<div class="first-feature col column">

<span class="dropcap"><?php echo ++$step; ?></span>

Expand All @@ -46,7 +53,7 @@

</div>

<div class="second-feature col">
<div class="second-feature col column">

<span class="dropcap"><?php echo ++$step; ?></span>

Expand All @@ -72,7 +79,7 @@

</div>

<div class="last-feature col">
<div class="last-feature col column">

<span class="dropcap"><?php echo ++$step; ?></span>

Expand Down
9 changes: 8 additions & 1 deletion template-parts/admin/welcome-wordpress.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
* @version 2.0.0
* @version 2.4.1
*/





// Requirements check

if ( ! class_exists( 'Modern_Welcome' ) ) {
return;
}


?>

<div class="wm-notes special" style="padding: 2em; font-size: inherit;">
Expand Down

0 comments on commit d60dcb9

Please sign in to comment.