diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..2927f66
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,57 @@
+#Change Log
+All notable changes to this project will be documented in this file.
+`Propeller` adheres to [Semantic Versioning](http://semver.org/).
+
+---
+
+## [1.1.0](https://github.com/digicorp/propeller/releases/tag/1.1.0) (04/06/2017)
+Released on Thursday, April 06, 2017. All issues associated with this milestone can be found using this [filter](https://github.com/digicorp/propeller/issues).
+
+#### Highlights
+* Integrated Bower and NPM packages.
+ * Integrated Grunt.
+ * Added data-duration
attribute in Alert component to customize alert visibility time .
+* Removed modal.js
file from library and handle Modalbox component vertical center alignment with CSS.
+* Fixed active tab bar and navigation arrow alignment issue and active tab container width issue in Scrollable Tab component on Window resize function.
+ * Enhanced our Landing page with new section which includes - 'Roadmap'.
+* Updated docs section for the components.
+ * Fixed up issues in the following component - Dropdown, Alert, Floating Action Button, Select2, Scrollable Tabs, Datetimepicker, and Modalbox.
+
+#### Added
+###### JS
+* [#41dd312](https://github.com/digicorp/propeller/commit/41dd312): Added 'data-duration' attribute in Alert component.
+
+#### Updated
+###### CSS
+* [#26f7356](https://github.com/digicorp/propeller/commit/26f7356): Enhanced Dropdown component's animation property.
+* [#f41df18](https://github.com/digicorp/propeller/commit/f41df18): Updated css to vertically middle align the modalbox component.
+
+#### Fixed
+###### JS
+* [#26f7356](https://github.com/digicorp/propeller/commit/26f7356): Resolved Dropdown component's toggle issue for mobile and tablet devices.
+ * [#ce8e4bc](https://github.com/digicorp/propeller/commit/ce8e4bc): Resolved Floating label alignment issue in Select2 component, when initial value was null.
+* [#be27f64](https://github.com/digicorp/propeller/commit/be27f64): Resolved Sidebar overlay closing issue for window resize function.
+ * [#44662c8](https://github.com/digicorp/propeller/commit/44662c8): Resolved Browser Console error issue coming in DateTimePicker component on selecting datepicker only.
+* [#41dd312](https://github.com/digicorp/propeller/commit/41dd312): Fixed 'data-duration' issue in Alert component.
+ * [#315f701](https://github.com/digicorp/propeller/commit/315f701): Fixed active tab bar and navigation arrow alignment issue and active tab container width issue in Scrollable Tab component for Window resize function.
+* [#cf94b03](https://github.com/digicorp/propeller/commit/cf94b03): Resolved Datetimepicker Hour Hand update issue.
+
+#### Removed
+###### CSS
+* [#fe22e08](https://github.com/digicorp/propeller/commit/fe22e08): Removed unwanted white space in the browser speciflc CSS property for Accordion component.
+ * [#fe722fc](https://github.com/digicorp/propeller/commit/fe722fc) [#3267639](https://github.com/digicorp/propeller/commit/3267639): Removed the ripple effect animtion css class for Floating Action Button component.
+###### JS
+* [#f41df18](https://github.com/digicorp/propeller/commit/f41df18): Removed 'modal.js' file from modalbox component.
+
+
+#### Packages
+* [#f8efeb0](https://github.com/digicorp/propeller/commit/f8efeb0): Integrated Grunt with Propeller.
+ * [#e334be8](https://github.com/digicorp/propeller/commit/e334be8): Built NPM packages.
+* [#ecdad8b](https://github.com/digicorp/propeller/commit/ecdad8b): Built BOWER packages.
+ * Built NPM package for below third party components:
+ * [#3308812](https://github.com/digicorp/propeller/commit/3308812): Select2
+ * [#386750d](https://github.com/digicorp/propeller/commit/386750d): Range Slider
+ * [#2f2a2ee](https://github.com/digicorp/propeller/commit/2f2a2ee): Datetimepicker
+ * [#852726b](https://github.com/digicorp/propeller/commit/852726b): Data tables
+ * [#fe22e08](https://github.com/digicorp/propeller/commit/fe22e08): Custom Scroll
+
diff --git a/Gruntfile.js b/Gruntfile.js
index fb6b47a..7be98ef 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -25,13 +25,12 @@ module.exports = function(grunt) {
archive: 'archive',
assets: ['assets/css/propeller.css', 'assets/css/propeller.min.css' , 'assets/js/propeller.js', 'assets/js/propeller.min.js'],
},
-
- jshint: {
+ concat: {
options: {
- jshintrc: 'grunt/.jshintrc'
+ stripBanners: false
},
- core: {
- src: [
+ propellerJs: {
+ src: [
'components/textfield/js/textfield.js',
'components/checkbox/js/checkbox.js',
'components/radio/js/radio.js',
@@ -41,17 +40,9 @@ module.exports = function(grunt) {
'components/alert/js/alert.js',
'components/popover/js/popover.js',
'components/tab/js/tab-scrollable.js',
- 'components/sidebar/js/sidebar.js',
- ]
- }
- },
- concat: {
- options: {
- stripBanners: false
- },
- propellerJs: {
- src: '<%= jshint.core.src %>',
- dest: 'dist/js/<%= `pkg.grunt_name` %>.js'
+ 'components/sidebar/js/sidebar.js'
+ ],
+ dest: 'dist/js/<%= pkg.grunt_name %>.js'
},
propellerCss: {
src: [
@@ -83,36 +74,22 @@ module.exports = function(grunt) {
dest: 'dist/css/<%= pkg.grunt_name %>.css'
}
},
+ jshint: {
+ options: {
+ jshintrc: 'grunt/.jshintrc'
+ },
+ core: {
+ src: '<%= concat.propellerJs.src %>',
+ }
+ },
autoprefixer: {
options: {
browsers: ['last 2 versions', 'ie 9']
},
dist: {
files: {
- 'assets/css/propeller-roboto.css': 'assets/css/propeller-roboto.css',
- 'components/typography/css/typography.css': 'components/typography/css/typography.css',
- 'components/icons/css/google-icons.css':' components/icons/css/google-icons.css',
- 'components/card/css/card.css': 'components/card/css/card.css',
- 'components/accordion/css/accordion.css': 'components/accordion/css/accordion.css',
- 'components/alert/css/alert.css': 'components/alert/css/alert.css',
- 'components/badge/css/badge.css': 'components/badge/css/badge.css',
- 'components/button/css/button.css': 'components/button/css/button.css',
- 'components/modal/css/modal.css': 'components/modal/css/modal.css',
- 'components/dropdown/css/dropdown.css': 'components/dropdown/css/dropdown.css',
- 'components/textfield/css/textfield.css': 'components/textfield/css/textfield.css',
- 'components/checkbox/css/checkbox.css': 'components/checkbox/css/checkbox.css',
- 'components/radio/css/radio.css': 'components/radio/css/radio.css',
- 'components/toggle-switch/css/toggle-switch.css': 'components/toggle-switch/css/toggle-switch.css',
- 'components/list/css/list.css': 'components/list/css/list.css',
- 'components/navbar/css/navbar.css': 'components/navbar/css/navbar.css',
- 'components/popover/css/popover.css': 'components/popover/css/popover.css',
- 'components/progressbar/css/progressbar.css': 'components/progressbar/css/progressbar.css',
- 'components/sidebar/css/sidebar.css': 'components/sidebar/css/sidebar.css',
- 'components/tab/css/tab.css': 'components/tab/css/tab.css',
- 'components/table/css/table.css': 'components/table/css/table.css',
- 'components/tooltip/css/tooltip.css': 'components/tooltip/css/tooltip.css',
- 'components/floating-action-button/css/floating-action-button.css': 'components/floating-action-button/css/floating-action-button.css',
- 'components/utilities/css/utilities.css': 'components/utilities/css/utilities.css'
+ 'dist/css/propeller.css': 'dist/css/propeller.css',
+ 'dist/css/propeller.min.css': 'dist/css/propeller.min.css'
}
}
},
@@ -179,7 +156,7 @@ module.exports = function(grunt) {
files: {
src: '<%= cssmin.propellerMinCss.dest %>'
}
- },
+ }
},
csscomb: {
options: {
@@ -192,7 +169,6 @@ module.exports = function(grunt) {
dest: 'dist/css/'
}
},
-
copy: {
fonts: {
expand: true,
@@ -223,7 +199,6 @@ module.exports = function(grunt) {
dest: 'archive/pmd-admin-template-<%= pkg.version %>/',
}
},
-
processhtml: {
dist:{
options: {
@@ -232,15 +207,14 @@ module.exports = function(grunt) {
files: [
{
expand: true,
- cwd: 'archive/pmd-admin-template-1.0.0/',
+ cwd: 'archive/pmd-admin-template-1.1.0/',
src: ['*.html'],
- dest: 'archive/pmd-admin-template-1.0.0/',
+ dest: 'archive/pmd-admin-template-1.1.0/',
ext: '.html'
},
],
}
},
-
compress: {
distzip: {
options: {
@@ -319,12 +293,12 @@ module.exports = function(grunt) {
// make sure you have run npm install so our app can find these
grunt.loadNpmTasks('grunt-contrib-clean');
+ grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks("grunt-jscs");
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-watch');
- grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-csslint');
grunt.loadNpmTasks('grunt-autoprefixer');
grunt.loadNpmTasks('grunt-concat-css');
diff --git a/README.md b/README.md
index c0038f5..0f362ad 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,32 @@
-# Propeller Material Design
+
+ + + -Propeller is a front-end responsive framework -based on Google's Material Design Standards & Bootstrap. -It makes your website more attractive, consistent, and functionally powerful. +
+ A front-end responsive framework
+ based on Google's Material Design Standards & Bootstrap.
+ It makes your website more attractive, consistent, and functionally powerful.
+
+ Visit Propeller »
+