Merge branch 'master' into borders

11 years ago · cfe1740ac2
6 changed files with 15 additions and 4 deletions
--- a/bower.json
+++ b/bower.json
@ -1,6 +1,16 @@
 {
  "name": "ratchet",
+  "description": "Build mobile apps with simple HTML, CSS, and JS components.",
  "version": "2.0.1",
+  "keywords": [
+    "css",
+    "js",
+    "fonts",
+    "ios",
+    "android",
+    "mobile",
+    "prototype"
+  ],
  "main": [
    "./dist/css/ratchet.css",
    "./dist/js/ratchet.js"
--- a/dist/js/ratchet.js
+++ b/dist/js/ratchet.js
@ -148,7 +148,7 @@
  var noop = function () {};


-  // Pushstate cacheing
+  // Pushstate caching
  // ==================

  var isScrolling;
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@ -9,7 +9,7 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black">

 <!-- Google Web Fonts -->
-<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,500,700|Open+Sans:300,400">
+<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,500,700|Open+Sans:400,300">

 <link rel="stylesheet" href="/dist/css/ratchet.min.css">
 <link rel="stylesheet" href="/assets/css/docs.min.css">
--- a/docs/dist/js/ratchet.js
+++ b/docs/dist/js/ratchet.js
@ -148,7 +148,7 @@
  var noop = function () {};


-  // Pushstate cacheing
+  // Pushstate caching
  // ==================

  var isScrolling;
--- a/js/push.js
+++ b/js/push.js
@ -13,7 +13,7 @@
  var noop = function () {};


-  // Pushstate cacheing
+  // Pushstate caching
  // ==================

  var isScrolling;
--- a/package.json
+++ b/package.json
@ -4,6 +4,7 @@
  "version": "2.0.1",
  "keywords": [
    "css",
+    "fonts",
    "ios",
    "android",
    "mobile",