pageflow-linkmap-page 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4b73e3d49c82b5876fce90056bcb4fe58771fc34
-  data.tar.gz: 6d38604747a162226fc45fd9b2b6c1d56c596ea8
+SHA256:
+  metadata.gz: c428ede361d69d72f0868d03a251c11997208893fcde9e424a9e4e205f0a1d65
+  data.tar.gz: 70a18281efb93e3335290cbc339f331be440a8f3736285416271a03d74e79e81
 SHA512:
-  metadata.gz: 9a18d92640f24a2539bd1d4f4c9742d7549cdc5c86e56cb7087be871816787f28568e6fb291fdcdee800ff4e0e4cfea87e415127540e8e83ffb9609d9caee176
-  data.tar.gz: 84e8646c2e3ca811472f92adc70b6f2df67a3146e71775003aab7b298ce1e38dd95368f0fa9f1239baf41efe244dfc0959825f9561899874802f4e0c5a018be7
+  metadata.gz: 6eaa4497dbfcbf2ac9d63e5453f507c9c1179c6b6b7d91e61bf69719167b2a85557f5affa3dc28ed91166067f3c1972c23dcac4babb57d57a234204263d690dc
+  data.tar.gz: 04567addacca9b750f6eaf8e79ea3041886c8d141c1d7c3784d5d28ceb56cb00884f763f64e59f07327cfb445e5023d3f932023241442f6cc9ae142e6c2a7d1c

data/CHANGELOG.md

@@ -1,20 +1,18 @@
 # CHANGELOG
 
-### Version 1.1.0
+### Version 1.2.0
 
-2017-10-09
+2018-07-30
 
-[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/1-0-stable...v1.1.0)
+[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/1-1-stable...v1.2.0)
 
-- Fix hover video variant in published entry
-  ([#29](https://github.com/codevise/pageflow-linkmap-page/pull/29))
-- Make mask image url template generation more robust
-  ([#30](https://github.com/codevise/pageflow-linkmap-page/pull/30))
-- Improve mask features of hotspot page
-  ([#28](https://github.com/codevise/pageflow-linkmap-page/pull/28))
-- Ensure pageflow 12 is used in tests
-  ([#27](https://github.com/codevise/pageflow-linkmap-page/pull/27))
+- Typographie variables for overlay section
+  ([#34](https://github.com/codevise/pageflow-linkmap-page/pull/34))
+- Do not show load indicator for external link opening new tab
+  ([#32](https://github.com/codevise/pageflow-linkmap-page/pull/32))
+- Set railties version to prevent infinite loop in bundle install
+  ([#33](https://github.com/codevise/pageflow-linkmap-page/pull/33))
 
 See
-[1-0-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/1-0-stable/CHANGELOG.md)
+[1-1-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/1-1-stable/CHANGELOG.md)
 for previous changes.

data/Gemfile

@@ -7,3 +7,8 @@ gem 'state_machine', git: 'https://github.com/codevise/state_machine.git'
 
 gem 'spring-commands-rspec', group: :development
 gem 'spring-commands-teaspoon', group: :development
+
+# Required to make Bundler 1.16.1 find a resolution. Without this line
+# `bundle install` without a `Gemfile.lock` would run for a very long
+# time makin the Travis build time out.
+gem 'railties', '~> 4.2'

data/app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_panorama.js

@@ -90,7 +90,9 @@
             area.addClass('active');
           }
 
-          if (!area.hasClass('dynamic_marker') && area.hasClass('external_site_area')) {
+          if (!area.hasClass('dynamic_marker') &&
+              area.hasClass('external_site_area') &&
+              area.hasClass('target_self')) {
             displayExternalLinkLoadingIndicator(event.originalEvent);
           }
         });

data/app/assets/stylesheets/pageflow/linkmap_page/themes/default.scss

@@ -34,6 +34,11 @@
   $linkmap-overlay-title-color: $linkmap-main-color !default;
   $linkmap-overlay-background-color: rgba(48,48,48,0.8) !default;
 
+  $linkmap-overlay-title-typography: () !default;
+  $linkmap-overlay-description-typography: () !default;
+  $linkmap-overlay-title-phone-typography: () !default;
+  $linkmap-overlay-description-phone-typography: () !default;
+
   $linkmap-icon-color: $main-color !default;
 
   $linkmap-audio-progress-color: $linkmap-main-color !default;
@@ -186,29 +191,49 @@
         padding: 5px 10px;
 
         .link_title {
-          line-height: 20px;
-          font-size: 16px;
+          @include typography(
+            $linkmap-overlay-title-phone-typography,
+            (
+              line-height: 20px,
+              font-size: 16px
+            )
+          );
         }
 
         .link_description {
-          font-size: 12px;
-          line-height: 14px;
+          @include typography(
+            $linkmap-overlay-description-phone-typography,
+            (
+              font-size: 12px,
+              line-height: 14px
+            )
+          );
         }
       }
     }
 
     .link_title {
-      font-size: 24px;
+      @include typography(
+        $linkmap-overlay-title-typography,
+        (
+          font-size: 24px,
+          letter-spacing: 0.31px,
+          line-height: 30px
+        )
+      );
       color: $linkmap-overlay-title-color;
-      letter-spacing: 0.31px;
-      line-height: 30px;
     }
 
     .link_description {
-      font-size: 16px;
-      color: white;
-      letter-spacing: 0.22px;
-      line-height: 26px;
+      @include typography(
+        $linkmap-overlay-description-typography,
+        (
+          font-size: 16px,
+          letter-spacing: 0.22px,
+          line-height: 26px
+        )
+      );
+      color: white,
     }
 
     &:before {
@@ -365,4 +390,4 @@
       display: block;
     }
   }
-}
+}

data/lib/pageflow/linkmap_page/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module LinkmapPage
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-linkmap-page
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Pageflow page type for a page that contains customizable link areas