scrollytelling-pageflow-navigation 1.15.0 → 12.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a01a2a7f87b0bdfefa2a90a04f69742b5fe8ef98
4
- data.tar.gz: 9e3e57ad268e24e56001df9e9b5bed37c47f6337
3
+ metadata.gz: e7b355169cb6afca001a8a7a96f8e67f8bbec3f7
4
+ data.tar.gz: aa356419072ef5581b80285349548b51e0605682
5
5
  SHA512:
6
- metadata.gz: f2d46cdb29a543ad0a4aa9de3f35cd31894c5a60c910245b4d11987dbe3268d09577ddd3f90fc8e5643c59cc1441dd92dbcb469d70ce66a3500a698f7d1dfe3f
7
- data.tar.gz: cef09d2a8bce36ff642e68352b1595a5b4079272d0561438e525a1a11dcefb4a39c30aacf4684a553864deeb7232911670f397a0e8c6760e44a5f71797254e22
6
+ metadata.gz: a6e3b012e22157610901f7cb46098e0117d97f32a36b12690393ad8f21c9992427fc6414ed530ec000c7111ceff051fa1b88a0e51b2f1b724508cec2f8cb8edf
7
+ data.tar.gz: 31ca9ec9f2e5afa5202546f27cdbd743fc2a2053d1b3477b8f2747cb025339ae9f8da1e939ead79e718814ccfd59536604d477964c76b58869956f6991bc7d41
@@ -1 +1 @@
1
- 2.4.1
1
+ 2.1.6
data/README.md CHANGED
@@ -4,10 +4,6 @@ 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
-
11
7
  ## Examples
12
8
 
