Skip to content

Commit

Permalink
Small bug fixes
Browse files Browse the repository at this point in the history
bug fixes for effects and iconbar extensions
  • Loading branch information
FrDH committed Aug 30, 2014
1 parent d25f053 commit ceb0168
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 185 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "jQuery.mmenu",
"main": "src/js/jquery.mmenu.min.js",
"version": "4.5.0",
"version": "4.5.1",
"homepage": "http://mmenu.frebsite.nl/",
"authors": [
"Fred Heusschen <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion mmenu.jquery.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mmenu",
"version": "4.5.0",
"version": "4.5.1",
"title": "jQuery mmenu",
"description": "The best jQuery plugin for app look-alike on- and off-canvas menus with sliding submenus for your website and webapp.",
"keywords": [
Expand Down
40 changes: 6 additions & 34 deletions src/css/extensions/jquery.mmenu.effects.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
*/
html.mm-slide .mm-menu {
-webkit-transition: -webkit-transform 0.4s ease;
-moz-transition: -moz-transform 0.4s ease;
-o-transition: -o-transform 0.4s ease;
transition: transform 0.4s ease; }
html.mm-slide.mm-opened .mm-menu {
-webkit-transform: translateX(-30%);
Expand Down Expand Up @@ -33,8 +31,6 @@ html.mm-slide.mm-bottom.mm-opening .mm-menu {

html.mm-zoom-menu .mm-menu {
-webkit-transition: -webkit-transform 0.4s ease;
-moz-transition: -moz-transform 0.4s ease;
-o-transition: -o-transform 0.4s ease;
transition: transform 0.4s ease; }
html.mm-zoom-menu.mm-opened .mm-menu {
-webkit-transform: scale(0.7, 0.7) translateX(-30%);
Expand Down Expand Up @@ -69,40 +65,16 @@ html.mm-zoom-menu.mm-bottom.mm-opening .mm-menu {
-webkit-transform: scale(1, 1) translateY(0%);
transform: scale(1, 1) translateY(0%); }

html.mm-zoom-page .mm-page {
-webkit-transition-property: -webkit-transform, top, right, bottom, left, border;
-moz-transition-property: -moz-transform, top, right, bottom, left, border;
-ms-transition-property: -ms-transform, top, right, bottom, left, border;
-o-transition-property: -o-transform, top, right, bottom, left, border;
transition-property: transform, top, right, bottom, left, border; }
html.mm-zoom-page.mm-opened .mm-page {
-webkit-transform: scale(1, 1);
transform: scale(1, 1);
-webkit-transform-origin: left center;
transform-origin: left center; }
html.mm-zoom-page.mm-opening .mm-page {
-webkit-transform: scale(1.5, 1.5);
transform: scale(1.5, 1.5); }
html.mm-zoom-page.mm-right.mm-opened .mm-page {
-webkit-transform-origin: right center;
transform-origin: right center; }
html.mm-zoom-page.mm-top.mm-opened .mm-page {
-webkit-transform-origin: center top;
transform-origin: center top; }
html.mm-zoom-page.mm-bottom.mm-opened .mm-page {
-webkit-transform-origin: center bottom;
transform-origin: center bottom; }

html.mm-zoom-panels .mm-menu.mm-horizontal > .mm-panel {
-webkit-transform: scale(1.5, 1.5);
transform: scale(1.5, 1.5);
-webkit-transform: scale(1.5, 1.5) translateX(100%);
transform: scale(1.5, 1.5) translateX(100%);
-webkit-transform-origin: left center;
transform-origin: left center;
-webkit-transition-property: -webkit-transform, left;
transition-property: transform, left; }
html.mm-zoom-panels .mm-menu.mm-horizontal > .mm-panel.mm-opened {
-webkit-transform: scale(1, 1);
transform: scale(1, 1); }
-webkit-transform: scale(1, 1) translateX(0%);
transform: scale(1, 1) translateX(0%); }
html.mm-zoom-panels .mm-menu.mm-horizontal > .mm-panel.mm-opened.mm-subopened {
-webkit-transform: scale(0.7, 0.7);
transform: scale(0.7, 0.7); }
-webkit-transform: scale(0.7, 0.7) translateX(-30%);
transform: scale(0.7, 0.7) translateX(-30%); }
7 changes: 3 additions & 4 deletions src/css/extensions/jquery.mmenu.iconbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
min-height: 100vh;
position: relative; }

.mm-page,
.mm-fixed-top,
.mm-fixed-bottom {
left: 60px;
.mm-page {
-webkit-transform: translate(60px);
transform: translate(60px);
margin-right: 60px; }

.mm-menu:first-child, .mm-menu.mm-current {
Expand Down
40 changes: 6 additions & 34 deletions src/css/jquery.mmenu.all.css
Original file line number Diff line number Diff line change
Expand Up @@ -686,8 +686,6 @@ em.mm-counter + a.mm-subopen + label.mm-check + span {
*/
html.mm-slide .mm-menu {
-webkit-transition: -webkit-transform 0.4s ease;
-moz-transition: -moz-transform 0.4s ease;
-o-transition: -o-transform 0.4s ease;
transition: transform 0.4s ease; }
html.mm-slide.mm-opened .mm-menu {
-webkit-transform: translateX(-30%);
Expand Down Expand Up @@ -716,8 +714,6 @@ html.mm-slide.mm-bottom.mm-opening .mm-menu {

html.mm-zoom-menu .mm-menu {
-webkit-transition: -webkit-transform 0.4s ease;
-moz-transition: -moz-transform 0.4s ease;
-o-transition: -o-transform 0.4s ease;
transition: transform 0.4s ease; }
html.mm-zoom-menu.mm-opened .mm-menu {
-webkit-transform: scale(0.7, 0.7) translateX(-30%);
Expand Down Expand Up @@ -752,43 +748,19 @@ html.mm-zoom-menu.mm-bottom.mm-opening .mm-menu {
-webkit-transform: scale(1, 1) translateY(0%);
transform: scale(1, 1) translateY(0%); }

html.mm-zoom-page .mm-page {
-webkit-transition-property: -webkit-transform, top, right, bottom, left, border;
-moz-transition-property: -moz-transform, top, right, bottom, left, border;
-ms-transition-property: -ms-transform, top, right, bottom, left, border;
-o-transition-property: -o-transform, top, right, bottom, left, border;
transition-property: transform, top, right, bottom, left, border; }
html.mm-zoom-page.mm-opened .mm-page {
-webkit-transform: scale(1, 1);
transform: scale(1, 1);
-webkit-transform-origin: left center;
transform-origin: left center; }
html.mm-zoom-page.mm-opening .mm-page {
-webkit-transform: scale(1.5, 1.5);
transform: scale(1.5, 1.5); }
html.mm-zoom-page.mm-right.mm-opened .mm-page {
-webkit-transform-origin: right center;
transform-origin: right center; }
html.mm-zoom-page.mm-top.mm-opened .mm-page {
-webkit-transform-origin: center top;
transform-origin: center top; }
html.mm-zoom-page.mm-bottom.mm-opened .mm-page {
-webkit-transform-origin: center bottom;
transform-origin: center bottom; }

html.mm-zoom-panels .mm-menu.mm-horizontal > .mm-panel {
-webkit-transform: scale(1.5, 1.5);
transform: scale(1.5, 1.5);
-webkit-transform: scale(1.5, 1.5) translateX(100%);
transform: scale(1.5, 1.5) translateX(100%);
-webkit-transform-origin: left center;
transform-origin: left center;
-webkit-transition-property: -webkit-transform, left;
transition-property: transform, left; }
html.mm-zoom-panels .mm-menu.mm-horizontal > .mm-panel.mm-opened {
-webkit-transform: scale(1, 1);
transform: scale(1, 1); }
-webkit-transform: scale(1, 1) translateX(0%);
transform: scale(1, 1) translateX(0%); }
html.mm-zoom-panels .mm-menu.mm-horizontal > .mm-panel.mm-opened.mm-subopened {
-webkit-transform: scale(0.7, 0.7);
transform: scale(0.7, 0.7); }
-webkit-transform: scale(0.7, 0.7) translateX(-30%);
transform: scale(0.7, 0.7) translateX(-30%); }

/*
jQuery.mmenu fullscreen extension CSS
Expand Down
4 changes: 2 additions & 2 deletions src/js/jquery.mmenu.min.all.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/js/jquery.mmenu.min.js

Large diffs are not rendered by default.

43 changes: 5 additions & 38 deletions src/js/jquery.mmenu.oncanvas.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery mmenu v4.5.0
* jQuery mmenu v4.5.1
* @requires jQuery 1.7.0 or later
*
* mmenu.frebsite.nl
Expand All @@ -15,7 +15,7 @@
(function( $ ) {

var _PLUGIN_ = 'mmenu',
_VERSION_ = '4.5.0';
_VERSION_ = '4.5.1';


// Plugin already excists
Expand Down Expand Up @@ -571,42 +571,9 @@
/*
SUPPORT
*/
(function() {

var wd = window.document,
ua = window.navigator.userAgent;

var _touch = 'ontouchstart' in wd,
_overflowscrolling = 'WebkitOverflowScrolling' in wd.documentElement.style,
_oldAndroidBrowser = (function() {
if ( ua.indexOf( 'Android' ) >= 0 )
{
return 2.4 > parseFloat( ua.slice( ua.indexOf( 'Android' ) +8 ) );
}
return false;
})();

$[ _PLUGIN_ ].support = {

touch: _touch,
oldAndroidBrowser: _oldAndroidBrowser,
overflowscrolling: (function() {
if ( !_touch )
{
return true;
}
if ( _overflowscrolling )
{
return true;
}
if ( _oldAndroidBrowser )
{
return false;
}
return true;
})()
};
})();
$[ _PLUGIN_ ].support = {
touch: 'ontouchstart' in window.document
};


/*
Expand Down
4 changes: 2 additions & 2 deletions src/js/jquery.mmenu.oncanvas.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/js/umd/jquery.mmenu.oncanvas.umd.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/js/umd/jquery.mmenu.umd.all.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/js/umd/jquery.mmenu.umd.js

Large diffs are not rendered by default.

66 changes: 9 additions & 57 deletions src/scss/extensions/jquery.mmenu.effects.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ html.mm-slide
.mm-menu
{
-webkit-transition: -webkit-transform $mm_transitionDuration $mm_transitionFunction;
-moz-transition: -moz-transform $mm_transitionDuration $mm_transitionFunction;
-o-transition: -o-transform $mm_transitionDuration $mm_transitionFunction;
transition: transform $mm_transitionDuration $mm_transitionFunction;
}

Expand Down Expand Up @@ -68,22 +66,20 @@ html.mm-slide


// Zoom menu
$scaleDown: 0.7;
$scaleUp: 1.5;
$mm_scaleDown: 0.7;
$mm_scaleUp: 1.5;
html.mm-zoom-menu
{
.mm-menu
{
-webkit-transition: -webkit-transform $mm_transitionDuration $mm_transitionFunction;
-moz-transition: -moz-transform $mm_transitionDuration $mm_transitionFunction;
-o-transition: -o-transform $mm_transitionDuration $mm_transitionFunction;
transition: transform $mm_transitionDuration $mm_transitionFunction;
}

// Left
&.mm-opened .mm-menu
{
@include mm_webkit-prefix( 'transform', scale( $scaleDown, $scaleDown ) translateX( -$mm_subpanelOffset ) );
@include mm_webkit-prefix( 'transform', scale( $mm_scaleDown, $mm_scaleDown ) translateX( -$mm_subpanelOffset ) );
@include mm_webkit-prefix( 'transform-origin', left center );
}
&.mm-opening .mm-menu
Expand All @@ -96,7 +92,7 @@ html.mm-zoom-menu
{
&.mm-opened .mm-menu
{
@include mm_webkit-prefix( 'transform', scale( $scaleDown, $scaleDown) translateX( $mm_subpanelOffset ) );
@include mm_webkit-prefix( 'transform', scale( $mm_scaleDown, $mm_scaleDown) translateX( $mm_subpanelOffset ) );
@include mm_webkit-prefix( 'transform-origin', right center );
}
&.mm-opening .mm-menu
Expand All @@ -110,7 +106,7 @@ html.mm-zoom-menu
{
&.mm-opened .mm-menu
{
@include mm_webkit-prefix( 'transform', scale( $scaleDown, $scaleDown ) translateY( -$mm_subpanelOffset ) );
@include mm_webkit-prefix( 'transform', scale( $mm_scaleDown, $mm_scaleDown ) translateY( -$mm_subpanelOffset ) );
@include mm_webkit-prefix( 'transform-origin', center top );
}
&.mm-opening .mm-menu
Expand All @@ -124,7 +120,7 @@ html.mm-zoom-menu
{
&.mm-opened .mm-menu
{
@include mm_webkit-prefix( 'transform', scale( $scaleDown, $scaleDown ) translateY( $mm_subpanelOffset ) );
@include mm_webkit-prefix( 'transform', scale( $mm_scaleDown, $mm_scaleDown ) translateY( $mm_subpanelOffset ) );
@include mm_webkit-prefix( 'transform-origin', center bottom );
}
&.mm-opening .mm-menu
Expand All @@ -135,66 +131,22 @@ html.mm-zoom-menu
}


// Zoom page
html.mm-zoom-page
{

.mm-page
{
-webkit-transition-property: -webkit-transform, top, right, bottom, left, border;
-moz-transition-property: -moz-transform, top, right, bottom, left, border;
-ms-transition-property: -ms-transform, top, right, bottom, left, border;
-o-transition-property: -o-transform, top, right, bottom, left, border;
transition-property: transform, top, right, bottom, left, border;
}

// Left
&.mm-opened .mm-page
{
@include mm_webkit-prefix( 'transform', scale( 1, 1 ) );
@include mm_webkit-prefix( 'transform-origin', left center );
}
&.mm-opening .mm-page
{
@include mm_webkit-prefix( 'transform', scale( $scaleUp, $scaleUp ) );
}

// Right
&.mm-right.mm-opened .mm-page
{
@include mm_webkit-prefix( 'transform-origin', right center );
}

// Top
&.mm-top.mm-opened .mm-page
{
@include mm_webkit-prefix( 'transform-origin', center top );
}

// Bottom
&.mm-bottom.mm-opened .mm-page
{
@include mm_webkit-prefix( 'transform-origin', center bottom );
}
}


// Zoom panels
html.mm-zoom-panels .mm-menu.mm-horizontal > .mm-panel
{
@include mm_webkit-prefix( 'transform', scale( $scaleUp, $scaleUp ) );
@include mm_webkit-prefix( 'transform', scale( $mm_scaleUp, $mm_scaleUp ) translateX( 100% ) );
@include mm_webkit-prefix( 'transform-origin', left center );

-webkit-transition-property: -webkit-transform, left;
transition-property: transform, left;

&.mm-opened
{
@include mm_webkit-prefix( 'transform', scale( 1, 1 ) );
@include mm_webkit-prefix( 'transform', scale( 1, 1 ) translateX( 0% ) );

&.mm-subopened
{
@include mm_webkit-prefix( 'transform', scale( $scaleDown, $scaleDown ) );
@include mm_webkit-prefix( 'transform', scale( $mm_scaleDown, $mm_scaleDown ) translateX( -$mm_subpanelOffset ) );
}
}
}
6 changes: 2 additions & 4 deletions src/scss/extensions/jquery.mmenu.iconbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ $mm_ib_pageOffset: $mm_btnSize + ( $mm_padding * 2 ) !default;
min-height: 100vh;
position: relative;
}
.mm-page,
.mm-fixed-top,
.mm-fixed-bottom
.mm-page
{
left: $mm_ib_pageOffset;
@include mm-webkit-prefix( 'transform', translate( $mm_ib_pageOffset ) );
margin-right: $mm_ib_pageOffset;
}

Expand Down

0 comments on commit ceb0168

Please sign in to comment.