From 4efd740afa218861142fb17d58fdf71c44fd5c07 Mon Sep 17 00:00:00 2001 From: accgit Date: Fri, 25 Jan 2019 07:18:55 +0100 Subject: [PATCH 1/4] JS moved to an external file. --- js/responsive.menu.js | 30 ++++++++++++++++++++++++++++++ package-lock.json | 2 +- package.json | 2 +- readme.md | 28 +--------------------------- 4 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 js/responsive.menu.js diff --git a/js/responsive.menu.js b/js/responsive.menu.js new file mode 100644 index 0000000..c98b4cb --- /dev/null +++ b/js/responsive.menu.js @@ -0,0 +1,30 @@ + +/* + * Responsive menu. + */ +(function($) { + + // perfect scrollbar + new PerfectScrollbar('.scrollbar'); + + // click show/hide menu + $('.nav .click').on('click', function() { + $('.nav .responsive').toggleClass('expandable'); + }); + + // responsive menu + $('ul.menu li').each(function() { + if ($(this).children('li.parent a.current').length > 0 ) { + $(this).parent().find('ul.submenu').toggle(); + $(this).parent().find('li.parent a.employ').addClass('active'); + } + }); + + // responsive active menu + $('ul.menu li a').on('click', function() { + $(this).parent('li.parent').find('a.employ').toggleClass('active'); + $(this).parent().find('ul.submenu').slideToggle('fast'); + $(this).parent().find('ul.submenu ul.submenu').toggle(); + }); + +}(jQuery)); diff --git a/package-lock.json b/package-lock.json index 4496818..c5b7688 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "css-ui-responsive-menu", - "version": "3.1.3", + "version": "3.1.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 57fc86f..4d5e102 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "css-ui-responsive-menu", - "version": "3.1.3", + "version": "3.1.4", "description": "Simple responsive menu.", "main": "css/style.menu.css", "repository": { diff --git a/readme.md b/readme.md index c953975..55d0983 100644 --- a/readme.md +++ b/readme.md @@ -143,33 +143,7 @@ javascript libraries and plugins. ```html - + ``` Enjoy responsive menu. From 8c33a19ec23381b7f5b49296a70c646b25c41780 Mon Sep 17 00:00:00 2001 From: accgit Date: Fri, 25 Jan 2019 12:04:30 +0100 Subject: [PATCH 2/4] Update --- js/responsive.menu.js | 3 --- package-lock.json | 2 +- package.json | 2 +- readme.md | 5 +++++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/js/responsive.menu.js b/js/responsive.menu.js index c98b4cb..67afa58 100644 --- a/js/responsive.menu.js +++ b/js/responsive.menu.js @@ -4,9 +4,6 @@ */ (function($) { - // perfect scrollbar - new PerfectScrollbar('.scrollbar'); - // click show/hide menu $('.nav .click').on('click', function() { $('.nav .responsive').toggleClass('expandable'); diff --git a/package-lock.json b/package-lock.json index c5b7688..f0d2d3f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "css-ui-responsive-menu", - "version": "3.1.4", + "version": "3.1.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4d5e102..548e255 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "css-ui-responsive-menu", - "version": "3.1.4", + "version": "3.1.5", "description": "Simple responsive menu.", "main": "css/style.menu.css", "repository": { diff --git a/readme.md b/readme.md index 55d0983..4b8ab7b 100644 --- a/readme.md +++ b/readme.md @@ -144,6 +144,11 @@ javascript libraries and plugins. + ``` Enjoy responsive menu. From 14e0efbfb4f199613b91bfb73ace6a3d70c3ab06 Mon Sep 17 00:00:00 2001 From: accgit Date: Fri, 15 Feb 2019 14:01:40 +0100 Subject: [PATCH 3/4] update --- css/style.menu.css | 19 +++++++++++++++++-- css/style.menu.dark.css | 2 +- css/style.menu.light.css | 2 +- js/responsive.menu.js | 13 ++++++++++--- package-lock.json | 2 +- package.json | 2 +- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/css/style.menu.css b/css/style.menu.css index 8a06d53..5306520 100644 --- a/css/style.menu.css +++ b/css/style.menu.css @@ -84,16 +84,31 @@ } .sidebar ul.menu li ul li.parent a.employ:before { - content: "\f106"; float: right; font-family: "FontAwesome"; margin: 0 3px 0 0; } -.sidebar ul.menu li ul li.parent a.employ.active:before { +.sidebar ul.menu li ul li.parent a.employ.up:before { + content: "\f106"; +} + +.sidebar ul.menu li ul li.parent a.employ.down:before { content: "\f107"; } +.sidebar ul.menu li ul li.parent a.employ.transition:before { + transition: .3s all; +} + +.sidebar ul.menu li ul li.parent a.employ.rotate:before { + transform: rotate(-180deg); +} + +.sidebar ul.menu li ul li.parent a.employ.rotate.active:before { + transform: rotate(180deg); +} + /* perfect scrollbar ========================================================================== */ .scrollbar { diff --git a/css/style.menu.dark.css b/css/style.menu.dark.css index 9a2cde1..72bb8ea 100644 --- a/css/style.menu.dark.css +++ b/css/style.menu.dark.css @@ -58,7 +58,7 @@ } .sidebar ul.menu li ul li ul { - border-left: 1px solid #363c49; + border-left: 2px solid #363c49; } /* notice diff --git a/css/style.menu.light.css b/css/style.menu.light.css index e758dfa..4e432da 100644 --- a/css/style.menu.light.css +++ b/css/style.menu.light.css @@ -58,7 +58,7 @@ } .sidebar ul.menu li ul li ul { - border-left: 1px solid #ebebeb; + border-left: 2px solid #ebebeb; } /* notice diff --git a/js/responsive.menu.js b/js/responsive.menu.js index 67afa58..5356e5b 100644 --- a/js/responsive.menu.js +++ b/js/responsive.menu.js @@ -9,19 +9,26 @@ $('.nav .responsive').toggleClass('expandable'); }); - // responsive menu + // init menu $('ul.menu li').each(function() { + $(this).parent().find('li.parent a.employ').addClass('up'); if ($(this).children('li.parent a.current').length > 0 ) { $(this).parent().find('ul.submenu').toggle(); - $(this).parent().find('li.parent a.employ').addClass('active'); + $(this).parent().find('li.parent a.employ').addClass('active down'); } }); - // responsive active menu + // active menu $('ul.menu li a').on('click', function() { $(this).parent('li.parent').find('a.employ').toggleClass('active'); $(this).parent().find('ul.submenu').slideToggle('fast'); $(this).parent().find('ul.submenu ul.submenu').toggle(); }); + // click transition + $('a.employ').on('click', function() { + $(this).addClass('transition'); + $(this).toggleClass('rotate'); + }); + }(jQuery)); diff --git a/package-lock.json b/package-lock.json index f0d2d3f..a67500e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "css-ui-responsive-menu", - "version": "3.1.5", + "version": "3.1.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 548e255..a0c8f8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "css-ui-responsive-menu", - "version": "3.1.5", + "version": "3.1.6", "description": "Simple responsive menu.", "main": "css/style.menu.css", "repository": { From 8def56869059ea7859c88bb132c05ebf166be5e3 Mon Sep 17 00:00:00 2001 From: accgit Date: Fri, 3 May 2019 08:49:28 +0200 Subject: [PATCH 4/4] Fix and update --- css/style.menu.css | 9 +-- css/style.menu.dark.css | 2 +- css/style.menu.light.css | 2 +- js/responsive.menu.js | 27 ++++++--- package-lock.json | 6 +- package.json | 2 +- responsive.menu.html | 117 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 146 insertions(+), 19 deletions(-) create mode 100644 responsive.menu.html diff --git a/css/style.menu.css b/css/style.menu.css index 5306520..32632bb 100644 --- a/css/style.menu.css +++ b/css/style.menu.css @@ -52,6 +52,7 @@ font-size: 100%; list-style: none; margin: 0; + overflow: hidden; } .sidebar ul.menu li { @@ -79,7 +80,7 @@ .sidebar ul.menu li ul li ul { display: none; - margin: 15px 10px; + margin: 15px 0 15px 8px; padding-left: 10px; } @@ -102,11 +103,11 @@ } .sidebar ul.menu li ul li.parent a.employ.rotate:before { - transform: rotate(-180deg); + transform: rotate(180deg); } -.sidebar ul.menu li ul li.parent a.employ.rotate.active:before { - transform: rotate(180deg); +.sidebar ul.menu li ul li.parent a.employ.rotate-revert:before { + transform: rotate(-180deg); } /* perfect scrollbar diff --git a/css/style.menu.dark.css b/css/style.menu.dark.css index 72bb8ea..9a2cde1 100644 --- a/css/style.menu.dark.css +++ b/css/style.menu.dark.css @@ -58,7 +58,7 @@ } .sidebar ul.menu li ul li ul { - border-left: 2px solid #363c49; + border-left: 1px solid #363c49; } /* notice diff --git a/css/style.menu.light.css b/css/style.menu.light.css index 4e432da..e758dfa 100644 --- a/css/style.menu.light.css +++ b/css/style.menu.light.css @@ -58,7 +58,7 @@ } .sidebar ul.menu li ul li ul { - border-left: 2px solid #ebebeb; + border-left: 1px solid #ebebeb; } /* notice diff --git a/js/responsive.menu.js b/js/responsive.menu.js index 5356e5b..e7370f7 100644 --- a/js/responsive.menu.js +++ b/js/responsive.menu.js @@ -1,34 +1,43 @@ -/* - * Responsive menu. +/*! + * CSS UI - Responsive menu + * Copyright Zdeněk Papučík + * MIT License */ (function($) { - // click show/hide menu + + // toggle sidebar menu $('.nav .click').on('click', function() { $('.nav .responsive').toggleClass('expandable'); }); + // init menu $('ul.menu li').each(function() { $(this).parent().find('li.parent a.employ').addClass('up'); - if ($(this).children('li.parent a.current').length > 0 ) { - $(this).parent().find('ul.submenu').toggle(); - $(this).parent().find('li.parent a.employ').addClass('active down'); + if ($(this).find('li.parent a.current').length > 0 ) { + $(this).parent().find('a.current').addClass('active down'); + $(this).parent().find('a.current').next('ul.submenu').show(); } }); + // active menu $('ul.menu li a').on('click', function() { - $(this).parent('li.parent').find('a.employ').toggleClass('active'); - $(this).parent().find('ul.submenu').slideToggle('fast'); - $(this).parent().find('ul.submenu ul.submenu').toggle(); + $(this).parent().find('a.employ').toggleClass('active'); + $(this).next('ul.submenu').slideToggle('fast'); }); + // click transition $('a.employ').on('click', function() { $(this).addClass('transition'); $(this).toggleClass('rotate'); + if ($(this).parent().find('a.employ').hasClass('down')) { + $(this).toggleClass('rotate-revert'); + } }); + }(jQuery)); diff --git a/package-lock.json b/package-lock.json index a67500e..9e4b9d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,9 +18,9 @@ "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" }, "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" }, "normalize.css": { "version": "8.0.1", diff --git a/package.json b/package.json index a0c8f8e..65dae2e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "css-ui-simple": "^2.5.2", "font-awesome": "^4.7.0", - "jquery": "^3.3.1", + "jquery": "^3.4.1", "open-sans-fontface": "^1.4.0", "perfect-scrollbar": "^1.4.0" }, diff --git a/responsive.menu.html b/responsive.menu.html new file mode 100644 index 0000000..190e025 --- /dev/null +++ b/responsive.menu.html @@ -0,0 +1,117 @@ + + + + + + CSS UI - Simple responsive menu + + + + + + + + + + + + + + + + + + +
+ + + + + + + +