Merge branch 'master' of https://github.com/twbs/ratchet into android-no-carets

11 years ago · bf1776a74d
24 changed files with 109 additions and 47 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-goratchet.com
+goratchet.com
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -23,7 +23,7 @@ module.exports = function(grunt) {

    banner: '/*!\n' +
            ' * =====================================================\n' +
-            ' * Ratchet v<%= pkg.version %>\n' +
+            ' * Ratchet v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
            ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
            ' * Licensed under <%= pkg.license %>.\n' +
            ' *\n' +
@ -129,6 +129,17 @@ module.exports = function(grunt) {
      files: {
        src: '_site/**/*.html'
      }
+    },
+
+    sed: {
+      versionNumber: {
+        pattern: (function () {
+          var old = grunt.option('oldver');
+          return old ? RegExp.quote(old) : old;
+        })(),
+        replacement: grunt.option('newver'),
+        recursive: true
+      }
    }
  });

@ -142,4 +153,9 @@ module.exports = function(grunt) {
  grunt.registerTask('validate-html', ['jekyll', 'validation']);
  grunt.registerTask('default', ['dist']);
  grunt.registerTask('build', ['dist']);
+
+  // Version numbering task.
+  // grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
+  // This can be overzealous, so its changes should always be manually reviewed!
+  grunt.registerTask('change-version-number', 'sed');
 };
