scrollytelling-pageflow-navigation 1.13.0 → 1.13.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 576f87fccc3783c31c64726472d715931276f834
4
- data.tar.gz: ef7fc590ff3cfcc18c7a8cdcd6f6fda11293a210
3
+ metadata.gz: 78c6f8425555678fa9d92b101422c36f81b48316
4
+ data.tar.gz: b40c963615dd7b60f46bb0b467272ca950520d06
5
5
  SHA512:
6
- metadata.gz: aa3b2d6ac8fa02a5a2df49df0dc691831084e56067de67c0004e68942a9db27e5942956ff1e091269b318fb16db84c7c06bac18ed4b4c97b4a3cdfa61d420385
7
- data.tar.gz: 7a0d47d465e0d1951cf7b4e2a96ad098727d45c4a07031808d2fd31e9b4adc357fd8b3c43c7382823d089d55c8e469a40c3c89122885d0c0ccfd11d6e4c9cb20
6
+ metadata.gz: fafabae21fcdfafdb4b24f54bf3fba96a13b89673fdebe08188a1e077e9182e0e2fe9237f7c00b075dec5ee366df6beaa0e642c1acaa77a6d1675d8602537dba
7
+ data.tar.gz: 3d7cb360e52f7d71aeca2ed65d5829120ff04fd5530c3c91e9f4ef86887f487612bceabf30271556964317ad2f3684d5f9d2fbb3bc2cde0ddaddd3ff4acf2b7c
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.1.6
1
+ 2.4.1
data/README.md CHANGED
@@ -4,6 +4,10 @@ This Pageflow plugin replaces the built-in Pageflow navigation with the Scrollyt
4
4
 
5
5
  The Scrollytelling navigation uses dots to show progress instead of thumbnails. This plugin does not replace the mobile Pageflow navigation; only the desktop navigation.
6
6
 
7
+ ### This is the 1-13-stable branch
8
+
9
+ This branch targets `gem 'pageflow', '~> 0.11.0'`.
10
+
7
11
  ## Examples
8
12
 
