Skip to content

Commit

Permalink
Merge pull request #137 from VodkaBears/dev
Browse files Browse the repository at this point in the history
Release v1.0.0
  • Loading branch information
vodkabears committed Jun 7, 2015
2 parents a371a5f + 28f2c0a commit 1b01d25
Show file tree
Hide file tree
Showing 24 changed files with 3,151 additions and 2,054 deletions.
7 changes: 6 additions & 1 deletion .csscomb.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"remove-empty-rulesets": true,
"always-semicolon": true,
"color-case": "lower",
"block-indent": " ",
"block-indent": " ",
"color-shorthand": true,
"element-case": "lower",
"eof-newline": true,
Expand Down Expand Up @@ -187,6 +187,11 @@
"-ms-animation-direction",
"-o-animation-direction",
"animation-direction",
"-webkit-animation-fill-mode",
"-moz-animation-fill-mode",
"-ms-animation-fill-mode",
"-o-animation-fill-mode",
"animation-fill-mode",
"text-align",
"-webkit-text-align-last",
"-moz-text-align-last",
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
.idea/
node_modules/
libs/
Expand Down
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
### 1.0.0
* Renamed the 'closeOnAnyClick' property to the 'closeOnOutsideClick'.
* Separated base and theme styles.
* Renamed the base files.
* Added the ability to use CSS mixins.
* Added `#destroy`.
* Renamed the events.
* Used states and CSS animations.
* Made restyling of the default theme.
* Added the watch task for Grunt.
* Added Autoprefixer.
* Used `backface-visibility` for the hardware acceleration instead of `translateZ`.
* Disabled the auto-resizing of text on mobile devices.
* Fixed the triggering of the close event, even if a modal is not opened.
* Added '#getState'.
* Changed names for the constants.
* Removed the default custom font.
* Introduced the `data-remodal-action` attribute.
* Made code refactoring.
* Improved anti-FOUC.
* Updated examples.
* Updated tests.
* Updated dependencies.

### 0.6.4
* Protocol-relative URL for fonts.
* Scroll to the top, when a modal is displayed.
Expand Down
103 changes: 71 additions & 32 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,42 @@ module.exports = function(grunt) {
' *\n' +
' * Made by <%= pkg.author.name %>\n' +
' * Under <%= pkg.license %> License\n' +
' */\n'
' */\n\n'
},

autoprefixer: {
dist: {
src: 'dist/**/*.css'
},
options: {
browsers: ['> 0.1%'],
cascade: false
}
},

browserSync: {
dev: {
bsFiles: {
src: ['dist/**/*', 'examples/**/*']
},
options: {
watchTask: true,
server: './'
}
}
},

concat: {
dist: {
files: {
'dist/remodal.js': 'src/remodal.js',
'dist/remodal.css': 'src/remodal.css',
'dist/remodal-default-theme.css': 'src/remodal-default-theme.css'
},
options: {
banner: '<%= meta.banner %>'
}
}
},

connect: {
Expand All @@ -25,6 +60,26 @@ module.exports = function(grunt) {
}
},

csscomb: {
all: {
files: {
'src/remodal.css': 'src/remodal.css',
'src/remodal-default-theme.css': 'src/remodal-default-theme.css',
'dist/remodal.css': 'dist/remodal.css',
'dist/remodal-default-theme.css': 'dist/remodal-default-theme.css'
}
}
},

githooks: {
all: {
'pre-commit': 'lint'
},
options: {
command: 'node_modules/.bin/grunt'
}
},

jshint: {
gruntfile: {
src: 'Gruntfile.js'
Expand All @@ -33,7 +88,7 @@ module.exports = function(grunt) {
src: 'src/**/*.js'
},
test: {
src: 'test/**/*.js'
src: ['test/**/*.js', 'libs/jquery-loader.js']
},
options: {
jshintrc: '.jshintrc'
Expand All @@ -48,15 +103,7 @@ module.exports = function(grunt) {
src: 'src/**/*.js'
},
test: {
src: 'test/**/*.js'
}
},

csscomb: {
all: {
files: {
'src/jquery.remodal.css': 'src/jquery.remodal.css'
}
src: ['test/**/*.js', 'libs/jquery-loader.js']
}
},

Expand All @@ -76,35 +123,24 @@ module.exports = function(grunt) {
}
},

concat: {
dist: {
files: {
'dist/jquery.remodal.js': 'src/jquery.remodal.js',
'dist/jquery.remodal.css': 'src/jquery.remodal.css'
},
options: {
banner: '<%= meta.banner %>'
}
}
},

uglify: {
remodal: {
files: {
'dist/jquery.remodal.min.js': 'src/jquery.remodal.js'
'dist/remodal.min.js': 'src/remodal.js'
}
},
options: {
banner: '<%= meta.banner %>'
}
},

githooks: {
all: {
'pre-commit': 'lint'
watch: {
src: {
files: ['src/**/*', 'examples/**/*'],
tasks: ['build']
},
options: {
command: 'node_modules/.bin/grunt'
spawn: false
}
}
});
Expand All @@ -114,14 +150,17 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-autoprefixer');
grunt.loadNpmTasks('grunt-browser-sync');
grunt.loadNpmTasks('grunt-csscomb');
grunt.loadNpmTasks('grunt-githooks');
grunt.loadNpmTasks('grunt-jscs');

// Tasks.
// Tasks
grunt.registerTask('lint', ['jshint', 'jscs']);
grunt.registerTask('test', ['connect', 'lint', 'qunit']);
grunt.registerTask('default', [
'connect', 'csscomb', 'jshint', 'jscs', 'qunit', 'concat', 'uglify', 'githooks'
]);
grunt.registerTask('build', ['concat', 'autoprefixer', 'csscomb', 'uglify', 'githooks']);
grunt.registerTask('bsync', ['browserSync', 'watch']);
grunt.registerTask('default', ['test', 'build']);
};
Loading

0 comments on commit 1b01d25

Please sign in to comment.