13
9
  For examples see the various stories on [our homepage](https://www.scrollytelling.io/).
@@ -16,7 +16,7 @@ $.widget('scrollytelling.scrollytellingNavigationCounter', {
16
16
  pageflow.events.on('page:change', this.updateActive.bind(this));
17
17
 
18
18
  // Set click handler
19
- $('nav a', this.element).on('click', this.onClick);
19
+ $('a', this.element).on('click', this.onClick);
20
20
  },
21
21
 
22
22
  onClick: function(event) {
@@ -6,20 +6,7 @@ $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
-
21
9
  @mixin scrollytelling-indicator {
22
- margin: 0;
23
10
  cursor: pointer;
24
11
  color: $scrollytelling-nav-color;
25
12
  font-size: 16px;
@@ -35,9 +22,7 @@ ul.scrolly-nav-box {
35
22
  }
36
23
 
37
24
  @import "./navigation/navigation";
38
- @import "./navigation/mobile_navigation";
25
+ @import "./navigation/mobile";
39
26
  @import "./navigation/options";
40
27
  @import "./navigation/entry";
41
28
  @import "./navigation/parent_page";
42
- @import "./navigation/home_button";
43
- @import "./navigation/mobile_overrides";
@@ -1,8 +1,9 @@
1
1
  .entry {
2
2
  .indicator {
3
+ left: 8%;
4
+ bottom: 2%;
5
+ padding: 0;
3
6
  @include scrollytelling-indicator;
4
- left: 100px;
5
- bottom: 20px;
6
7
  }
7
8
 
8
9
  .indicator.invert {
@@ -0,0 +1,68 @@
1
+ .navigation_mobile {
2
+ .parent_page {
3
+ display: none; /* hide here because we include it in all nav */
4
+ }
5
+
6
+ .overview_mobile .credits a,
7
+ .imprint_mobile .credits a,
8
+ .sharing_mobile .credits a {
9
+ margin-top: 0;
10
+ color: inherit;
11
+ display: inline;
12
+ }
13
+
14
+ &.active {
15
+ .menu.index {
16
+ &:before {
17
+ font-family: "FontAwesome";
18
+ content: "\f00d";
19
+ font-size: $scrollytelling-fa-size;
20
+ }
21
+ }
22
+ }
23
+ .menu.index,
24
+ .menu.sharing,
25
+ .menu.imprint,
26
+
27
+ .overview_mobile:after,
28
+ .imprint_mobile:after,
29
+ .sharing_mobile:after {
30
+ background-image: none;
31
+ }
32
+
33
+ .menu.index {
34
+ &:before {
35
+ font-family: "FontAwesome";
36
+ content: "\f0c9";
37
+ font-size: $scrollytelling-fa-size;
38
+ }
39
+ }
40
+
41
+ .menu.sharing {
42
+ &:before {
43
+ font-family: "FontAwesome";
44
+ content: "\f045";
45
+ font-size: $scrollytelling-fa-size;
46
+ }
47
+ }
48
+
49
+ .menu.imprint {
50
+ &:before {
51
+ font-family: "FontAwesome";
52
+ content: "\f05a";
53
+ font-size: $scrollytelling-fa-size;
54
+ }
55
+ }
56
+ }
57
+
58
+ .navigation_mobile.page-invert {
59
+ .menu.index:before {
60
+ color: $scrollytelling-invert-nav-color;
61
+ }
62
+ }
63
+
64
+ .navigation_mobile.page-invert.active {
65
+ .menu.index:before {
66
+ color: white;
67
+ }
68
+ }
@@ -1,5 +1,12 @@
1
+ @media screen and (max-width: 768px) {
2
+ #scrollytelling-pageflow-navigation,
3
+ ul.scrollytelling-sharing {
4
+ display: none;
5
+ }
6
+ }
7
+
1
8
  #scrollytelling-pageflow-navigation {
2
- right: 70px;
9
+ right: 2.3%;
3
10
  position: absolute;
4
11
  z-index: 100;
5
12
  top: 50%;
@@ -39,12 +39,15 @@ ul.scrollytelling-options {
39
39
  }
40
40
 
41
41
  ul.scrollytelling-sharing {
42
- top: 20px;
43
- right: 70px;
42
+ position: absolute;
43
+ top: 2%;
44
+ right: 2%;
44
45
  width: 200px;
45
46
  max-width: 80%;
46
47
  height: 40px;
48
+ z-index: 5;
47
49
  text-align: right;
50
+ margin: 0;
48
51
 
49
52
  li {
50
53
  display: inline;
@@ -59,8 +62,12 @@ ul.scrollytelling-sharing {
59
62
  }
60
63
 
61
64
  ul.scrollytelling-options {
62
- bottom: 20px;
63
- right: 70px;
65
+ position: absolute;
66
+ bottom: 2%;
67
+ right: 22px;
68
+ z-index: 5;
69
+ list-style-type: none;
70
+ margin: 0;
64
71
 
65
72
  .audio-playing:before { content: "\f028"; }
66
73
  .audio-muted:before { content: "\f026"; }
@@ -1,10 +1,15 @@
1
1
  .parent_page {
2
- @include scrollytelling-indicator;
3
- left: 100px;
4
- bottom: 70px;
2
+ position: absolute;
3
+ left: 8%;
4
+ bottom: 7%;
5
5
  opacity: 0;
6
+ @include scrollytelling-indicator;
6
7
  transition: opacity 1s ease;
7
8
 
9
+ @include desktop {
10
+ bottom: 5%;
11
+ }
12
+
8
13
  &:before {
9
14
  content: "\f0a8";
10
15
  font-family: "FontAwesome";
@@ -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>
@@ -11,9 +11,9 @@
11
11
  <a href="#<%= page.perma_id %>" data-page-id="<%= page.id %>">
12
12
  <span></span>
13
13
  </a>
14
- <% if page.configuration["title"].presence || page.configuration["subtitle"].presence %>
14
+ <% if page.configuration["title"].present? %>
15
15
  <div class="scrollytelling-pageflow-navigation-tooltip">
16
- <%= page.configuration["title"].presence || page.configuration["subtitle"].presence %>
16
+ <%= page.configuration["title"] %>
17
17
  </div>
18
18
  <% end %>
19
19
  </li>
@@ -21,20 +21,12 @@
21
21
  </ul>
22
22
  </nav>
23
23
 
24
- <% if entry.home_button.enabled? %>
25
- <ul class="scrollytelling-home_button scrolly-nav-box">
26
- <li><%= link_to t('pageflow.scrollytelling_pageflow_navigation.home_link'),
27
- entry.home_button.url,
28
- title: t('pageflow.scrollytelling_pageflow_navigation.home_title', url: entry.home_button.url) %></li>
29
- </ul>
30
- <% end %>
31
-
32
- <ul class="scrollytelling-sharing scrolly-nav-box">
24
+ <ul class="scrollytelling-sharing">
33
25
  <li><a href="#" id="share-tw"></a></li>
34
26
  <li><a href="#" id="share-fb"></a></li>
35
27
  </ul>
36
28
 
37
- <ul class="scrollytelling-options scrolly-nav-box">
29
+ <ul class="scrollytelling-options">
38
30
  <li><a href="#" id="scrollytelling-audio" class="audio-playing"></a></li>
39
31
  </ul>
40
32
  </div>
@@ -1,6 +1,4 @@
1
1
  de:
2
2
  pageflow:
3
3
  scrollytelling_pageflow_navigation:
4
- home_link: ' Home'
5
- home_title: 'Du geths denn nach %{url}'
6
4
  widget_type_name: Scrollytelling Punkte mit Tooltips
@@ -1,6 +1,4 @@
1
1
  en:
2
2
  pageflow:
3
3
  scrollytelling_pageflow_navigation:
4
- home_link: ' Home'
5
- home_title: 'That will take you to %{url}'
6
4
  widget_type_name: Scrollytelling dots with tooltips
@@ -9,10 +9,6 @@ module Scrollytelling
9
9
  def self.widget_type
10
10
  WidgetType.new
11
11
  end
12
-
13
- def self.plugin
14
- Plugin.new
15
- end
16
12
  end
17
13
  end
18
14
  end
@@ -1,7 +1,7 @@
1
1
  module Scrollytelling
2
2
  module Pageflow
3
3
  module Navigation
4
- VERSION = "1.15.0"
4
+ VERSION = "12.0.0"
5
5
  end
6
6
  end
7
7
  end
@@ -13,12 +13,7 @@ module Scrollytelling
13
13
  end
14
14
 
15
15
  def render(template, entry)
16
- template.render(
17
- partial: 'scrollytelling/pageflow/navigation/widget.html.erb',
18
- locals: {
19
- entry: entry
20
- }
21
- )
16
+ template.render('scrollytelling/pageflow/navigation/widget.html.erb', entry: entry)
22
17
  end
23
18
  end
24
19
  end
@@ -18,10 +18,10 @@ 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', '< 5.0'
21
+ spec.add_runtime_dependency 'pageflow', '~> 12.0.0.rc1'
22
+ spec.add_runtime_dependency 'rails', '>= 3.0'
23
23
 
24
- spec.add_development_dependency "bundler", "~> 1.11"
25
- spec.add_development_dependency "rake", "~> 10.0"
26
- spec.add_development_dependency "rspec", "~> 3.0"
24
+ spec.add_development_dependency "bundler"
25
+ spec.add_development_dependency "rake"
26
+ spec.add_development_dependency "rspec"
27
27
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scrollytelling-pageflow-navigation
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.15.0
4
+ version: 12.0.0
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-07-17 00:00:00.000000000 Z
11
+ date: 2017-05-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pageflow
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.11.0
19
+ version: 12.0.0.rc1
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
- version: 0.11.0
26
+ version: 12.0.0.rc1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rails
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -31,9 +31,6 @@ dependencies:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '3.0'
34
- - - "<"
35
- - !ruby/object:Gem::Version
36
- version: '5.0'
37
34
  type: :runtime
38
35
  prerelease: false
39
36
  version_requirements: !ruby/object:Gem::Requirement
@@ -41,51 +38,48 @@ dependencies:
41
38
  - - ">="
42
39
  - !ruby/object:Gem::Version
43
40
  version: '3.0'
44
- - - "<"
45
- - !ruby/object:Gem::Version
46
- version: '5.0'
47
41
  - !ruby/object:Gem::Dependency
48
42
  name: bundler
49
43
  requirement: !ruby/object:Gem::Requirement
50
44
  requirements:
51
- - - "~>"
45
+ - - ">="
52
46
  - !ruby/object:Gem::Version
53
- version: '1.11'
47
+ version: '0'
54
48
  type: :development
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
51
  requirements:
58
- - - "~>"
52
+ - - ">="
59
53
  - !ruby/object:Gem::Version
60
- version: '1.11'
54
+ version: '0'
61
55
  - !ruby/object:Gem::Dependency
62
56
  name: rake
63
57
  requirement: !ruby/object:Gem::Requirement
64
58
  requirements:
65
- - - "~>"
59
+ - - ">="
66
60
  - !ruby/object:Gem::Version
67
- version: '10.0'
61
+ version: '0'
68
62
  type: :development
69
63
  prerelease: false
70
64
  version_requirements: !ruby/object:Gem::Requirement
71
65
  requirements:
72
- - - "~>"
66
+ - - ">="
73
67
  - !ruby/object:Gem::Version
74
- version: '10.0'
68
+ version: '0'
75
69
  - !ruby/object:Gem::Dependency
76
70
  name: rspec
77
71
  requirement: !ruby/object:Gem::Requirement
78
72
  requirements:
79
- - - "~>"
73
+ - - ">="
80
74
  - !ruby/object:Gem::Version
81
- version: '3.0'
75
+ version: '0'
82
76
  type: :development
83
77
  prerelease: false
84
78
  version_requirements: !ruby/object:Gem::Requirement
85
79
  requirements:
86
- - - "~>"
80
+ - - ">="
87
81
  - !ruby/object:Gem::Version
88
- version: '3.0'
82
+ version: '0'
89
83
  description:
90
84
  email:
91
85
  - joost@spacebabies.nl
@@ -109,9 +103,7 @@ files:
109
103
  - app/assets/javascripts/scrollytelling/pageflow/navigation/widget_type.js
110
104
  - app/assets/stylesheets/scrollytelling/pageflow/navigation.scss
111
105
  - app/assets/stylesheets/scrollytelling/pageflow/navigation/_entry.scss
112
- - app/assets/stylesheets/scrollytelling/pageflow/navigation/_home_button.scss
113
- - app/assets/stylesheets/scrollytelling/pageflow/navigation/_mobile_navigation.scss
114
- - app/assets/stylesheets/scrollytelling/pageflow/navigation/_mobile_overrides.scss
106
+ - app/assets/stylesheets/scrollytelling/pageflow/navigation/_mobile.scss
115
107
  - app/assets/stylesheets/scrollytelling/pageflow/navigation/_navigation.scss
116
108
  - app/assets/stylesheets/scrollytelling/pageflow/navigation/_options.scss
117
109
  - app/assets/stylesheets/scrollytelling/pageflow/navigation/_parent_page.scss
@@ -120,7 +112,6 @@ files:
120
112
  - bin/setup
121
113
  - config/locales/de.yml
122
114
  - config/locales/en.yml
123
- - config/locales/nl.yml
124
115
  - lib/scrollytelling/pageflow/navigation.rb
125
116
  - lib/scrollytelling/pageflow/navigation/engine.rb
126
117
  - lib/scrollytelling/pageflow/navigation/plugin.rb
@@ -147,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
147
138
  version: '0'
148
139
  requirements: []
149
140
  rubyforge_project:
150
- rubygems_version: 2.6.11
141
+ rubygems_version: 2.2.3
151
142
  signing_key:
152
143
  specification_version: 4
153
144
  summary: Replace Pageflow navigation with Scrollytelling navigation
@@ -1,25 +0,0 @@
1
- ul.scrollytelling-home_button {
2
- @include scrollytelling-indicator;
3
- left: 100px;
4
- top: 20px;
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
- }
@@ -1,115 +0,0 @@
1
- .navigation_mobile {
2
- .parent_page {
3
- display: none; /* hide here because we include it in all nav */
4
- }
5
-
6
- .menu {
7
- width: auto;
8
- height: auto;
9
- right: 20px;
10
-
11
- &.index:before {
12
- font-family: "FontAwesome";
13
- content: "\f0c9";
14
- font-size: 20px;
15
- }
16
-
17
- &.sharing:before {
18
- font-family: "FontAwesome";
19
- content: "\f1e0";
20
- font-size: $scrollytelling-fa-size;
21
- }
22
-
23
- &.imprint:before {
24
- font-family: "FontAwesome";
25
- content: "\f05a";
26
- font-size: $scrollytelling-fa-size;
27
- }
28
- }
29
-
30
- .imprint_mobile:after,
31
- .menu.imprint,
32
- .menu.index,
33
- .menu.sharing,
34
- .overview_mobile:after,
35
- .sharing_mobile:after {
36
- background-image: none;
37
- }
38
-
39
- .imprint_mobile .credits a,
40
- .overview_mobile .credits a,
41
- .sharing_mobile .credits a {
42
- margin-top: 0;
43
- color: inherit;
44
- display: inline;
45
- }
46
-
47
- &.active {
48
- .sharing_mobile {
49
- a.share.facebook {
50
- p:before {
51
- font-family: "FontAwesome";
52
- content: "\f082";
53
- margin-right: 12px;
54
- }
55
- }
56
-
57
- a.share.twitter {
58
- p:before {
59
- font-family: "FontAwesome";
60
- content: "\f081";
61
- margin-right: 12px;
62
- }
63
- }
64
-
65
- a.share.whatsapp {
66
- img {
67
- width: 18px;
68
- height: 18px;
69
- border: none;
70
- float: left;
71
- margin-right: 10px;
72
- padding-top: 4px;
73
- }
74
- }
75
-
76
- li {
77
- background-color: darkgrey;
78
- font-family: sourcesanspro;
79
-
80
- > a {
81
- color: white;
82
- padding-top: 10px;
83
- height: 50px;
84
- margin-left: 24px;
85
- }
86
-
87
- > a:before {
88
- display: none;
89
- }
90
-
91
- p {
92
- margin: 0;
93
- }
94
- }
95
- }
96
-
97
- .menu.index {
98
- &:before {
99
- content: "\f00d";
100
- }
101
- }
102
- }
103
-
104
- &.page-invert {
105
- .menu.index:before {
106
- color: $scrollytelling-invert-nav-color;
107
- }
108
- }
109
-
110
- &.page-invert.active {
111
- .menu.index:before {
112
- color: white;
113
- }
114
- }
115
- }
@@ -1,20 +0,0 @@
1
- @media screen and (max-width: 900px) {
2
- #scrollytelling-pageflow-navigation,
3
- ul.scrollytelling-sharing {
4
- display: none;
5
- }
6
-
7
- ul.scrollytelling-home_button {
8
- top: 10px;
9
- left: 20px;
10
- }
11
-
12
- ul.scrollytelling-options {
13
- bottom: 20px;
14
- right: 10px;
15
- }
16
-
17
- .entry .indicator {
18
- left: 20px;
19
- }
20
- }
@@ -1,6 +0,0 @@
1
- nl:
2
- pageflow:
3
- scrollytelling_pageflow_navigation:
4
- home_link: ' Home'
5
- home_title: 'Je gaat dan naar %{url}'
6
- widget_type_name: Scrollytelling stippen met tooltips