Merge pull request #13 from digicorp/dev

Updated Readme, Added CHANGELOG and Rectified admin template download path.

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 <code>data-duration</code> attribute in Alert component to customize alert visibility time . 
+* Removed <code>modal.js</code> 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
+

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');

README.md

@@ -1,8 +1,32 @@
-# Propeller Material Design
+<p align="center">
+  <a href="http://propeller.in/">
+    <img src="http://propeller.in/assets/landing-page/images/banner-propeller-logo.png" />
+  </a>
 
-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.
+  <h3 align="center">Propeller</h3>
+
+  <p align="center">
+    A front-end responsive framework 
+    based on Google's Material Design Standards & Bootstrap.
+    It makes your website more attractive, consistent, and functionally powerful.
+    <br>
+    <a href="http://propeller.in/"><strong>Visit Propeller &raquo;</strong></a>
+  </p>
+</p>
+
+<br>
+
+## Table of contents
+
+- [Key Features](#key-features)
+- [Quick start](#quick-start)
+- [Propeller Guideline](#propeller-guideline)
+- [What's included](#whats-included)
+- [Browser Support](#browser-support)
+- [Bugs and feature requests](#bugs-and-feature-requests)
+- [Community](#community)
+- [License](#license)
+- [Author](#author)
 
 
 ## Key Features
@@ -14,11 +38,50 @@ It makes your website more attractive, consistent, and functionally powerful.
 - Detailed User Manual which provides step by step usage of propeller UI elements.
 
 
+## Quick start
+
+Several quick start options are available:
+
+- [Download the latest release.](https://github.com/digicorp/propeller/blob/master/archive/pmd-1.1.0.zip)
+- Clone the repo: `git clone https://github.com/propeller.git`
+- Install with Bower: `bower install propeller`
+- Install with npm: `npm install propellerkit`
+- Install Select2 with npm: `npm install propellerkit-select2`
+- Install range slider with npm: `npm install propellerkit-range-slider`
+- Install datetimepicker with npm: `npm install propellerkit-datetimepicker`
+- Install datatables with npm: `npm install propellerkit-datatables`
+
+
 ## Propeller Guideline
 
 Follow our [Guidelines](http://propeller.in/docs/index.php) and get familiar with the basic setup and structure of Propeller.
 
 
+## What's included
+
+Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations. You'll see something like this:
+
+```
+Propeller/
+├── css/
+│    ├── bootstrap.css
+│    ├── bootstrap.min.css
+│    ├── propeller.css
+│    ├── propeller.min.css
+├── js/
+│    ├── jquery.min.js
+│    ├── bootstrap.js
+│    ├── bootstrap.min.js
+│    ├── propeller.js
+│    ├── propeller.min.js
+├── fonts/
+│    ├── roboto/
+└── index.html
+```
+
+Just copy the compiled CSS and JS files and the font files(created for icons) from the .zip and add them to your project.
+
+
 ## Browser Support
 
 - Firefox, Chrome, Safari Mac
@@ -27,6 +90,27 @@ Follow our [Guidelines](http://propeller.in/docs/index.php) and get familiar wit
 - iOS Safari 7+
 
 
+## Bugs and feature requests
+
+Came over any bug or issue? Post them on [GITHUB](https://github.com/digicorp/propeller/issues).
+Have feedback, suggestions or Questions? Join [GITTER CHAT ROOM](https://gitter.im/Propeller-Material-Design-Bootstrap-Framework/Support).
+
+
+## Community
+
+Get updates on Propeller's development and chat with the project maintainers and community members.
+
+- Follow [@propellerkit on Twitter](https://twitter.com/PropellerKit).
+- Chat with fellow members on [GITTER](https://gitter.im/Propeller-Material-Design-Bootstrap-Framework/Support).
+
+
+## Versioning
+
+For transparency into our release cycle and in striving to maintain backward compatibility, Propeller is maintained under [the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.
+
+See [the Releases section of our GitHub project](https://github.com/digicorp/propeller/releases) for changelogs for each release version of Propeller.
+
+
 ## License
 
 Propeller v1.0.0 (http://propeller.in)

bower.json

@@ -1,26 +1,32 @@
 {
   "name": "propeller",
-  "version": "0.0.4",
+  "description": "Propeller is a front-end responsive framework based on Google's Material Design Standards & Bootstrap.",
+  "keywords": [
+  	"css",
+  	"js",
+  	"mobile-first",
+  	"responsive",
+  	"front-end",
+  	"framework",
+  	"web"
+  ],
+  "version": "0.0.5",
   "homepage": "http://propeller.in/",
   "authors": [
     "Digicorp, Inc"
   ],
-  "description": "Propeller is a front-end responsive framework based on Google's Material Design Standards & Bootstrap.",
-  "main": "dist\\js\\propeller.js",
-  "keywords": [
-   "css",
-  "js",
-  "mobile-first",
-  "responsive",
-  "front-end",
-  "framework",
-  "web"
+  "main": [
+    "dist/css/propeller.css",
+    "dist/js/propeller.js"
   ],
   "license": "MIT",
   "ignore": [
     "archive",
+	"assets",
+	".gitignore",
+	".npmignore",
     "templates",
-	   "components/*/snippets/**"
+	"components/*/snippets/**"
   ],
   "dependencies": {
     "bootstrap": "^3.0.0",