Skip to content

Commit

Permalink
update v2.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
onokumus committed Aug 23, 2014
1 parent 5acb6c9 commit 9df0ff6
Show file tree
Hide file tree
Showing 13 changed files with 1,013 additions and 919 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This file is for unifying the coding style for different editors and IDEs
# editorconfig.org

root = true

[*]
indent_style = tab
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
125 changes: 63 additions & 62 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,65 +1,66 @@
"use strict";

module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON("package.json"),

banner: "/*\n" +
" * <%= pkg.title || pkg.name %> - v<%= pkg.version %>\n" +
" * <%= pkg.description %>\n" +
" * <%= pkg.homepage %>\n" +
" *\n" +
" * Made by <%= pkg.author.name %>\n" +
" * Under <%= pkg.license %> License\n" +
" */\n",

jshint: {
options: {
jshintrc: ".jshintrc"
},
all: [
"Gruntfile.js",
"src/metisMenu.js"
]
},
concat: {
plugin: {
src: ["src/metisMenu.js"],
dest: "dist/metisMenu.js"
},
css: {
src: ["src/metisMenu.css"],
dest: "dist/metisMenu.css"
},
options: {
banner: "<%= banner %>"
}
},
uglify: {
plugin: {
src: ["dist/metisMenu.js"],
dest: "dist/metisMenu.min.js"
},
options: {
banner: "<%= banner %>"
}
},
cssmin: {
options: {
banner: "<%= banner %>"
},
menucss: {
src: ["src/metisMenu.css"],
dest: "dist/metisMenu.min.css"
}
}
});

grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-cssmin");

grunt.registerTask("travis", ["jshint"]);
grunt.registerTask("default", ["jshint", "concat", "uglify", "cssmin"]);
};
grunt.initConfig({
pkg: grunt.file.readJSON("package.json"),

banner: "/*\n" +
" * <%= pkg.title || pkg.name %> - v<%= pkg.version %>\n" +
" * <%= pkg.description %>\n" +
" * <%= pkg.homepage %>\n" +
" *\n" +
" * Made by <%= pkg.author.name %>\n" +
" * Under <%= pkg.license %> License\n" +
" */\n",

jshint: {
options: {
jshintrc: ".jshintrc"
},
all: [
"Gruntfile.js",
"src/metisMenu.js"
]
},
concat: {
plugin: {
src: ["src/metisMenu.js"],
dest: "dist/metisMenu.js"
},
css: {
src: ["src/metisMenu.css"],
dest: "dist/metisMenu.css"
},
options: {
banner: "<%= banner %>"
}
},
uglify: {
plugin: {
src: ["dist/metisMenu.js"],
dest: "dist/metisMenu.min.js"
},
options: {
banner: "<%= banner %>"
}
},
cssmin: {
options: {
banner: "<%= banner %>",
keepSpecialComments: "0"
},
menucss: {
src: ["src/metisMenu.css"],
dest: "dist/metisMenu.min.css"
}
}
});

grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-cssmin");

grunt.registerTask("travis", ["jshint"]);
grunt.registerTask("default", ["jshint", "concat", "uglify", "cssmin"]);
};
9 changes: 6 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "metisMenu",
"version": "1.1.1",
"version": "1.1.2",
"homepage": "https://github.com/onokumus/metisMenu",
"authors": [
"onokumus <[email protected]>"
"onokumus <[email protected]> (http://onokumus.com)"
],
"description": "Easy menu jQuery plugin for Twitter Bootstrap 3",
"main": [
Expand All @@ -28,5 +28,8 @@
"bower_components",
"test",
"tests"
]
],
"dependencies": {
"bootstrap": "~3.2.0"
}
}
51 changes: 20 additions & 31 deletions dist/metisMenu.css
Original file line number Diff line number Diff line change
@@ -1,64 +1,53 @@
/*
* metismenu - v1.1.1
* metismenu - v1.1.2
* Easy menu jQuery plugin for Twitter Bootstrap 3
* https://github.com/onokumus/metisMenu
*
* Made by Osman Nuri Okumus
* Under MIT License
*/
.arrow {
float: right;
line-height: 1.42857; //twitter bootstrap body element line-height
float: right;
line-height: 1.42857;
/* twitter bootstrap body element line-height */
}

.glyphicon.arrow:before {
content: "\e079";
content: "\e079";
}

.active > a > .glyphicon.arrow:before {
content: "\e114";
content: "\e114";
}


/*
* Require Font-Awesome
* http://fortawesome.github.io/Font-Awesome/
*/


.fa.arrow:before {
content: "\f104";
content: "\f104";
}

.active > a > .fa.arrow:before {
content: "\f107";
content: "\f107";
}

.plus-times {
float: right;
float: right;
}

.fa.plus-times:before {
content: "\f067";
content: "\f067";
}

.active > a > .fa.plus-times {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
filter: progid: DXImageTransform.Microsoft.BasicImage(rotation=1);
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
}

.plus-minus {
float: right;
float: right;
}

.fa.plus-minus:before {
content: "\f067";
content: "\f067";
}

.active > a > .fa.plus-minus:before {
content: "\f068";
}
content: "\f068";
}

0 comments on commit 9df0ff6

Please sign in to comment.