Skip to content

Commit

Permalink
small fixes + iconbar extension
Browse files Browse the repository at this point in the history
  • Loading branch information
FrDH committed Jul 4, 2014
1 parent 7d8b00a commit 170b14b
Show file tree
Hide file tree
Showing 22 changed files with 117 additions and 56 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.3.3",
"version": "4.3.4",
"homepage": "http://mmenu.frebsite.nl/",
"authors": [
"Fred Heusschen <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion demo/demo.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ p
}
a, a:link, a:active, a:visited, a:hover
{
color: #333;
color: inherit;
text-decoration: underline;
}
a.button,
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.3.3",
"version": "4.3.4",
"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
10 changes: 6 additions & 4 deletions src/css/addons/jquery.mmenu.offcanvas.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@
-o-transition-property: top, right, bottom, left, border;
transition-property: top, right, bottom, left, border; }

html.mm-opened .mm-page,
html.mm-opened #mm-blocker {
.mm-page,
#mm-blocker {
margin: 0;
top: 0;
right: 0;
bottom: 0;
left: 0;
left: 0; }

.mm-page {
border: 0px solid rgba(0, 0, 0, 0); }

html.mm-opening .mm-page {
border: 0px solid #010101; }
border: 0px solid rgba(1, 1, 1, 0); }

.mm-fixed-top,
.mm-fixed-bottom {
Expand Down
16 changes: 16 additions & 0 deletions src/css/extensions/jquery.mmenu.iconbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
jQuery.mmenu iconbar extension CSS
*/
.mm-page {
background: inherit;
min-height: 100vh;
position: relative; }

.mm-page,
.mm-fixed-top,
.mm-fixed-bottom {
left: 60px;
margin-right: 60px; }

.mm-menu:first-child, .mm-menu.mm-current {
display: block; }
3 changes: 3 additions & 0 deletions src/css/extensions/jquery.mmenu.widescreen.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/*
jQuery.mmenu widescreen extension CSS
To use on widescreens only, include it using a mediaquery:
<link type="text/css" href="mmenu-widescreen.css" media="all and (min-width: 900px)"/>
*/
html, body {
min-height: 100%;
Expand Down
10 changes: 6 additions & 4 deletions src/css/jquery.mmenu.all.css
Original file line number Diff line number Diff line change
Expand Up @@ -236,17 +236,19 @@ html.mm-opened .mm-page {
-o-transition-property: top, right, bottom, left, border;
transition-property: top, right, bottom, left, border; }

html.mm-opened .mm-page,
html.mm-opened #mm-blocker {
.mm-page,
#mm-blocker {
margin: 0;
top: 0;
right: 0;
bottom: 0;
left: 0;
left: 0; }

.mm-page {
border: 0px solid rgba(0, 0, 0, 0); }

html.mm-opening .mm-page {
border: 0px solid #010101; }
border: 0px solid rgba(1, 1, 1, 0); }

.mm-fixed-top,
.mm-fixed-bottom {
Expand Down
10 changes: 6 additions & 4 deletions src/css/jquery.mmenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -236,17 +236,19 @@ html.mm-opened .mm-page {
-o-transition-property: top, right, bottom, left, border;
transition-property: top, right, bottom, left, border; }

html.mm-opened .mm-page,
html.mm-opened #mm-blocker {
.mm-page,
#mm-blocker {
margin: 0;
top: 0;
right: 0;
bottom: 0;
left: 0;
left: 0; }

.mm-page {
border: 0px solid rgba(0, 0, 0, 0); }

html.mm-opening .mm-page {
border: 0px solid #010101; }
border: 0px solid rgba(1, 1, 1, 0); }

.mm-fixed-top,
.mm-fixed-bottom {
Expand Down
6 changes: 5 additions & 1 deletion src/js/addons/jquery.mmenu.offcanvas.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

this.opts[ _ADDON_ ] = extendOptions( this.opts[ _ADDON_ ] );
this.conf[ _ADDON_ ] = extendConfiguration( this.conf[ _ADDON_ ] );
this.vars.opened = false;

if ( typeof this.vars.opened != 'boolean' )
{
this.vars.opened = false;
}

var opts = this.opts[ _ADDON_ ],
conf = this.conf[ _ADDON_ ],
Expand Down
2 changes: 1 addition & 1 deletion src/js/addons/jquery.mmenu.offcanvas.min.js

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

Loading

0 comments on commit 170b14b

Please sign in to comment.