small bugfixes

- Small bugfixes - Added mmenu.jquery.json
szwork2013 · Oct 27, 2013 · 92c5f45 · 92c5f45
1 parent fcdbed0
commit 92c5f45
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 114 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+
+*.scssc
diff --git a/mmenu.jquery.json b/mmenu.jquery.json
@@ -0,0 +1,20 @@
+{
+	"name": "mmenu",
+	"version": "4.0.3",
+	"title": "jQuery mmenu",
+	"homepage": "http://mmenu.frebsite.nl",
+	"author": {
+		"name": "Fred Heusschen",
+		"url": "http://www.frebsite.nl"
+	},
+	"licenses": [{
+		"type": "MIT",
+		"url": "http://opensource.org/licenses/MIT"
+	}, {
+		"type": "GPL-3.0",
+		"url": "http://opensource.org/licenses/GPL-3.0"
+	}],
+	"dependencies": {
+		"jquery": ">=1.7.0"
+	}
+}
diff --git a/scss/inc/_colors.scss b/scss/inc/_colors.scss
@@ -45,7 +45,7 @@
 			}
 			> li.mm-selected
 			{
-				> a,
+				> a:not(.mm-subopen),
 				> span
 				{
 					background: $emphasizedBg;

diff --git a/scss/jquery.mmenu.scss b/scss/jquery.mmenu.scss
@@ -2,15 +2,6 @@
 
 
 //	Animations
-html.mm-opened .mm-page,
-html.mm-opened #mm-blocker,
-html.mm-opened .mm-fixed-top,
-html.mm-opened .mm-fixed-bottom,
-.mm-menu.mm-horizontal > .mm-panel
-{
-	@include vendor-prefix( "transition", none $transitionDuration $transitionFunction );
-}
-
 html.mm-opened
 {
 	.mm-page,
@@ -19,6 +10,8 @@ html.mm-opened
 	.mm-fixed-bottom,
 	.mm-menu.mm-horizontal > .mm-panel
 	{
+		@include vendor-prefix( "transition", none $transitionDuration $transitionFunction );
+
 		// border is needed to force transitionend event even if no other value changed
 		// transform is needed to force hardware acceleration
 		-webkit-transition-property: top, right, bottom, left, border, -webkit-transform;
@@ -35,13 +28,14 @@ html.mm-opened
 		margin: 0;
 		border: 0px solid rgba( 0, 0, 0, 0 );
 	}
-}
-html.mm-opened.mm-opening
-{
-	.mm-page,
-	#mm-blocker
+
+	&.mm-opening
 	{
-		border: 0px solid rgba( 100, 100, 100, 0 );
+		.mm-page,
+		#mm-blocker
+		{
+			border: 0px solid rgba( 100, 100, 100, 0 );
+		}
 	}
 }
 
@@ -81,9 +75,6 @@ html.mm-opened body
 {
 	width: 100%;
 	height: 100%;
-}
-html.mm-opened body
-{
 	overflow: hidden;
 	position: relative;
 }
@@ -172,14 +163,14 @@ html.mm-blocking #mm-blocker
 //	Lists
 .mm-menu
 {
-	> .mm-list
-	{
-		padding: ( $btnSize / 2 ) 0 $btnSize 0;
-	}
 	.mm-list
 	{
 		padding: ( $btnSize / 2 ) 0;
 	}
+	> .mm-list
+	{
+		padding: ( $btnSize / 2 ) 0 $btnSize 0;
+	}
 }
 .mm-panel > .mm-list
 {
@@ -212,7 +203,6 @@ html.mm-blocking #mm-blocker
 		text-decoration: none;
 	}
 
-	// ul/li
 	> li
 	{
 		position: relative;
@@ -263,32 +253,20 @@ html.mm-blocking #mm-blocker
 				border-left: none;
 			}
 		}
-	}
-	a.mm-subclose
-	{
-		text-indent: $btnSize - ( $padding * 2 );
-		padding-top: ( $btnSize / 2 ) + $padding;
-		margin-top: -( $btnSize / 2 );
-	}
 
-	a.mm-subopen + a,
-	a.mm-subopen + span
-	{
-		padding-right: $btnSize + ( $padding / 2 );
+		+ a,
+		+ span
+		{
+			padding-right: ( $padding / 2 );
+			margin-right: $btnSize;
+		}
 	}
 
 	> li.mm-selected
 	{
 		> a.mm-subopen
 		{
 			background: transparent;
-
-			+ a,
-			+ span
-			{
-				padding-right: ( $padding / 2 );
-				margin-right: $btnSize;
-			}
 		}
 		> a.mm-fullsubopen
 		{
@@ -300,6 +278,13 @@ html.mm-blocking #mm-blocker
 			}
 		}
 	}
