Browse Source

Merge branch 'master' into borders

pull/505/head
connors 11 years ago
parent
commit
cfe1740ac2
  1. 10
      bower.json
  2. 2
      dist/js/ratchet.js
  3. 2
      docs/_includes/header.html
  4. 2
      docs/dist/js/ratchet.js
  5. 2
      js/push.js
  6. 1
      package.json

10
bower.json

@ -1,6 +1,16 @@
{ {
"name": "ratchet", "name": "ratchet",
"description": "Build mobile apps with simple HTML, CSS, and JS components.",
"version": "2.0.1", "version": "2.0.1",
"keywords": [
"css",
"js",
"fonts",
"ios",
"android",
"mobile",
"prototype"
],
"main": [ "main": [
"./dist/css/ratchet.css", "./dist/css/ratchet.css",
"./dist/js/ratchet.js" "./dist/js/ratchet.js"

2
dist/js/ratchet.js vendored

@ -148,7 +148,7 @@
var noop = function () {}; var noop = function () {};
// Pushstate cacheing // Pushstate caching
// ================== // ==================
var isScrolling; var isScrolling;

2
docs/_includes/header.html

@ -9,7 +9,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<!-- Google Web Fonts --> <!-- 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="/dist/css/ratchet.min.css">
<link rel="stylesheet" href="/assets/css/docs.min.css"> <link rel="stylesheet" href="/assets/css/docs.min.css">

2
docs/dist/js/ratchet.js vendored

@ -148,7 +148,7 @@
var noop = function () {}; var noop = function () {};
// Pushstate cacheing // Pushstate caching
// ================== // ==================
var isScrolling; var isScrolling;

2
js/push.js

@ -13,7 +13,7 @@
var noop = function () {}; var noop = function () {};
// Pushstate cacheing // Pushstate caching
// ================== // ==================
var isScrolling; var isScrolling;

1
package.json

@ -4,6 +4,7 @@
"version": "2.0.1", "version": "2.0.1",
"keywords": [ "keywords": [
"css", "css",
"fonts",
"ios", "ios",
"android", "android",
"mobile", "mobile",

Loading…
Cancel
Save