From 728615eaa862e4d19cfec53107769e1fe2c7c421 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Feb 2014 18:32:41 -0800 Subject: [PATCH 01/13] add docs footer links refs #267 --- docs/_includes/footer.html | 10 ++++++++++ docs/assets/css/docs.css | 4 ++++ sass/docs.scss | 3 +++ 3 files changed, 17 insertions(+) diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index d3987fc..8e59dcf 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -15,4 +15,14 @@

Code licensed under the MIT license and the docs are licensed under CC BY 3.0. Ratchet version 2.0.0 was lovingly crafted by Connor Sears.

+ + diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index e2b1564..61a75d2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -343,6 +343,10 @@ body { color: rgba(255, 255, 255, 0.8); } +.docs-footer-links li { + display: inline; +} + .docs-component-toolbar { padding-top: 8px; padding-bottom: 8px; diff --git a/sass/docs.scss b/sass/docs.scss index 4132276..5f6b8a7 100644 --- a/sass/docs.scss +++ b/sass/docs.scss @@ -335,6 +335,9 @@ body { } } } +.docs-footer-links li { + display: inline; +} // Platform toggle From 2cafa32298dd67c2657606a4bfc75a1b651a4cac Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 26 Feb 2014 12:27:33 -0800 Subject: [PATCH 02/13] use updated HTTPS html5shiv URL --- docs/one.html | 2 +- docs/two.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/one.html b/docs/one.html index ff13d4e..4b8afeb 100644 --- a/docs/one.html +++ b/docs/one.html @@ -10,7 +10,7 @@ - + diff --git a/docs/two.html b/docs/two.html index 746828d..e0be407 100644 --- a/docs/two.html +++ b/docs/two.html @@ -10,7 +10,7 @@ - + From b3860d19323df7c6de659e5231b85d4a09fa7c08 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Feb 2014 18:40:53 -0800 Subject: [PATCH 03/13] import change-version-number Grunt task from Bootstrap --- Gruntfile.js | 16 ++++++++++++++++ package.json | 1 + 2 files changed, 17 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 9b6849d..ef4bf5c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -138,6 +138,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 + } } }); @@ -152,4 +163,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'); }; diff --git a/package.json b/package.json index b0fc230..d81ccda 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,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" } } From 2822d00cfa890471d8c2b06c5af59dd19b663d74 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 27 Feb 2014 08:41:45 +0200 Subject: [PATCH 04/13] Remove unused class. --- docs/_includes/download-module.html | 2 +- docs/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_includes/download-module.html b/docs/_includes/download-module.html index a6f4d80..318855f 100644 --- a/docs/_includes/download-module.html +++ b/docs/_includes/download-module.html @@ -2,5 +2,5 @@

Download Ratchet

If you haven't already, download the source code for Ratchet.

Download Ratchet -

Currently v2.0.0

+

Currently v2.0.0

\ No newline at end of file diff --git a/docs/index.html b/docs/index.html index cd90959..e637f87 100644 --- a/docs/index.html +++ b/docs/index.html @@ -8,7 +8,7 @@ title: Ratchet

Build mobile apps with simple HTML‚ CSS‚ and JS components.

Download Ratchet -

Currently v2.0.0

+

Currently v2.0.0

