From 975018665c84042062c694d27d0b6b17d37273f1 Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Wed, 30 Dec 2015 21:08:50 +0100 Subject: [PATCH 1/7] Update design_goals.yml --- website/src/_data/design_goals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/website/src/_data/design_goals.yml b/website/src/_data/design_goals.yml index 6b4c4683e..eabe27f29 100644 --- a/website/src/_data/design_goals.yml +++ b/website/src/_data/design_goals.yml @@ -4,6 +4,7 @@ - "Resumable file uploads via the open tus standard" - "Robust: retries for all-the-things, avoid showing ‘weird errors’" - "Themable UI with a beautiful default" + - "i18n support: Easily switch languages or supply your own copy" - "Compatible with React (Native)" - "Works great on mobile" - "Small core, modular architecture. Everything is a plugin" From 15298c1a80c9fdc5d086ced50e21f44e78a70f5e Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Thu, 31 Dec 2015 14:24:16 +0100 Subject: [PATCH 2/7] Improve copy now that we're linking to it already --- website/_config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/_config.yml b/website/_config.yml index a9414a8e1..ab23323df 100644 --- a/website/_config.yml +++ b/website/_config.yml @@ -20,9 +20,9 @@ logo_large: /images/uppy.svg logo_medium: /images/uppy.svg logo_icon: /images/uppy.png description_primary: > - JavaScript file uploader that fetches files from Dropbox, Instagram, local disk, remote URLs, and other exciting locations. - Plugin-based architecture, first-class support for resumable uploads via tus.io - and custom encoding backends make it very extensible and robust. + Uppy is (going to be) a JavaScript file uploader that fetches files from Dropbox, Instagram, local disk, remote URLs, and other exciting locations. + It has a Plugin-based architecture, first-class support for resumable uploads via tus.io + and custom encoding backends, making it very extensible and robust. description_secondary: > Uppy (almost as cute as a puppy) is brought to you by the people behind Transloadit and as such has first class support for adding their uploading and encoding backend, but this is opt-in, and you can just as easily From 5a704af19639ffbeebe920ed16b78f99e16a2ee5 Mon Sep 17 00:00:00 2001 From: Artur Paikin Date: Sun, 3 Jan 2016 13:19:56 -0500 Subject: [PATCH 3/7] Refactoring, improvements and cleanup --- website/documentation.js | 12 -- website/themes/uppy/layout/example.ejs | 2 +- website/themes/uppy/layout/index.ejs | 2 - website/themes/uppy/layout/layout.ejs | 13 +- website/themes/uppy/layout/page.ejs | 2 +- .../themes/uppy/layout/partials/main_menu.ejs | 5 +- .../themes/uppy/layout/partials/sidebar.ejs | 2 +- website/themes/uppy/source/css/_common.scss | 155 +++++++++++++++--- website/themes/uppy/source/css/_page.scss | 136 ++------------- website/themes/uppy/source/js/common.js | 40 +++-- 10 files changed, 191 insertions(+), 178 deletions(-) diff --git a/website/documentation.js b/website/documentation.js index 19e71283a..4e733b876 100644 --- a/website/documentation.js +++ b/website/documentation.js @@ -21,15 +21,3 @@ documentation('../src/index.js', {order: docOrder}, function (err, comments) { console.info(chalk.green('✓ documentation generated')); }); }); - -// var remark = require('remark'); -// var inputMarkdownContent = fs.readFileSync('src/api/docs.md', 'utf-8'); -// var docjsReadme = require('documentation-readme/lib/plugin'); -// remark().use(docjsReadme, { -// section: 'Uppy Core & Plugins', // inject into the ## Usage section of the input doc -// documentationArgs: [ '../src/index.js' ] -// }).process(inputMarkdownContent, function (err, vfile, content) { -// fs.writeFileSync('src/api/docs.md', content); -// // console.log(content); -// console.log('documentation generated'); -// }); diff --git a/website/themes/uppy/layout/example.ejs b/website/themes/uppy/layout/example.ejs index 964f5aebb..698431205 100644 --- a/website/themes/uppy/layout/example.ejs +++ b/website/themes/uppy/layout/example.ejs @@ -1,5 +1,5 @@ <%- partial('partials/sidebar', { type: page.type, index: page.index }) %> -
+

<%- page.title %> Example

diff --git a/website/themes/uppy/layout/layout.ejs b/website/themes/uppy/layout/layout.ejs index b1e37d58e..348f2aad7 100644 --- a/website/themes/uppy/layout/layout.ejs +++ b/website/themes/uppy/layout/layout.ejs @@ -17,15 +17,12 @@
- +