--- a/README.md
+++ b/README.md
@ -6,7 +6,7 @@ Build mobile apps with simple HTML, CSS, and JS components.

 - Clone the repo with `git clone https://github.com/twbs/ratchet.git` or just [download](http://github.com/twbs/ratchet/archive/v2.0.0.zip) the bundled CSS and JS
 - [Read the docs](http://goratchet.com) to learn about the components and how to get a prototype on your phone
- We will have example apps to check out very soon!
+- [Check out examples](http://goratchet.com/examples/)

 Take note that our master branch is our active, unstable development branch and that if you're looking to download a stable copy of the repo, check the [tagged downloads](https://github.com/twbs/ratchet/tags).

@ -37,11 +37,11 @@ Please file a GitHub issue to [report a bug](https://github.com/twbs/ratchet/iss
 A small list of "gotchas" are provided below for designers and developers starting to work with Ratchet

 - Ratchet is designed to respond to touch events from a mobile device. In order to use mouse click events (for desktop browsing and testing), you have a few options:
-    - Enable touch event emulation in Chrome (found in the overrides tab in the web inspector preferences)
-    - Use a JavaScript library like fingerblast.js to emulate touch events (ideally only loaded from desktop devices)
+  - Enable touch event emulation in Chrome (found in the overrides tab in the web inspector preferences)
+  - Use a JavaScript library like fingerblast.js to emulate touch events (ideally only loaded from desktop devices)
 - Script tags containing JavaScript will not be executed on pages that are loaded with push.js. If you would like to attach event handlers to elements on other pages, document-level event delegation is a common solution.
- Ratchet uses XHR requests to fetch additional pages inside the application. Due to security concerns, modern browsers prevent XHR requests when opening files locally (aka using the file:/// protocol); consequently, Ratchet does not work when opened directly as a file.
-    - A common solution to this is to simply serve the files from a local server. One convenient way to achieve this is to run ```python -m SimpleHTTPServer <port>``` to serve up the files in the current directory to ```http://localhost:<port>```
+- Ratchet uses XHR requests to fetch additional pages inside the application. Due to security concerns, modern browsers prevent XHR requests when opening files locally (aka using the file:// protocol); consequently, Ratchet does not work when opened directly as a file.
+  - A common solution to this is to simply serve the files from a local server. One convenient way to achieve this is to run ```python -m SimpleHTTPServer <port>``` to serve up the files in the current directory to ```http://localhost:<port>```

 ## Versioning

--- a/dist/ratchet-theme-android.css
+++ b/dist/ratchet-theme-android.css
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/dist/ratchet-theme-ios.css
+++ b/dist/ratchet-theme-ios.css
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/dist/ratchet.css
+++ b/dist/ratchet.css
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/dist/ratchet.js
+++ b/dist/ratchet.js
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/dist/ratchet.min.css
+++ b/dist/ratchet.min.css
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/dist/ratchet.min.js
+++ b/dist/ratchet.min.js
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/dist/template.html
+++ b/dist/template.html
@ -52,7 +52,7 @@
            </a>
          </li>
          <li class="table-view-cell">
-            <a class="push-right" href="https://goratchet.com">
+            <a class="push-right" href="https://github.com/twbs/ratchet/">
              <strong>Ratchet on Github</strong>
            </a>
          </li>
@ -62,7 +62,7 @@
            </a>
          </li>
          <li class="table-view-cell">
-            <a class="push-right" href="http://www.twitter.com/GoRatchet">
+            <a class="push-right" href="https://www.twitter.com/GoRatchet">
              <strong>Ratchet on Twitter</strong>
            </a>
          </li>
@ -71,4 +71,4 @@
    </div>

  </body>
-</html>
+</html>
--- a/docs/_includes/download-module.html
+++ b/docs/_includes/download-module.html
@ -2,5 +2,5 @@
  <h4 class="docs-module-title">Download Ratchet</h4>
  <p>If you haven't already, download the source code for Ratchet.</p>
  <a href="https://github.com/twbs/ratchet/archive/v2.0.0.zip" class="btn btn-block btn-primary" data-ignore="push" onClick="_gaq.push(['_trackEvent', 'Downloads', 'V2.0']);">Download Ratchet</a>
-  <p class="version">Currently v2.0.0</p>
+  <p>Currently v2.0.0</p>
 </div>
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@ -14,5 +14,15 @@
    </li>
  </ul>

-  <p class="docs-footer-content">Code licensed under the <a href="https://github.com/twbs/ratchet/blob/master/LICENSE" data-ignore="push">MIT License</a> and the docs are licensed under <a href="https://github.com/twbs/ratchet/blob/master/docs/LICENSE" data-ignore="push">CC BY 3.0</a>. Ratchet version 2.0.0 was lovingly crafted by <a href="https://twitter.com/connors" data-ignore="push">Connor Sears</a>.</p>
+  <p class="docs-footer-text">Code licensed under the <a href="https://github.com/twbs/ratchet/blob/master/LICENSE" data-ignore="push">MIT License</a> and the docs are licensed under <a href="https://github.com/twbs/ratchet/blob/master/docs/LICENSE" data-ignore="push">CC BY 3.0</a>. Ratchet was lovingly crafted by <a href="https://twitter.com/connors" data-ignore="push">Connor Sears</a>.</p>
+
+  <ul class="docs-footer-links">
+    <li>Currently v2.0.0</li>
+    <li>&middot;</li>
+    <li><a href="https://github.com/twbs/ratchet/issues" data-ignore="push">Issues</a></li>
+    <li>&middot;</li>
+    <li><a href="https://github.com/twbs/ratchet/releases" data-ignore="push">Releases</a></li>
+    <li>&middot;</li>
+    <li><a href="http://goratchet.com/1.0.2/" data-ignore="push">Legacy v1.0.2 Docs</a></li>
+  </ul>
 </div>
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
@ -305,6 +305,8 @@ body {
  margin-top: 50px;
  padding-top: 30px;
  padding-bottom: 30px;
+  color: #777;
+  font-size: 14px;
  text-align: center;
 }
 .docs-footer .social {
@ -321,10 +323,24 @@ body {
  margin-top: 5px;
 }

-.docs-footer-content {
-  margin: 0;
-  color: #777;
-  font-size: 12px;
+.docs-footer-text {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+@media screen and (min-width: 768px) {
+  .docs-footer-text {
+    width: 550px;
+    margin: 0 auto;
+  }
+}
+.docs-footer-links {
+  padding-left: 0;
+}
+.docs-footer-links li {
+  display: inline;
+  padding-left: 3px;
+  padding-right: 3px;
 }

 .docs-header .docs-footer {
@ -335,11 +351,12 @@ body {
  margin-top: 0;
  border-top: 1px solid rgba(255, 255, 255, 0.1);
 }
-.docs-header .docs-footer .docs-footer-content {
+.docs-header .docs-footer .docs-footer-text,
+.docs-header .docs-footer .docs-footer-links {
  color: rgba(255, 255, 255, 0.5);
 }
-.docs-header .docs-footer .docs-footer-content a {
-  font-weight: bold;
+.docs-header .docs-footer .docs-footer-text a,
+.docs-header .docs-footer .docs-footer-links a {
  color: rgba(255, 255, 255, 0.8);
 }

@ -643,10 +660,10 @@ hr {

@media screen and (min-width: 768px) {
  .docs-header {
-    min-height: 830px;
+    min-height: 870px;
  }
  .docs-header .carbonad {
-    bottom: 180px !important;
+    bottom: 259px !important;
    left: 50% !important;
    margin-left: -165px !important;
  }
@ -675,7 +692,7 @@ hr {
  }

  .docs-header-content {
-    top: 32%;
+    top: 30%;
    -webkit-transform: translateY(-50%);
    -ms-transform: translateY(-50%);
    transform: translateY(-50%);
--- a/docs/dist/ratchet-theme-android.css
+++ b/docs/dist/ratchet-theme-android.css
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/docs/dist/ratchet-theme-ios.css
+++ b/docs/dist/ratchet-theme-ios.css
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/docs/dist/ratchet.css
+++ b/docs/dist/ratchet.css
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/docs/dist/ratchet.js
+++ b/docs/dist/ratchet.js
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/docs/dist/ratchet.min.css
+++ b/docs/dist/ratchet.min.css
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/docs/dist/ratchet.min.js
+++ b/docs/dist/ratchet.min.js
@ -1,6 +1,6 @@
 /*!
 * =====================================================
- * Ratchet v2.0.0
+ * Ratchet v2.0.0 (http://goratchet.com)
 * Copyright 2014 Connor Sears
 * Licensed under MIT.
 *
--- a/docs/index.html
+++ b/docs/index.html
@ -8,7 +8,7 @@ title: Ratchet
  <div class="docs-header-content">
    <p class="docs-subtitle">Build mobile apps with simple HTML&#8218; CSS&#8218; and JS components.</p>
    <a data-ignore="push" href="https://github.com/twbs/ratchet/archive/v2.0.0.zip" class="btn btn-primary" onClick="_gaq.push(['_trackEvent', 'Downloads', 'V2.0']);">Download Ratchet</a>
-    <p class="version">Currently v2.0.0</p>
+    <p>Currently v2.0.0</p>
  </div>

  {% include ad.html %}
--- a/docs/one.html
+++ b/docs/one.html
@ -10,7 +10,7 @@
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <link rel="stylesheet" href="../dist/ratchet.css">
-    <!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+    <!--[if lt IE 9]><script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]-->
    <link rel="apple-touch-icon-precomposed" sizes="512x512" href="img/apple-touch-icon-512x512.png">
  </head>
  <body ontouchstart="">
--- a/docs/two.html
+++ b/docs/two.html
@ -10,7 +10,7 @@
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <link rel="stylesheet" href="../dist/ratchet.css">
-    <!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+    <!--[if lt IE 9]><script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]-->
    <link rel="apple-touch-icon-precomposed" sizes="512x512" href="img/apple-touch-icon-512x512.png">
  </head>
  <body ontouchstart="">
--- a/package.json
+++ b/package.json
@ -32,6 +32,7 @@
    "grunt-contrib-watch": "~0.5.3",
    "grunt-html-validation": "~0.1.13",
    "grunt-jekyll": "~0.4.1",
+    "grunt-sed": "~0.1.1",
    "load-grunt-tasks": "~0.4.0"
  }
 }
--- a/sass/docs.scss
+++ b/sass/docs.scss
@ -296,6 +296,8 @@ body {
  margin-top: 50px;
  padding-top: 30px;
  padding-bottom: 30px;
+  color: #777;
+  font-size: 14px;
  text-align: center;

  .social {
@ -313,11 +315,27 @@ body {
    }
  }
 }
-.docs-footer-content {
-  margin: 0;
-  color: #777;
-  font-size: 12px;
+.docs-footer-text {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+@media screen and (min-width: 768px) {
+  .docs-footer-text {
+    width: 550px;
+    margin: 0 auto;
+  }
 }
+.docs-footer-links {
+  padding-left: 0;
+
+  li {
+    display: inline;
+    padding-left: 3px;
+    padding-right: 3px;
+  }
+}
+
+// Overrides for the homepage's footer
 .docs-header .docs-footer {
  position: absolute;
  bottom: 0;
@ -326,11 +344,11 @@ body {
  margin-top: 0;
  border-top: 1px solid rgba(255,255,255,.1);

-  .docs-footer-content {
+  .docs-footer-text,
+  .docs-footer-links {
    color: rgba(255,255,255,.5);

    a {
-      font-weight: bold;
      color: rgba(255,255,255,.8);
    }
  }
@ -656,11 +674,11 @@ hr {
 // Tablet to desktop
@media screen and (min-width: 768px) {
  .docs-header {
-    min-height: 830px;
+    min-height: 870px;

    // Ads on the homepage
    .carbonad {
-      bottom: 180px !important;
+      bottom: 259px !important;
      left: 50% !important;
      margin-left: -165px !important;
    }
@ -682,7 +700,7 @@ hr {
    @include transform(translateX(0));
  }
  .docs-header-content {
-    top: 32%;
+    top: 30%;
    @include transform(translateY(-50%));

    .btn {