+
+	a.mm-subclose
+	{
+		text-indent: $btnSize - ( $padding * 2 );
+		padding-top: ( $btnSize / 2 ) + $padding;
+		margin-top: -( $btnSize / 2 );
+	}
 
 	// Labels
 	> li.mm-label
@@ -330,9 +315,9 @@ html.mm-blocking #mm-blocker
 }
 
 // vertical submenu
-.mm-menu.mm-vertical
+.mm-menu.mm-vertical .mm-list
 {
-	.mm-list .mm-panel
+	.mm-panel
 	{
 		display: none;
 		padding: $padding 0 $padding $padding;
@@ -342,11 +327,11 @@ html.mm-blocking #mm-blocker
 			border-color: transparent;
 		}
 	}
-	.mm-list li.mm-opened > .mm-panel
+	li.mm-opened > .mm-panel
 	{
 		display: block;
 	}
-	.mm-list > li.mm-opened > a.mm-subopen
+	> li.mm-opened > a.mm-subopen
 	{
 		height: $btnSize;
 		&:after

diff --git a/source/extensions/jquery.mmenu.themes.css b/source/extensions/jquery.mmenu.themes.css
@@ -15,7 +15,7 @@ html.mm-opened.mm-light .mm-page {
     border-color: rgba(0, 0, 0, 0.3); }
   .mm-menu.mm-light .mm-list > li > a.mm-subopen:before {
     border-color: rgba(0, 0, 0, 0.1); }
-  .mm-menu.mm-light .mm-list > li.mm-selected > a,
+  .mm-menu.mm-light .mm-list > li.mm-selected > a:not(.mm-subopen),
   .mm-menu.mm-light .mm-list > li.mm-selected > span {
     background: rgba(255, 255, 255, 0.6); }
   .mm-menu.mm-light .mm-list li.mm-label {
@@ -56,7 +56,7 @@ html.mm-opened.mm-white .mm-page {
     border-color: rgba(0, 0, 0, 0.3); }
   .mm-menu.mm-white .mm-list > li > a.mm-subopen:before {
     border-color: rgba(0, 0, 0, 0.1); }
-  .mm-menu.mm-white .mm-list > li.mm-selected > a,
+  .mm-menu.mm-white .mm-list > li.mm-selected > a:not(.mm-subopen),
   .mm-menu.mm-white .mm-list > li.mm-selected > span {
     background: rgba(0, 0, 0, 0.08); }
   .mm-menu.mm-white .mm-list li.mm-label {
@@ -97,7 +97,7 @@ html.mm-opened.mm-black .mm-page {
     border-color: rgba(255, 255, 255, 0.3); }
   .mm-menu.mm-black .mm-list > li > a.mm-subopen:before {
     border-color: rgba(255, 255, 255, 0.2); }
-  .mm-menu.mm-black .mm-list > li.mm-selected > a,
+  .mm-menu.mm-black .mm-list > li.mm-selected > a:not(.mm-subopen),
   .mm-menu.mm-black .mm-list > li.mm-selected > span {
     background: rgba(255, 255, 255, 0.25); }
   .mm-menu.mm-black .mm-list li.mm-label {

diff --git a/source/jquery.mmenu.all.css b/source/jquery.mmenu.all.css
@@ -2,18 +2,12 @@ html.mm-opened .mm-page,
 html.mm-opened #mm-blocker,
 html.mm-opened .mm-fixed-top,
 html.mm-opened .mm-fixed-bottom,
-.mm-menu.mm-horizontal > .mm-panel {
+html.mm-opened .mm-menu.mm-horizontal > .mm-panel {
   -webkit-transition: none 0.4s ease;
   -moz-transition: none 0.4s ease;
   -ms-transition: none 0.4s ease;
   -o-transition: none 0.4s ease;
-  transition: none 0.4s ease; }
-
-html.mm-opened .mm-page,
-html.mm-opened #mm-blocker,
-html.mm-opened .mm-fixed-top,
-html.mm-opened .mm-fixed-bottom,
-html.mm-opened .mm-menu.mm-horizontal > .mm-panel {
+  transition: none 0.4s ease;
   -webkit-transition-property: top, right, bottom, left, border, -webkit-transform;
   -moz-transition-property: top, right, bottom, left, border, -moz-transform;
   -ms-transition-property: top, right, bottom, left, border, -ms-transform;
@@ -25,7 +19,6 @@ html.mm-opened #mm-blocker {
   top: 0;
   margin: 0;
   border: 0px solid rgba(0, 0, 0, 0); }
-
 html.mm-opened.mm-opening .mm-page,
 html.mm-opened.mm-opening #mm-blocker {
   border: 0px solid rgba(100, 100, 100, 0); }
@@ -55,9 +48,7 @@ html.mm-opened .mm-page,
 html.mm-opened,
 html.mm-opened body {
   width: 100%;
-  height: 100%; }
-
-html.mm-opened body {
+  height: 100%;
   overflow: hidden;
   position: relative; }
 
@@ -118,10 +109,10 @@ html.mm-blocking #mm-blocker {
       display: block;
       visibility: hidden; }
 
-.mm-menu > .mm-list {
-  padding: 20px 0 40px 0; }
 .mm-menu .mm-list {
   padding: 20px 0; }
+.mm-menu > .mm-list {
+  padding: 20px 0 40px 0; }
 
 .mm-panel > .mm-list {
   margin-left: -20px;
@@ -191,23 +182,20 @@ html.mm-blocking #mm-blocker {
     width: 100%; }
     .mm-list a.mm-subopen.mm-fullsubopen:before {
       border-left: none; }
-.mm-list a.mm-subclose {
-  text-indent: 20px;
-  padding-top: 30px;
-  margin-top: -20px; }
-.mm-list a.mm-subopen + a,
-.mm-list a.mm-subopen + span {
-  padding-right: 45px; }
-.mm-list > li.mm-selected > a.mm-subopen {
-  background: transparent; }
-  .mm-list > li.mm-selected > a.mm-subopen + a,
-  .mm-list > li.mm-selected > a.mm-subopen + span {
+  .mm-list a.mm-subopen + a,
+  .mm-list a.mm-subopen + span {
     padding-right: 5px;
     margin-right: 40px; }
+.mm-list > li.mm-selected > a.mm-subopen {
+  background: transparent; }
 .mm-list > li.mm-selected > a.mm-fullsubopen + a,
 .mm-list > li.mm-selected > a.mm-fullsubopen + span {
   padding-right: 45px;
   margin-right: 0; }
+.mm-list a.mm-subclose {
+  text-indent: 20px;
+  padding-top: 30px;
+  margin-top: -20px; }
 .mm-list > li.mm-label {
   font-size: 10px;
   text-transform: uppercase;
@@ -273,7 +261,7 @@ html.mm-opened .mm-page {
     border-color: rgba(255, 255, 255, 0.3); }
   .mm-menu .mm-list > li > a.mm-subopen:before {
     border-color: rgba(0, 0, 0, 0.15); }
-  .mm-menu .mm-list > li.mm-selected > a,
+  .mm-menu .mm-list > li.mm-selected > a:not(.mm-subopen),
   .mm-menu .mm-list > li.mm-selected > span {
     background: rgba(0, 0, 0, 0.1); }
   .mm-menu .mm-list li.mm-label {
@@ -981,7 +969,7 @@ html.mm-opened.mm-light .mm-page {
     border-color: rgba(0, 0, 0, 0.3); }
   .mm-menu.mm-light .mm-list > li > a.mm-subopen:before {
     border-color: rgba(0, 0, 0, 0.1); }
-  .mm-menu.mm-light .mm-list > li.mm-selected > a,
+  .mm-menu.mm-light .mm-list > li.mm-selected > a:not(.mm-subopen),
   .mm-menu.mm-light .mm-list > li.mm-selected > span {
     background: rgba(255, 255, 255, 0.6); }
   .mm-menu.mm-light .mm-list li.mm-label {
@@ -1022,7 +1010,7 @@ html.mm-opened.mm-white .mm-page {
     border-color: rgba(0, 0, 0, 0.3); }
   .mm-menu.mm-white .mm-list > li > a.mm-subopen:before {
     border-color: rgba(0, 0, 0, 0.1); }
-  .mm-menu.mm-white .mm-list > li.mm-selected > a,
+  .mm-menu.mm-white .mm-list > li.mm-selected > a:not(.mm-subopen),
   .mm-menu.mm-white .mm-list > li.mm-selected > span {
     background: rgba(0, 0, 0, 0.08); }
   .mm-menu.mm-white .mm-list li.mm-label {
@@ -1063,7 +1051,7 @@ html.mm-opened.mm-black .mm-page {
     border-color: rgba(255, 255, 255, 0.3); }
   .mm-menu.mm-black .mm-list > li > a.mm-subopen:before {
     border-color: rgba(255, 255, 255, 0.2); }
-  .mm-menu.mm-black .mm-list > li.mm-selected > a,
+  .mm-menu.mm-black .mm-list > li.mm-selected > a:not(.mm-subopen),
   .mm-menu.mm-black .mm-list > li.mm-selected > span {
     background: rgba(255, 255, 255, 0.25); }
   .mm-menu.mm-black .mm-list li.mm-label {
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ @@
     			}
     			> li.mm-selected
     			{
-    				> a,
+    				> a:not(.mm-subopen),
     				> span
     				{
     					background: $emphasizedBg;
@@ Expand Down @@