Merge branch 'master' into optimize_docs_fonts

Gruntfile.js

@@ -83,6 +83,7 @@ module.exports = function(grunt) {
       options: {
         banner: '', // set to empty; see bellow
         keepSpecialComments: '*', // set to '*' because we already add the banner in sass
+        noAdvanced: true, // disable advanced optimizations since it causes many issues
         report: 'min'
       },
       ratchet: {
@@ -90,9 +91,6 @@ module.exports = function(grunt) {
         dest: '<%= meta.distPath %><%= pkg.name %>.min.css'
       },
       docs: {
-        options: {
-          noAdvanced: true  // disable advanced optimizations since it causes code highlighting not to work
-        },
         src: [
           '<%= meta.docsAssetsPath %>css/docs.css',
           '<%= meta.docsAssetsPath %>css/pygments-manni.css'

docs/components.html

@@ -152,7 +152,7 @@ title: Components · Ratchet
           </button>
           <button class="btn pull-right">
             Right
-          </a>
+          </button>
           <div class="segmented-control">
             <a class="control-item active">One</a>
             <a class="control-item">Two</a>
@@ -165,7 +165,7 @@ title: Components &middot; Ratchet
 <header class="bar bar-nav">
   <button class="btn pull-left">
     Left
-  </a>
+  </button>
   <button class="btn pull-right">
     Right
   </button>
@@ -750,7 +750,7 @@ title: Components &middot; Ratchet
       <button class="btn btn-negative">Button</button>
       <button class="btn btn-link">Button</button>
 
-      <button class="btn btn-outlined">Button</a>
+      <button class="btn btn-outlined">Button</button>
       <button class="btn btn-primary btn-outlined">Button</button>
       <button class="btn btn-positive btn-outlined">Button</button>
       <button class="btn btn-negative btn-outlined">Button</button>
@@ -763,7 +763,7 @@ title: Components &middot; Ratchet
 <button class="btn btn-negative">Button</button>
 <button class="btn btn-link">Button</button>
 
-<button class="btn btn-outlined">Button</a>
+<button class="btn btn-outlined">Button</button>
 <button class="btn btn-primary btn-outlined">Button</button>
 <button class="btn btn-positive btn-outlined">Button</button>
 <button class="btn btn-negative btn-outlined">Button</button>

package.json

@@ -1,11 +1,12 @@
 {
   "name": "ratchet",
-  "description": "Build native apps with simple HTML, CSS, and JS components.",
+  "description": "Build mobile apps with simple HTML, CSS, and JS components.",
   "version": "2.0.0",
   "keywords": [
     "css",
     "ios",
-    "native",
+    "android",
+    "mobile",
     "prototype"
   ],
   "homepage": "http://goratchet.com",