From b160b2e5fd43042b18a754886111f0a81e3e4ac6 Mon Sep 17 00:00:00 2001 From: Nathan Bingham Date: Tue, 5 May 2015 16:25:00 -0400 Subject: [PATCH 1/3] Copy and badge updates Updates per client * Update the stable branch to keep version number in sync. Used badge.fury.io. * Update the development branch to v0.2.0 * Add -g to all installation references * Remove grunt step from home page * Tweak homepage "latest version" section to take advantage of pure css --- app/styles/_modules/_m-build-process.scss | 4 ++-- app/styles/_modules/_m-latest-version.scss | 6 +++++- app/templates/documentation.hbs | 2 +- app/templates/index.hbs | 23 ++++++++++------------ 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/app/styles/_modules/_m-build-process.scss b/app/styles/_modules/_m-build-process.scss index 80d20f9f0..d86a02a05 100644 --- a/app/styles/_modules/_m-build-process.scss +++ b/app/styles/_modules/_m-build-process.scss @@ -6,6 +6,6 @@ .build-process .title { font-size: 22px; text-align: right; - margin: 1.125rem 1.875rem 1.125rem 5rem; + margin: 0.45rem 1.875rem 1.125rem 5rem; line-height:1.2em; -} \ No newline at end of file +} diff --git a/app/styles/_modules/_m-latest-version.scss b/app/styles/_modules/_m-latest-version.scss index 52aaa092a..9bf0cfdb7 100644 --- a/app/styles/_modules/_m-latest-version.scss +++ b/app/styles/_modules/_m-latest-version.scss @@ -21,6 +21,10 @@ font-weight: bold; } +.latest-version img { + vertical-align: middle; +} + .latest-version a:hover { color:#fff; -} \ No newline at end of file +} diff --git a/app/templates/documentation.hbs b/app/templates/documentation.hbs index 9ef8c82a2..8e1786555 100644 --- a/app/templates/documentation.hbs +++ b/app/templates/documentation.hbs @@ -8,7 +8,7 @@

$ - npm install + npm install -g manifoldjs

diff --git a/app/templates/index.hbs b/app/templates/index.hbs index eb2e92796..9c859d5be 100644 --- a/app/templates/index.hbs +++ b/app/templates/index.hbs @@ -19,12 +19,7 @@

$ - npm install - manifoldjs -

-

- $ - grunt + npm install -g manifoldjs

@@ -32,14 +27,16 @@
-
-

Latest version:

-
-
- Stable: v0.1.0 (npm) +
+
+

Latest version:

+
+
+
+ Stable: npm version
-
- Development: v0.1.0 (github) +
+ Development: v0.2.0 (github)
From 4346579d365248e663630ce23a5820bc0b3a0ee5 Mon Sep 17 00:00:00 2001 From: Nathan Bingham Date: Tue, 5 May 2015 17:51:39 -0400 Subject: [PATCH 2/3] Breakpoint clean-up --- app/styles/_layout/_l-mq.scss | 15 ++++++++++----- app/styles/_modules/_m-latest-version.scss | 6 ++---- app/styles/_modules/_m-more-info.scss | 4 ---- app/templates/index.hbs | 8 ++++---- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/styles/_layout/_l-mq.scss b/app/styles/_layout/_l-mq.scss index 7889aa788..502c94ab1 100644 --- a/app/styles/_layout/_l-mq.scss +++ b/app/styles/_layout/_l-mq.scss @@ -73,10 +73,6 @@ font-size: 1.75rem; line-height: 2rem !important; } - .latest-version .version { - font-size: 18px; - margin: 0 !important; - } .aboutfp h4 { line-height: 2rem; } @@ -222,6 +218,12 @@ } } +@media screen and (min-width: 56.250em) { + .latest-version .version { + font-size: 22px; + } +} + /* 900px to 1000px */ @media screen and (min-width: 56.250em) and (max-width: 62.438em) { .l-max-width { @@ -265,6 +267,9 @@ font-size: 1.5rem; line-height: 1.75rem; } + .latest-version .version { + font-size: 22px; + } } /* 1000px to 1099px */ @@ -288,4 +293,4 @@ .more-info h4 { line-height: 1.875rem; } -} \ No newline at end of file +} diff --git a/app/styles/_modules/_m-latest-version.scss b/app/styles/_modules/_m-latest-version.scss index 9bf0cfdb7..d9e49ad50 100644 --- a/app/styles/_modules/_m-latest-version.scss +++ b/app/styles/_modules/_m-latest-version.scss @@ -1,13 +1,11 @@ .latest-version { - text-align: center; padding: 3.125rem 3.75rem 3.75rem; background-color: $secondary-accent; + text-align: center; } .latest-version .version { - font-size: 22px; - display:inline-block; - margin:0 1em; + font-size: 18px; } .latest-version .title { diff --git a/app/styles/_modules/_m-more-info.scss b/app/styles/_modules/_m-more-info.scss index 82db25204..3b314d8d8 100644 --- a/app/styles/_modules/_m-more-info.scss +++ b/app/styles/_modules/_m-more-info.scss @@ -34,10 +34,6 @@ .more-info button:hover, .more-info .btn:hover { background-color: #fff; color: $dark-accent; -} - -.whoisusingmjs { - } .whoisusingmjs .sitelogo_yummly { height: 60px; width: 162px; margin: 0 30px 0 0; } diff --git a/app/templates/index.hbs b/app/templates/index.hbs index 9c859d5be..c089d11b7 100644 --- a/app/templates/index.hbs +++ b/app/templates/index.hbs @@ -31,15 +31,15 @@

Latest version:

-
-
+
+
+
Stable: npm version
-
+
Development: v0.2.0 (github)
-
From 4010870e3b7a86269403c221efa289025e78d6f5 Mon Sep 17 00:00:00 2001 From: Nathan Bingham Date: Tue, 5 May 2015 18:58:00 -0400 Subject: [PATCH 3/3] Updating vorlon.js --- app/templates/deploy.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/deploy.hbs b/app/templates/deploy.hbs index 47ec3051c..a6809b56e 100644 --- a/app/templates/deploy.hbs +++ b/app/templates/deploy.hbs @@ -5,7 +5,7 @@

Have a App Manifest file? Start deploying to these AppStores below.
Need one? {{#link-to 'generator'}}Start here{{/link-to}}.

- Looking for some debugging tools that work on all your platforms? Try vorlon.js. It makes mobile testing a breeze, and works inside the app manifoldJS apps. + Looking for some debugging tools that work on all your platforms? Try vorlon.js. It makes mobile testing a breeze, and works inside the app manifoldJS apps.