Merge pull request #319 from twbs/ZDroid-package-json-banner

Improve package.json and Gruntfile

Gruntfile.js

@@ -25,9 +25,9 @@ module.exports = function(grunt) {
             ' * =====================================================\n' +
             ' * Ratchet v<%= pkg.version %>\n' +
             ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
-            ' * Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
+            ' * Licensed under <%= pkg.license %>.\n' +
             ' *\n' +
-            ' * V<%= pkg.version %> designed by @connors.\n' +
+            ' * v<%= pkg.version %> designed by @connors.\n' +
             ' * =====================================================\n' +
             ' */\n',
 
@@ -79,15 +79,21 @@ module.exports = function(grunt) {
     },
 
     cssmin: {
-      combine: {
+      minify: {
+        options: {
+          banner: '', // set to empty ; see bellow
+          keepSpecialComments: '*', // set to '*' because we already add the banner in sass
+          report: 'min'
+        },
         files: {
-          'dist/<%= pkg.name %>.min.css': ['dist/<%= pkg.name %>.css']
+          'dist/<%= pkg.name %>.min.css': 'dist/<%= pkg.name %>.css'
         }
       }
     },
 
     uglify: {
       options: {
+        banner: '<%= banner %>',
         report: 'min'
       },
       ratchet: {
@@ -96,21 +102,6 @@ module.exports = function(grunt) {
       }
     },
 
-    usebanner: {
-      dist: {
-        options: {
-          position: 'top',
-          banner: '<%= banner %>'
-        },
-        files: {
-          src: [
-            'dist/<%= pkg.name %>.min.js',
-            'dist/<%= pkg.name %>.min.css'
-          ]
-        }
-      }
-    },
-
     watch: {
       scripts: {
         files: [
@@ -145,10 +136,9 @@ module.exports = function(grunt) {
   require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
 
   // Default task(s).
-  grunt.registerTask('banner', ['usebanner']);
   grunt.registerTask('dist-css', ['sass', 'cssmin']);
   grunt.registerTask('dist-js', ['concat', 'uglify']);
-  grunt.registerTask('dist', ['dist-css', 'dist-js', 'banner', 'copy']);
+  grunt.registerTask('dist', ['dist-css', 'dist-js', 'copy']);
   grunt.registerTask('validate-html', ['jekyll', 'validation']);
   grunt.registerTask('default', ['dist']);
   grunt.registerTask('build', ['dist']);

dist/ratchet-theme-android.css

@@ -2,9 +2,9 @@
  * =====================================================
  * Ratchet v2.0.0
  * Copyright 2014 Connor Sears
- * Licensed under http://www.opensource.org/licenses/MIT
+ * Licensed under MIT.
  *
- * V2.0.0 designed by @connors.
+ * v2.0.0 designed by @connors.
  * =====================================================
  */
 

dist/ratchet-theme-ios.css

@@ -2,9 +2,9 @@
  * =====================================================
  * Ratchet v2.0.0
  * Copyright 2014 Connor Sears
- * Licensed under http://www.opensource.org/licenses/MIT
+ * Licensed under MIT.
  *
- * V2.0.0 designed by @connors.
+ * v2.0.0 designed by @connors.
  * =====================================================
  */
 

dist/ratchet.css

@@ -2,9 +2,9 @@
  * =====================================================
  * Ratchet v2.0.0
  * Copyright 2014 Connor Sears
- * Licensed under http://www.opensource.org/licenses/MIT
+ * Licensed under MIT.
  *
- * V2.0.0 designed by @connors.
+ * v2.0.0 designed by @connors.
  * =====================================================
  */
 

dist/ratchet.js

@@ -2,9 +2,9 @@
  * =====================================================
  * Ratchet v2.0.0
  * Copyright 2014 Connor Sears
- * Licensed under http://www.opensource.org/licenses/MIT
+ * Licensed under MIT.
  *
- * V2.0.0 designed by @connors.
+ * v2.0.0 designed by @connors.
  * =====================================================
  */
 /* ----------------------------------

docs/assets/css/docs.css

@@ -2,9 +2,9 @@
  * =====================================================
  * Ratchet v2.0.0
  * Copyright 2014 Connor Sears
- * Licensed under http://www.opensource.org/licenses/MIT
+ * Licensed under MIT.
  *
- * V2.0.0 designed by @connors.
+ * v2.0.0 designed by @connors.
  * =====================================================
  */
 
@@ -76,13 +76,6 @@ body {
   transform: translateX(-50%);
 }
 
-.version {
-  margin-top: 15px;
-  text-align: center;
-  margin-bottom: 0;
-  color: #777;
-}
-
 .docs-nav .docs-nav-trigger {
   color: #fff;
   cursor: pointer;
@@ -156,9 +149,6 @@ body {
   -moz-transition: all 0.2s linear;
   transition: all 0.2s linear;
 }
-.docs-header-content .version {
-  color: #b983a6;
-}
 .docs-header-content .btn:hover {
   background-color: #fff;
   -webkit-box-shadow: 0 0 50px rgba(255, 255, 255, 0.3);

docs/dist/ratchet-theme-android.css

@@ -2,9 +2,9 @@
  * =====================================================
  * Ratchet v2.0.0
  * Copyright 2014 Connor Sears
- * Licensed under http://www.opensource.org/licenses/MIT
+ * Licensed under MIT.
  *
- * V2.0.0 designed by @connors.
+ * v2.0.0 designed by @connors.
  * =====================================================
  */
 

docs/dist/ratchet-theme-ios.css

@@ -2,9 +2,9 @@
  * =====================================================
  * Ratchet v2.0.0
  * Copyright 2014 Connor Sears
- * Licensed under http://www.opensource.org/licenses/MIT
+ * Licensed under MIT.
  *
- * V2.0.0 designed by @connors.
+ * v2.0.0 designed by @connors.
  * =====================================================
  */
 

docs/dist/ratchet.css

@@ -2,9 +2,9 @@
  * =====================================================
  * Ratchet v2.0.0
  * Copyright 2014 Connor Sears
- * Licensed under http://www.opensource.org/licenses/MIT
+ * Licensed under MIT.
  *
- * V2.0.0 designed by @connors.
+ * v2.0.0 designed by @connors.
  * =====================================================
  */
 

docs/dist/ratchet.js

@@ -2,9 +2,9 @@
  * =====================================================
  * Ratchet v2.0.0
  * Copyright 2014 Connor Sears
- * Licensed under http://www.opensource.org/licenses/MIT
+ * Licensed under MIT.
  *
- * V2.0.0 designed by @connors.
+ * v2.0.0 designed by @connors.
  * =====================================================
  */
 /* ----------------------------------

package.json

@@ -3,7 +3,6 @@
   "description": "Build native apps with simple HTML, CSS, and JS components.",
   "version": "2.0.0",
   "keywords": [
-    "ratchet",
     "css",
     "ios",
     "native",
@@ -20,15 +19,9 @@
   "bugs": {
     "url": "https://github.com/twbs/ratchet/issues"
   },
-  "licenses": [
+  "license": "MIT",
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
   "devDependencies": {
     "grunt": "~0.4.2",
-    "grunt-banner": "~0.2.0",
     "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-copy": "~0.5.0",
     "grunt-contrib-cssmin": "~0.8.0",