From 9be36a8c09dae908113b0800f6b4b9e02b249bf7 Mon Sep 17 00:00:00 2001 From: Gregory L'Azou Date: Thu, 15 Sep 2016 16:39:05 -0700 Subject: [PATCH] V1.1.2 --- README.md | 2 +- bower.json | 2 +- package.json | 4 ++-- .../storymaps/tpl/builder/notification/Notification.less | 2 +- src/app/storymaps/tpl/view/section/Title.hbs | 8 +++++--- src/app/storymaps/tpl/view/section/Title.jsx | 3 ++- src/app/storymaps/tpl/view/ui/Autoplay.less | 2 +- src/index.html | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 515f2bc..cc3bba2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The Story Map Cascadeā„  app lets you combine narrative text with maps, images, [Download](http://links.esri.com/storymaps/story_map_cascade_zip) | [Cascade page on Esri Story Maps website](https://storymaps.arcgis.com/en/app-list/cascade/) -**Latest release is version 1.1.1**, if you want to be informed of new releases, we recommend you to watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/story-map-cascade/releases) for release notes. +**Latest release is version 1.1.2**, if you want to be informed of new releases, we recommend you to watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/story-map-cascade/releases) for release notes. ## Help content diff --git a/bower.json b/bower.json index 3d8d462..3002bae 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "cascade-storytelling-template-js-dev", - "version": "1.1.1", + "version": "1.1.2", "homepage": "", "authors": [ "Gregory L'Azou " diff --git a/package.json b/package.json index 7434fb6..77d74d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Storymaps-Cascade", - "version": "1.1.1", + "version": "1.1.2", "description": "The Story Map Cascade app lets you combine narrative text with maps, images, and multimedia content in an engaging, full-screen scrolling experience", "license": "Apache-2.0", "repository": { @@ -15,7 +15,7 @@ "babel-plugin-transform-object-assign": "^6.5.0", "babel-preset-es2015": "^6.6.0", "babel-preset-react": "^6.5.0", - "csso": "~1.3.10", + "csso": "~1.3.10", "eslint": "^2.7.0", "eslint-plugin-react": "^4.3.0", "grunt": "^1.0.1", diff --git a/src/app/storymaps/tpl/builder/notification/Notification.less b/src/app/storymaps/tpl/builder/notification/Notification.less index fdd3e36..6e88123 100644 --- a/src/app/storymaps/tpl/builder/notification/Notification.less +++ b/src/app/storymaps/tpl/builder/notification/Notification.less @@ -4,7 +4,7 @@ position: fixed; top: 50px; right: 10px; - z-index: 9; + z-index: 502; text-align: right; } diff --git a/src/app/storymaps/tpl/view/section/Title.hbs b/src/app/storymaps/tpl/view/section/Title.hbs index 7835340..734c217 100644 --- a/src/app/storymaps/tpl/view/section/Title.hbs +++ b/src/app/storymaps/tpl/view/section/Title.hbs @@ -3,9 +3,11 @@ {{{background}}}
-
-

{{title}}

-
+ {{#if showTitle}} +
+

{{title}}

+
+ {{/if}}
{{credits}}
diff --git a/src/app/storymaps/tpl/view/section/Title.jsx b/src/app/storymaps/tpl/view/section/Title.jsx index 1e6e249..3c668f2 100644 --- a/src/app/storymaps/tpl/view/section/Title.jsx +++ b/src/app/storymaps/tpl/view/section/Title.jsx @@ -70,6 +70,7 @@ export default class Title { media: this._backgroundMedia }), title: foreground.title, + showTitle: app.isInBuilder || foreground.title, credits: foreground.credits }); } @@ -108,7 +109,7 @@ export default class Title { this._applyConfig(); } - _applyConfig() { + _applyConfig() { if (this._section.foreground && this._section.foreground.options) { let style = this._section.foreground.options.titleStyle; let textNode = this._node.find('.title-text'); diff --git a/src/app/storymaps/tpl/view/ui/Autoplay.less b/src/app/storymaps/tpl/view/ui/Autoplay.less index fe0edd6..a96c1b6 100644 --- a/src/app/storymaps/tpl/view/ui/Autoplay.less +++ b/src/app/storymaps/tpl/view/ui/Autoplay.less @@ -13,7 +13,7 @@ border-radius: 5px; border: 1px solid #FFF; - z-index: 9; + z-index: 999; text-align: center; cursor: pointer; color: rgba(255, 255, 255, 0.85); diff --git a/src/index.html b/src/index.html index 26ca8b5..4384adf 100644 --- a/src/index.html +++ b/src/index.html @@ -69,7 +69,7 @@