{% include ad.html %} From efce3d45777cb2fee29b05f6b20974f5819f774a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 27 Feb 2014 13:46:43 +0100 Subject: [PATCH 05/13] Insert final newline in CNAME Just to follow `.editorconfig`. --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 987e0cb..aff77b6 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -goratchet.com \ No newline at end of file +goratchet.com From a126f27496e2b9fa850818205ad4ab9469b4e899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 27 Feb 2014 13:49:40 +0100 Subject: [PATCH 06/13] Remove third slash in "file:///" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f816b7..263f3da 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ A small list of "gotchas" are provided below for designers and developers starti - 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. +- 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 ``` to serve up the files in the current directory to ```http://localhost:``` ## Versioning From 8a1cca2f228fbafbf489639e9dbd9cc40bf74f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 27 Feb 2014 13:53:31 +0100 Subject: [PATCH 07/13] Add examples link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 263f3da..ad0a8af 100644 --- 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). From 90090e09d5dff721bf57142ab383464085290f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 27 Feb 2014 13:55:16 +0100 Subject: [PATCH 08/13] Correct lists indent --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ad0a8af..90f52bb 100644 --- a/README.md +++ b/README.md @@ -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 ``` to serve up the files in the current directory to ```http://localhost:``` + - 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 ``` to serve up the files in the current directory to ```http://localhost:``` ## Versioning From 711bd3231cff217102f3cf3cc6869f7214e3b55c Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 27 Feb 2014 22:04:08 +0900 Subject: [PATCH 09/13] Update template.html Updated Twitter URL to https (saves a HTTP redirect as all Twitter pages served over https anyway) --- dist/template.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/template.html b/dist/template.html index 6416b7c..92139d3 100644 --- a/dist/template.html +++ b/dist/template.html @@ -62,7 +62,7 @@
  • - + Ratchet on Twitter
    • @@ -71,4 +71,4 @@ - \ No newline at end of file + From c02976257ca4fd81d09d89e5364debff1edf35f3 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 27 Feb 2014 22:05:47 +0900 Subject: [PATCH 10/13] Update template.html Add correct URL for 'Ratchet on Github' --- dist/template.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/template.html b/dist/template.html index 6416b7c..f9ddca0 100644 --- a/dist/template.html +++ b/dist/template.html @@ -52,7 +52,7 @@
  • - + Ratchet on Github
    • @@ -71,4 +71,4 @@ - \ No newline at end of file + From e3d580e62b98443e4d32c496a55bf610b4dc656c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 27 Feb 2014 19:28:31 -0800 Subject: [PATCH 11/13] add link to project website in banner comments; fixes #297 --- Gruntfile.js | 2 +- dist/ratchet-theme-android.css | 2 +- dist/ratchet-theme-ios.css | 2 +- dist/ratchet.css | 2 +- dist/ratchet.js | 2 +- dist/ratchet.min.css | 2 +- dist/ratchet.min.js | 2 +- docs/assets/css/docs.css | 2 +- docs/dist/ratchet-theme-android.css | 2 +- docs/dist/ratchet-theme-ios.css | 2 +- docs/dist/ratchet.css | 2 +- docs/dist/ratchet.js | 2 +- docs/dist/ratchet.min.css | 2 +- docs/dist/ratchet.min.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 92fea4b..7ab765d 100644 --- 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' + diff --git a/dist/ratchet-theme-android.css b/dist/ratchet-theme-android.css index 76b1199..08d85b0 100644 --- 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. * diff --git a/dist/ratchet-theme-ios.css b/dist/ratchet-theme-ios.css index d07c9e0..e268d38 100644 --- 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. * diff --git a/dist/ratchet.css b/dist/ratchet.css index a948031..741a5ae 100644 --- 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. * diff --git a/dist/ratchet.js b/dist/ratchet.js index 1cc9ccd..4372a7b 100644 --- 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. * diff --git a/dist/ratchet.min.css b/dist/ratchet.min.css index a2d1b3c..d17e9cd 100644 --- 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. * diff --git a/dist/ratchet.min.js b/dist/ratchet.min.js index 8c467e9..6c3332d 100644 --- 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. * diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f3c8b26..7943b08 100644 --- 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. * diff --git a/docs/dist/ratchet-theme-android.css b/docs/dist/ratchet-theme-android.css index 76b1199..08d85b0 100644 --- 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. * diff --git a/docs/dist/ratchet-theme-ios.css b/docs/dist/ratchet-theme-ios.css index d07c9e0..e268d38 100644 --- 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. * diff --git a/docs/dist/ratchet.css b/docs/dist/ratchet.css index a948031..741a5ae 100644 --- 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. * diff --git a/docs/dist/ratchet.js b/docs/dist/ratchet.js index 1cc9ccd..4372a7b 100644 --- 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. * diff --git a/docs/dist/ratchet.min.css b/docs/dist/ratchet.min.css index a2d1b3c..d17e9cd 100644 --- 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. * diff --git a/docs/dist/ratchet.min.js b/docs/dist/ratchet.min.js index 8c467e9..6c3332d 100644 --- 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. * From 1097799cae7e9ca295336700b95dc6b9bdcf9e34 Mon Sep 17 00:00:00 2001 From: connors Date: Thu, 27 Feb 2014 21:44:46 -0800 Subject: [PATCH 12/13] makin dem links look good. --- docs/_includes/footer.html | 6 +++--- docs/assets/css/docs.css | 41 +++++++++++++++++++++++++------------- sass/docs.scss | 39 +++++++++++++++++++++++++----------- 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 8e59dcf..e99a1a7 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -14,14 +14,14 @@ -

    Code licensed under the MIT license and the docs are licensed under CC BY 3.0. Ratchet version 2.0.0 was lovingly crafted by Connor Sears.

    +

    Code licensed under the MIT license and the docs are licensed under CC BY 3.0. Ratchet version 2.0.0 was lovingly crafted by Connor Sears.

    diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 61a75d2..ab2a019 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -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,18 +351,15 @@ 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); } -.docs-footer-links li { - display: inline; -} - .docs-component-toolbar { padding-top: 8px; padding-bottom: 8px; @@ -643,10 +656,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 +688,7 @@ hr { } .docs-header-content { - top: 32%; + top: 30%; -webkit-transform: translateY(-50%); -ms-transform: translateY(-50%); transform: translateY(-50%); diff --git a/sass/docs.scss b/sass/docs.scss index 5f6b8a7..ff9fb3a 100644 --- 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,18 +344,15 @@ 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); } } } -.docs-footer-links li { - display: inline; -} // Platform toggle @@ -655,11 +670,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; } @@ -681,7 +696,7 @@ hr { @include transform(translateX(0)); } .docs-header-content { - top: 32%; + top: 30%; @include transform(translateY(-50%)); .btn { From 1dbf64686f9c7cf754fb65651ff113e40bf38f02 Mon Sep 17 00:00:00 2001 From: connors Date: Thu, 27 Feb 2014 22:15:48 -0800 Subject: [PATCH 13/13] removed --- docs/_includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 8a429d0..e9df6a9 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -14,7 +14,7 @@ -

    Code licensed under the MIT License and the docs are licensed under CC BY 3.0. Ratchet version 2.0.0 was lovingly crafted by Connor Sears.

    +

    Code licensed under the MIT License and the docs are licensed under CC BY 3.0. Ratchet was lovingly crafted by Connor Sears.

    • Currently v2.0.0