theme colors footer and buttonbar

FrDH · Sep 3, 2014 · e8b3ba0 · e8b3ba0
1 parent 87a6d0f
commit e8b3ba0
Show file tree

Hide file tree

Showing 18 changed files with 112 additions and 28 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
 	"name": "jQuery.mmenu",
 	"main": "src/js/jquery.mmenu.min.js",
-	"version": "4.5.2",
+	"version": "4.5.3",
 	"homepage": "http://mmenu.frebsite.nl/",
 	"authors": [
 		"Fred Heusschen <[email protected]>"

diff --git a/mmenu.jquery.json b/mmenu.jquery.json
@@ -1,6 +1,6 @@
 {
 	"name": "mmenu",
-	"version": "4.5.2",
+	"version": "4.5.3",
 	"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": [

diff --git a/src/css/addons/jquery.mmenu.offcanvas.css b/src/css/addons/jquery.mmenu.offcanvas.css
@@ -12,8 +12,7 @@ html.mm-opened {
     overflow: hidden; }
   html.mm-opened .mm-page {
     box-sizing: border-box;
-    position: relative;
-    margin: 0; }
+    position: relative; }
 
 html.mm-background .mm-page {
   background: inherit; }

diff --git a/src/css/extensions/jquery.mmenu.themes.css b/src/css/extensions/jquery.mmenu.themes.css
@@ -25,6 +25,15 @@ html.mm-opened.mm-light .mm-page {
   .mm-menu.mm-light.mm-vertical .mm-list li.mm-opened > ul {
     background: rgba(0, 0, 0, 0.03); }
 
+.mm-menu.mm-light .mm-buttonbar {
+  border-color: rgba(0, 0, 0, 0.6);
+  background: #f3f3f3; }
+  .mm-menu.mm-light .mm-buttonbar > * {
+    border-color: rgba(0, 0, 0, 0.6); }
+  .mm-menu.mm-light .mm-buttonbar > input:checked + label {
+    background: rgba(0, 0, 0, 0.6);
+    color: #f3f3f3; }
+
 .mm-menu.mm-light label.mm-check:before {
   border-color: rgba(0, 0, 0, 0.3); }
 .mm-menu.mm-light input.mm-check:checked ~ label.mm-check:before {
@@ -33,6 +42,10 @@ html.mm-opened.mm-light .mm-page {
 .mm-menu.mm-light em.mm-counter {
   color: rgba(0, 0, 0, 0.3); }
 
+.mm-menu.mm-light .mm-footer {
+  border-color: rgba(0, 0, 0, 0.15);
+  color: rgba(255, 255, 255, 0.3); }
+
 .mm-menu.mm-light .mm-header {
   border-color: rgba(0, 0, 0, 0.1);
   color: rgba(0, 0, 0, 0.3); }
@@ -80,6 +93,15 @@ html.mm-opened.mm-white .mm-page {
   .mm-menu.mm-white.mm-vertical .mm-list li.mm-opened > ul {
     background: rgba(0, 0, 0, 0.03); }
 
+.mm-menu.mm-white .mm-buttonbar {
+  border-color: rgba(0, 0, 0, 0.6);
+  background: white; }
+  .mm-menu.mm-white .mm-buttonbar > * {
+    border-color: rgba(0, 0, 0, 0.6); }
+  .mm-menu.mm-white .mm-buttonbar > input:checked + label {
+    background: rgba(0, 0, 0, 0.6);
+    color: white; }
+
 .mm-menu.mm-white label.mm-check:before {
   border-color: rgba(0, 0, 0, 0.3); }
 .mm-menu.mm-white input.mm-check:checked ~ label.mm-check:before {
@@ -88,6 +110,10 @@ html.mm-opened.mm-white .mm-page {
 .mm-menu.mm-white em.mm-counter {
   color: rgba(0, 0, 0, 0.3); }
 
+.mm-menu.mm-white .mm-footer {
+  border-color: rgba(0, 0, 0, 0.15);
+  color: rgba(255, 255, 255, 0.3); }
+
 .mm-menu.mm-white .mm-header {
   border-color: rgba(0, 0, 0, 0.1);
   color: rgba(0, 0, 0, 0.3); }
@@ -135,6 +161,15 @@ html.mm-opened.mm-black .mm-page {
   .mm-menu.mm-black.mm-vertical .mm-list li.mm-opened > ul {
     background: rgba(255, 255, 255, 0.15); }
 
+.mm-menu.mm-black .mm-buttonbar {
+  border-color: rgba(255, 255, 255, 0.6);
+  background: black; }
+  .mm-menu.mm-black .mm-buttonbar > * {
+    border-color: rgba(255, 255, 255, 0.6); }
+  .mm-menu.mm-black .mm-buttonbar > input:checked + label {
+    background: rgba(255, 255, 255, 0.6);
+    color: black; }
+
 .mm-menu.mm-black label.mm-check:before {
   border-color: rgba(255, 255, 255, 0.3); }
 .mm-menu.mm-black input.mm-check:checked ~ label.mm-check:before {
@@ -143,6 +178,10 @@ html.mm-opened.mm-black .mm-page {
 .mm-menu.mm-black em.mm-counter {
   color: rgba(255, 255, 255, 0.3); }
 
+.mm-menu.mm-black .mm-footer {
+  border-color: rgba(0, 0, 0, 0.15);
+  color: rgba(255, 255, 255, 0.3); }
+
 .mm-menu.mm-black .mm-header {
   border-color: rgba(255, 255, 255, 0.2);
   color: rgba(255, 255, 255, 0.3); }

diff --git a/src/css/jquery.mmenu.all.css b/src/css/jquery.mmenu.all.css
@@ -223,8 +223,7 @@ html.mm-opened {
     overflow: hidden; }
   html.mm-opened .mm-page {
     box-sizing: border-box;
-    position: relative;
-    margin: 0; }
+    position: relative; }
 
 html.mm-background .mm-page {
   background: inherit; }
@@ -907,6 +906,15 @@ html.mm-opened.mm-light .mm-page {
   .mm-menu.mm-light.mm-vertical .mm-list li.mm-opened > ul {
     background: rgba(0, 0, 0, 0.03); }
 
+.mm-menu.mm-light .mm-buttonbar {
+  border-color: rgba(0, 0, 0, 0.6);
+  background: #f3f3f3; }
+  .mm-menu.mm-light .mm-buttonbar > * {
+    border-color: rgba(0, 0, 0, 0.6); }
+  .mm-menu.mm-light .mm-buttonbar > input:checked + label {
+    background: rgba(0, 0, 0, 0.6);
+    color: #f3f3f3; }
+
 .mm-menu.mm-light label.mm-check:before {
   border-color: rgba(0, 0, 0, 0.3); }
 .mm-menu.mm-light input.mm-check:checked ~ label.mm-check:before {
@@ -915,6 +923,10 @@ html.mm-opened.mm-light .mm-page {
 .mm-menu.mm-light em.mm-counter {
   color: rgba(0, 0, 0, 0.3); }
 
+.mm-menu.mm-light .mm-footer {
+  border-color: rgba(0, 0, 0, 0.15);
+  color: rgba(255, 255, 255, 0.3); }
+
 .mm-menu.mm-light .mm-header {
   border-color: rgba(0, 0, 0, 0.1);
   color: rgba(0, 0, 0, 0.3); }
@@ -962,6 +974,15 @@ html.mm-opened.mm-white .mm-page {
   .mm-menu.mm-white.mm-vertical .mm-list li.mm-opened > ul {
     background: rgba(0, 0, 0, 0.03); }
 
+.mm-menu.mm-white .mm-buttonbar {
+  border-color: rgba(0, 0, 0, 0.6);
+  background: white; }
+  .mm-menu.mm-white .mm-buttonbar > * {
+    border-color: rgba(0, 0, 0, 0.6); }
+  .mm-menu.mm-white .mm-buttonbar > input:checked + label {
+    background: rgba(0, 0, 0, 0.6);
+    color: white; }
+
 .mm-menu.mm-white label.mm-check:before {
   border-color: rgba(0, 0, 0, 0.3); }
 .mm-menu.mm-white input.mm-check:checked ~ label.mm-check:before {
@@ -970,6 +991,10 @@ html.mm-opened.mm-white .mm-page {
 .mm-menu.mm-white em.mm-counter {
   color: rgba(0, 0, 0, 0.3); }
 
+.mm-menu.mm-white .mm-footer {
+  border-color: rgba(0, 0, 0, 0.15);
+  color: rgba(255, 255, 255, 0.3); }
+
 .mm-menu.mm-white .mm-header {
   border-color: rgba(0, 0, 0, 0.1);
   color: rgba(0, 0, 0, 0.3); }
@@ -1017,6 +1042,15 @@ html.mm-opened.mm-black .mm-page {
   .mm-menu.mm-black.mm-vertical .mm-list li.mm-opened > ul {
     background: rgba(255, 255, 255, 0.15); }
 
+.mm-menu.mm-black .mm-buttonbar {
+  border-color: rgba(255, 255, 255, 0.6);
+  background: black; }
+  .mm-menu.mm-black .mm-buttonbar > * {
+    border-color: rgba(255, 255, 255, 0.6); }
+  .mm-menu.mm-black .mm-buttonbar > input:checked + label {
+    background: rgba(255, 255, 255, 0.6);
+    color: black; }
+
 .mm-menu.mm-black label.mm-check:before {
   border-color: rgba(255, 255, 255, 0.3); }
 .mm-menu.mm-black input.mm-check:checked ~ label.mm-check:before {
@@ -1025,6 +1059,10 @@ html.mm-opened.mm-black .mm-page {
 .mm-menu.mm-black em.mm-counter {
   color: rgba(255, 255, 255, 0.3); }
 
+.mm-menu.mm-black .mm-footer {
+  border-color: rgba(0, 0, 0, 0.15);
+  color: rgba(255, 255, 255, 0.3); }
+
 .mm-menu.mm-black .mm-header {
   border-color: rgba(255, 255, 255, 0.2);
   color: rgba(255, 255, 255, 0.3); }

diff --git a/src/css/jquery.mmenu.css b/src/css/jquery.mmenu.css
@@ -223,8 +223,7 @@ html.mm-opened {
     overflow: hidden; }
   html.mm-opened .mm-page {
     box-sizing: border-box;
-    position: relative;
-    margin: 0; }
+    position: relative; }
 
 html.mm-background .mm-page {
   background: inherit; }

diff --git a/src/js/jquery.mmenu.min.all.js b/src/js/jquery.mmenu.min.all.js
diff --git a/src/js/jquery.mmenu.min.js b/src/js/jquery.mmenu.min.js
diff --git a/src/js/jquery.mmenu.oncanvas.js b/src/js/jquery.mmenu.oncanvas.js
@@ -1,5 +1,5 @@
 /*	
- * jQuery mmenu v4.5.2
+ * jQuery mmenu v4.5.3
  * @requires jQuery 1.7.0 or later
  *
  * mmenu.frebsite.nl
@@ -15,7 +15,7 @@
 (function( $ ) {
 
 	var _PLUGIN_	= 'mmenu',
-		_VERSION_	= '4.5.2';
+		_VERSION_	= '4.5.3';
 
 
 	//	Plugin already excists

diff --git a/src/js/jquery.mmenu.oncanvas.min.js b/src/js/jquery.mmenu.oncanvas.min.js
diff --git a/src/js/umd/jquery.mmenu.oncanvas.umd.js b/src/js/umd/jquery.mmenu.oncanvas.umd.js
diff --git a/src/js/umd/jquery.mmenu.umd.all.js b/src/js/umd/jquery.mmenu.umd.all.js
diff --git a/src/js/umd/jquery.mmenu.umd.js b/src/js/umd/jquery.mmenu.umd.js
diff --git a/src/scss/addons/jquery.mmenu.buttonbars.scss b/src/scss/addons/jquery.mmenu.buttonbars.scss
@@ -95,4 +95,5 @@
 	margin: $mm_padding ( $mm_padding * 2 );
 }
 
+
 @include mm_colors_buttonbars;
diff --git a/src/scss/addons/jquery.mmenu.offcanvas.scss b/src/scss/addons/jquery.mmenu.offcanvas.scss
@@ -26,7 +26,6 @@ html.mm-opened
 	{
 		box-sizing: border-box;
 		position: relative;
-		margin: 0;
 	}
 }
 

diff --git a/src/scss/addons/jquery.mmenu.searchfield.scss b/src/scss/addons/jquery.mmenu.searchfield.scss
@@ -115,4 +115,5 @@ $mm_paddingBeneathHeader: $mm_padding * 2 !default;
 	}
 }
 
-@include mm_colors_search;
+
+@include mm_colors_searchfield;
diff --git a/src/scss/extensions/jquery.mmenu.themes.scss b/src/scss/extensions/jquery.mmenu.themes.scss
@@ -11,21 +11,29 @@
 		$mm_t_textColor, $mm_t_dimmedTextColor,
 		$mm_t_emphasizedBackgroundColor, $mm_t_highlightedBackgroundColor,
 		$mm_t_borderColor );
-
+
+	@include mm_colors_buttonbars( $mm_t_cls,
+		$mm_t_backgroundColor,
+		$mm_t_textColor );
+
 	@include mm_colors_checks( $mm_t_cls,
 		$mm_t_dimmedTextColor, $mm_t_textColor );
 
 	@include mm_colors_counters( $mm_t_cls,
 		$mm_t_dimmedTextColor );
-
+
+	@include mm_colors_footer( $mm_t_cls,
+		$mm_dimmedTextColor,
+		$mm_borderColor );
+
 	@include mm_colors_header( $mm_t_cls,
 		$mm_t_dimmedTextColor,
 		$mm_t_borderColor );
 
 	@include mm_colors_labels( $mm_t_cls,
 		$mm_t_highlightedBackgroundColor );
 
-	@include mm_colors_search( $mm_t_cls,
+	@include mm_colors_searchfield( $mm_t_cls,
 		$mm_t_inputBackgroundColor, $mm_t_textColor,
 		$mm_t_dimmedTextColor );
 

diff --git a/src/scss/inc/_colors.scss b/src/scss/inc/_colors.scss
@@ -163,7 +163,7 @@
 	}
 }
 
-@mixin mm_colors_search( $cls: "",
+@mixin mm_colors_searchfield( $cls: "",
 	$inputBg: $mm_dimmedTextColor, $color: $mm_textColor,
 	$dimmedColor: $mm_dimmedTextColor
 ) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -95,4 +95,5 @@
		margin: $mm_padding ( $mm_padding * 2 );
		}


		@include mm_colors_buttonbars;
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ html.mm-opened @@
     	{
     		box-sizing: border-box;
     		position: relative;
-    		margin: 0;
     	}
     }
@@ Expand Down @@