Skip to content

Commit

Permalink
Merge pull request #224 from ResponsiveMenu/dev
Browse files Browse the repository at this point in the history
Release 4.2.2
  • Loading branch information
etvarun authored Mar 2, 2023
2 parents f80de1a + 6a7376d commit 7832215
Show file tree
Hide file tree
Showing 12 changed files with 1,989 additions and 1,388 deletions.
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"require": {
"twig/twig": "1.33.0"
},
"autoload": {
"psr-4": {
"ResponsiveMenu\\": "app/"
Expand Down
136 changes: 117 additions & 19 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: expresstech, responsivemenu, imvarunkmr, moha12351, infosatech
Tags: responsive, mega menu, navigation, mobile, hamburger
Requires at least: 3.6
Tested up to: 6.1
Stable tag: 4.2.1
Stable tag: 4.2.2
Requires PHP: 5.6
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -115,6 +115,10 @@ To view our FAQ, please go to [https://responsive.menu/faq/](https://responsive.
7. Main menu

== Changelog ==
= 4.2.2 (2nd Mar 2023) =
* Feature: The option to set multiple columns in the menu container has been added
* Bug: Resolved a conflict with a third-party plugin that was caused by extra space in menu attributes

= 4.2.1 (6th Dec 2022) =
* Bug: Bug: Fixed CSS conflict issues with other plugins
* Bug: Fixed issue with submenu animation
Expand Down
4 changes: 2 additions & 2 deletions responsive-menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin Name: Responsive Menu
Plugin URI: https://expresstech.io
Description: Highly Customisable Responsive Menu Plugin for WordPress
Version: 4.2.1
Version: 4.2.2
Author: ExpressTech
Text Domain: responsive-menu
Author URI: https://responsive.menu
Expand All @@ -16,7 +16,7 @@
* Constant as plugin version.
*/
if ( ! defined( 'RMP_PLUGIN_VERSION' ) ) {
define( 'RMP_PLUGIN_VERSION', '4.2.1' );
define( 'RMP_PLUGIN_VERSION', '4.2.2' );
}

define( 'RESPONSIVE_MENU_URL', plugin_dir_url( __FILE__ ) );
Expand Down
2 changes: 1 addition & 1 deletion v4.0.0/assets/admin/build/css/rmpMain.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion v4.0.0/assets/admin/build/js/rmpMain.js

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions v4.0.0/assets/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,16 @@
padding: 0;
}

@if( $menu_container_columns != '' ) {
.rmp-menu{
display: flex;
flex-wrap: wrap;
> .rmp-menu-item{
width: $menu_container_columns;
}
}
}

// If legacy setting is on then add these settings.
@if( $is_legacy == 'on' and $submenu_item_toggle_position == left) {
.rmp-submenu-depth-1 .rmp-menu-item-link {
Expand Down
6 changes: 6 additions & 0 deletions v4.0.0/inc/classes/class-style-manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,11 @@ public function get_css_for_menu( $menu_id ) {
$menu_item_height = $options['menu_links_height'];
}

$menu_container_columns = '';
if ( ! empty( $options['menu_container_columns'] ) ) {
$menu_container_columns = $options['menu_container_columns'];
}

$menu_item_height_unit = '';
if ( ! empty( $options['menu_links_height_unit'] ) ) {
$menu_item_height_unit = $options['menu_links_height_unit'];
Expand Down Expand Up @@ -1354,6 +1359,7 @@ public function get_css_for_menu( $menu_id ) {
'menu_section_padding_left' => $menu_section_padding_left,

'menu_background_color' => $menu_background_color,
'menu_container_columns' => $menu_container_columns,
'menu_item_height' => $menu_item_height,
'menu_item_height_unit' => $menu_item_height_unit,
'menu_item_line_height' => $menu_item_line_height,
Expand Down
2 changes: 1 addition & 1 deletion v4.0.0/inc/classes/class-walker.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
foreach ( $atts as $key => $value ) {
if ( ! empty( $value ) ) {
$value = ( 'href' === $key ) ? esc_url( $value ) : esc_attr( $value );
$attributes .= sprintf( ' %s = "%s" ', $key, $value );
$attributes .= sprintf( ' %s="%s" ', $key, $value );
}
}

Expand Down
1 change: 1 addition & 0 deletions v4.0.0/inc/helpers/default-options.php
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,7 @@ function rmp_get_default_options() {
'button_title' => '',
'button_title_open' => '',
'button_title_position' => 'left',
'menu_container_columns' => '',
'button_font' => '',
'button_font_size' => '14',
'button_font_size_unit' => 'px',
Expand Down
Loading

0 comments on commit 7832215

Please sign in to comment.