2.6.3

webmandesign · Sep 15, 2024 · e2c7ea1 · e2c7ea1
1 parent 38d2bea
commit e2c7ea1
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 53 deletions.
diff --git a/assets/css/main-rtl.css b/assets/css/main-rtl.css
diff --git a/assets/css/main.css b/assets/css/main.css
diff --git a/assets/scss/_css-vars.scss b/assets/scss/_css-vars.scss
@@ -7,41 +7,60 @@
 // @copyright  WebMan Design, Oliver Juhas
 //
 // @since    2.3.0
-// @version  2.4.3
+// @version  2.6.3
 //
 
 :root {
 
-	@each $option, $value in $customize_options {
-		// Converting values to string to prevent issues.
-		--#{$option}: #{$value+''};
-	}
-
-	// RGBA colors:
-	// @see  Modern_Customize::rgba_alphas()
-
-		$customize_options_rgba: (
-			'color_header_text',
-			'color_content_text',
-			'color_footer_text',
-		);
-		@each $option_rgba in $customize_options_rgba {
-			// As all of the RGBA options use the same alpha value,
-			// we just set it here directly (the `20`).
-			$value: rgba( map_get( $customize_options, $option_rgba ), 20 / 100 );
+	// Theme options.
+
+		@each $option, $value in $customize_options {
 			// Converting values to string to prevent issues.
-			--#{$option_rgba}--a20: #{$value+''};
+			--#{$option}: #{$value+''};
 		}
 
-		$customize_options_rgba: (
-			'color_accent',
-		);
-		@each $option_rgba in $customize_options_rgba {
-			// As all of the RGBA options use the same alpha value,
-			// we just set it here directly (the `20`).
-			$value: rgba( map_get( $customize_options, $option_rgba ), 0 );
-			// Converting values to string to prevent issues.
-			--#{$option_rgba}--a0: #{$value+''};
+		// RGBA colors:
+		// @see  Modern_Customize::rgba_alphas()
+
+			$customize_options_rgba: (
+				'color_header_text',
+				'color_content_text',
+				'color_footer_text',
+			);
+			@each $option_rgba in $customize_options_rgba {
+				// As all of the RGBA options use the same alpha value,
+				// we just set it here directly (the `20`).
+				$value: rgba( map_get( $customize_options, $option_rgba ), 20 / 100 );
+				// Converting values to string to prevent issues.
+				--#{$option_rgba}--a20: #{$value+''};
+			}
+
+			$customize_options_rgba: (
+				'color_accent',
+			);
+			@each $option_rgba in $customize_options_rgba {
+				// As all of the RGBA options use the same alpha value,
+				// we just set it here directly (the `20`).
+				$value: rgba( map_get( $customize_options, $option_rgba ), 0 );
+				// Converting values to string to prevent issues.
+				--#{$option_rgba}--a0: #{$value+''};
+			}
+
+	// White spaces.
+
+		--gap_elements: 0;
+		// Touch enabled devices.
+		@media (hover: none) {
+			--gap_elements: 10px;
 		}
 
+		--navigation_button_toggle_spacing: var(--gap_elements);
+
+	// Widths & heights.
+
+		--button_toggle_sub_menu_size: 10px;
+		// Touch enabled devices.
+		@media (hover: none) {
+			--button_toggle_sub_menu_size: 24px;
+		}
 }
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
@@ -7,7 +7,7 @@
 // @copyright  WebMan Design, Oliver Juhas
 //
 // @since    2.0.0
-// @version  2.6.0
+// @version  2.6.3
 //
 
 $rtl_multiplier: 1; // For `translateX` transform, for example.

diff --git a/assets/scss/main/menu/__menu-primary-expander.scss b/assets/scss/main/menu/__menu-primary-expander.scss
@@ -1,13 +1,5 @@
 /* FILE: main/menu/_menu-primary-expander.scss */
 
-:root {
-	--button_toggle_sub_menu_size: 10px;
-	// Touch enabled devices.
-	@media (hover: none) {
-		--button_toggle_sub_menu_size: 24px;
-	}
-}
-
 .has-navigation-mobile {
 	@include media( ( map_get( $breakpoint, $mobile_menu_breakpoint ), 'max-width' ) ) {
 		--button_toggle_sub_menu_size: 32px;
@@ -21,6 +13,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
+		gap: var(--navigation_button_toggle_spacing);
 
 		> a {
 			padding-#{$right}: $golden_minor + em;

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,20 @@
 # Modern Changelog
 
+## 2.6.3, 20240915
+
+### Updated
+- Improving accessibility
+- Improving and fixing social icons (introducing option to force the icon with `has-icon-#` class)
+
+### File updates
+	changelog.md
+	style.css
+	assets/scss/_css-vars.scss
+	assets/scss/main.scss
+	includes/frontend/class-menu.php
+	includes/starter-content/class-starter-content.php
+
+
 ## 2.6.2, 20240902
 
 ### Updated

diff --git a/includes/frontend/class-menu.php b/includes/frontend/class-menu.php
@@ -6,7 +6,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.6.1
+ * @version  2.6.3
  *
  * Contents:
  *
@@ -421,7 +421,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.6.1
+			 * @version  2.6.3
 			 */
 			public static function social_links_icons() {
 
@@ -474,6 +474,7 @@ public static function social_links_icons() {
 						'wa.me'             => 'whatsapp',
 						'wordpress.org'     => 'wordpress',
 						'wordpress.com'     => 'wordpress',
+						'x.com'          => 'x',
 						'xing.com'          => 'xing',
 						'yelp.com'          => 'yelp',
 						'youtube.com'       => 'youtube',
@@ -489,7 +490,7 @@ public static function social_links_icons() {
 			 * Note that the menu has to be set to output `<!--{{icon}}-->` placeholders!
 			 *
 			 * @since    2.0.0
-			 * @version  2.2.3
+			 * @version  2.6.3
 			 *
 			 * @param  string  $item_output The menu item output.
 			 * @param  WP_Post $item        Menu item object.
@@ -513,10 +514,32 @@ public static function nav_menu_social_icons( $item_output, $item, $depth, $args
 
 				// Processing
 
-					foreach ( $social_icons as $url => $icon ) {
-						if ( false !== strpos( $item_output, $url ) ) {
-							$social_icon = $icon;
-							break;
+					if (
+						! empty( $item->classes )
+						&& false !== stripos( implode( ' ', (array) $item->classes ), 'has-icon-' )
+					) {
+
+						$forced_icon = array_intersect(
+							$social_icons,
+							array_map(
+								function( $item ) {
+									return str_replace( 'has-icon-', '', trim( $item ) );
+								},
+								(array) $item->classes
+							)
+						);
+
+						if ( ! empty( $forced_icon ) ) {
+							$social_icon = reset( $forced_icon );
+						}
+
+					} else {
+
+						foreach ( $social_icons as $url => $icon ) {
+							if ( false !== strpos( $item_output, $url ) ) {
+								$social_icon = $icon;
+								break;
+							}
 						}
 					}
 

diff --git a/includes/starter-content/class-starter-content.php b/includes/starter-content/class-starter-content.php
@@ -8,7 +8,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.6.1
+ * @version  2.6.3
  *
  * Contents:
  *
@@ -202,7 +202,7 @@ public static function options() {
 		 * Navigational menus
 		 *
 		 * @since    2.0.0
-		 * @version  2.6.1
+		 * @version  2.6.3
 		 */
 		public static function nav_menus() {
 
@@ -250,9 +250,9 @@ public static function nav_menus() {
 								'url'   => 'https://www.facebook.com/',
 							),
 
-							'link_twitter' => array(
+							'link_x' => array(
 								'title' => esc_html_x( 'X', 'Theme starter content', 'modern' ),
-								'url'   => 'https://twitter.com/',
+								'url'   => 'https://x.com/',
 							),
 
 							'link_email',

diff --git a/style.css b/style.css
@@ -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.6.2
+Version:      2.6.3
 Text Domain:  modern
 Domain Path:  /languages
 License:      GNU General Public License v3