9
13
  For examples see the various stories on [our homepage](https://www.scrollytelling.io/).
@@ -1,9 +1,8 @@
1
1
  .entry {
2
2
  .indicator {
3
+ @include scrollytelling-indicator;
3
4
  left: 8%;
4
5
  bottom: 2%;
5
- padding: 0;
6
- @include scrollytelling-indicator;
7
6
  }
8
7
 
9
8
  .indicator.invert {
@@ -0,0 +1,25 @@
1
+ ul.scrollytelling-home_button {
2
+ @include scrollytelling-indicator;
3
+ left: 8%;
4
+ top: 2%;
5
+
6
+ a {
7
+ color: $scrollytelling-nav-color;
8
+
9
+ .page-invert & {
10
+ color: $scrollytelling-invert-nav-color;
11
+ }
12
+ }
13
+
14
+ a:before {
15
+ content: "\f0a8";
16
+ font-family: "FontAwesome";
17
+ font-size: 16px;
18
+ margin-right: .25em;
19
+ background-image: none;
20
+
21
+ .page-invert & {
22
+ color: $scrollytelling-invert-nav-color;
23
+ }
24
+ }
25
+ }
@@ -39,15 +39,12 @@ ul.scrollytelling-options {
39
39
  }
40
40
 
41
41
  ul.scrollytelling-sharing {
42
- position: absolute;
43
42
  top: 2%;
44
43
  right: 2%;
45
44
  width: 200px;
46
45
  max-width: 80%;
47
46
  height: 40px;
48
- z-index: 5;
49
47
  text-align: right;
50
- margin: 0;
51
48
 
52
49
  li {
53
50
  display: inline;
@@ -62,12 +59,8 @@ ul.scrollytelling-sharing {
62
59
  }
63
60
 
64
61
  ul.scrollytelling-options {
65
- position: absolute;
66
62
  bottom: 2%;
67
63
  right: 22px;
68
- z-index: 5;
69
- list-style-type: none;
70
- margin: 0;
71
64
 
72
65
  .audio-playing:before { content: "\f028"; }
73
66
  .audio-muted:before { content: "\f026"; }
@@ -1,9 +1,8 @@
1
1
  .parent_page {
2
- position: absolute;
2
+ @include scrollytelling-indicator;
3
3
  left: 8%;
4
4
  bottom: 7%;
5
5
  opacity: 0;
6
- @include scrollytelling-indicator;
7
6
  transition: opacity 1s ease;
8
7
 
9
8
  @include desktop {
@@ -6,7 +6,20 @@ $scrollytelling-fa-size: 30px !default;
6
6
  $scrollytelling-nav-color: white !default;
7
7
  $scrollytelling-invert-nav-color: black !default;
8
8
 
9
+ ul.scrolly-nav-box {
10
+ position: absolute;
11
+ list-style-type: none;
12
+ z-index: 5;
13
+ padding: 0;
14
+ margin: 0;
15
+
16
+ a {
17
+ text-decoration: none;
18
+ }
19
+ }
20
+
9
21
  @mixin scrollytelling-indicator {
22
+ margin: 0;
10
23
  cursor: pointer;
11
24
  color: $scrollytelling-nav-color;
12
25
  font-size: 16px;
@@ -26,3 +39,4 @@ $scrollytelling-invert-nav-color: black !default;
26
39
  @import "./navigation/options";
27
40
  @import "./navigation/entry";
28
41
  @import "./navigation/parent_page";
42
+ @import "./navigation/home_button";
@@ -1,5 +1,5 @@
1
1
  <div data-widget="scrollytelling_pageflow_navigation">
2
- <div class="parent_page"><%= t('pageflow.public.back') %></div>
2
+ <!-- <div class="parent_page"><%= t('pageflow.public.back') %></div> -->
3
3
 
4
4
  <nav id="scrollytelling-pageflow-navigation">
5
5
  <ul>
@@ -21,12 +21,18 @@
21
21
  </ul>
22
22
  </nav>
23
23
 
24
- <ul class="scrollytelling-sharing">
24
+ <% if entry.home_button.enabled? %>
25
+ <ul class="scrollytelling-home_button scrolly-nav-box">
26
+ <li><%= link_to 'Terug naar home', entry.home_button.url, id: 'home-button', title: t('pageflow.public.show_home') %></li>
27
+ </ul>
28
+ <% end %>
29
+
30
+ <ul class="scrollytelling-sharing scrolly-nav-box">
25
31
  <li><a href="#" id="share-tw"></a></li>
26
32
  <li><a href="#" id="share-fb"></a></li>
27
33
  </ul>
28
34
 
29
- <ul class="scrollytelling-options">
35
+ <ul class="scrollytelling-options scrolly-nav-box">
30
36
  <li><a href="#" id="scrollytelling-audio" class="audio-playing"></a></li>
31
37
  </ul>
32
38
  </div>
@@ -0,0 +1,4 @@
1
+ nl:
2
+ pageflow:
3
+ scrollytelling_pageflow_navigation:
4
+ widget_type_name: Scrollytelling stippen met tooltips
@@ -1,7 +1,7 @@
1
1
  module Scrollytelling
2
2
  module Pageflow
3
3
  module Navigation
4
- VERSION = "1.13.0"
4
+ VERSION = "1.13.1"
5
5
  end
6
6
  end
7
7
  end
@@ -13,7 +13,12 @@ module Scrollytelling
13
13
  end
14
14
 
15
15
  def render(template, entry)
16
- template.render('scrollytelling/pageflow/navigation/widget.html.erb', entry: entry)
16
+ template.render(
17
+ partial: 'scrollytelling/pageflow/navigation/widget.html.erb',
18
+ locals: {
19
+ entry: entry
20
+ }
21
+ )
17
22
  end
18
23
  end
19
24
  end
@@ -1,6 +1,7 @@
1
1
  require "scrollytelling/pageflow/navigation/plugin"
2
2
  require "scrollytelling/pageflow/navigation/widget_type"
3
3
  require "scrollytelling/pageflow/navigation/engine"
4
+ require "scrollytelling/pageflow/navigation/version"
4
5
 
5
6
  module Scrollytelling
6
7
  module Pageflow
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
18
18
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
19
19
  spec.require_paths = ["lib"]
20
20
 
21
- spec.add_runtime_dependency 'pageflow', '>= 0.11.0'
22
- spec.add_runtime_dependency 'rails', '>= 3.0'
21
+ spec.add_runtime_dependency 'pageflow', '~> 0.11.0'
22
+ spec.add_runtime_dependency 'rails', '>= 3.0', '< 5.0'
23
23
 
24
24
  spec.add_development_dependency "bundler", "~> 1.11"
25
25
  spec.add_development_dependency "rake", "~> 10.0"
metadata CHANGED
@@ -1,27 +1,27 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scrollytelling-pageflow-navigation
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.13.0
4
+ version: 1.13.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joost Baaij
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-01-09 00:00:00.000000000 Z
11
+ date: 2017-07-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pageflow
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.11.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.11.0
27
27
  - !ruby/object:Gem::Dependency
@@ -31,6 +31,9 @@ dependencies:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '3.0'
34
+ - - "<"
35
+ - !ruby/object:Gem::Version
36
+ version: '5.0'
34
37
  type: :runtime
35
38
  prerelease: false
36
39
  version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
38
41
  - - ">="
39
42
  - !ruby/object:Gem::Version
40
43
  version: '3.0'
44
+ - - "<"
45
+ - !ruby/object:Gem::Version
46
+ version: '5.0'
41
47
  - !ruby/object:Gem::Dependency
42
48
  name: bundler
43
49
  requirement: !ruby/object:Gem::Requirement
@@ -103,6 +109,7 @@ files:
103
109
  - app/assets/javascripts/scrollytelling/pageflow/navigation/widget_type.js
104
110
  - app/assets/stylesheets/scrollytelling/pageflow/navigation.scss
105
111
  - app/assets/stylesheets/scrollytelling/pageflow/navigation/_entry.scss
112
+ - app/assets/stylesheets/scrollytelling/pageflow/navigation/_home_button.scss
106
113
  - app/assets/stylesheets/scrollytelling/pageflow/navigation/_mobile.scss
107
114
  - app/assets/stylesheets/scrollytelling/pageflow/navigation/_navigation.scss
108
115
  - app/assets/stylesheets/scrollytelling/pageflow/navigation/_options.scss
@@ -112,6 +119,7 @@ files:
112
119
  - bin/setup
113
120
  - config/locales/de.yml
114
121
  - config/locales/en.yml
122
+ - config/locales/nl.yml
115
123
  - lib/scrollytelling/pageflow/navigation.rb
116
124
  - lib/scrollytelling/pageflow/navigation/engine.rb
117
125
  - lib/scrollytelling/pageflow/navigation/plugin.rb
@@ -138,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
138
146
  version: '0'
139
147
  requirements: []
140
148
  rubyforge_project:
141
- rubygems_version: 2.2.3
149
+ rubygems_version: 2.6.11
142
150
  signing_key:
143
151
  specification_version: 4
144
152
  summary: Replace Pageflow navigation with Scrollytelling navigation