pageflow 0.1.0 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of pageflow might be problematic. Click here for more details.

Files changed (183) hide show
  1. checksums.yaml +8 -8
  2. data/admins/pageflow/accounts.rb +17 -49
  3. data/admins/pageflow/entry.rb +13 -6
  4. data/app/assets/fonts/pageflow/entypo.eot +0 -0
  5. data/app/assets/fonts/pageflow/entypo.svg +834 -0
  6. data/app/assets/fonts/pageflow/entypo.ttf +0 -0
  7. data/app/assets/fonts/pageflow/entypo.woff +0 -0
  8. data/app/assets/fonts/pageflow/fontawesome-webfont.eot +0 -0
  9. data/app/assets/fonts/pageflow/fontawesome-webfont.otf +0 -0
  10. data/app/assets/fonts/pageflow/fontawesome-webfont.svg +504 -0
  11. data/app/assets/fonts/pageflow/fontawesome-webfont.ttf +0 -0
  12. data/app/assets/fonts/pageflow/fontawesome-webfont.woff +0 -0
  13. data/app/assets/images/pageflow/themes/default/audio_sprite.png +0 -0
  14. data/app/assets/images/pageflow/themes/default/image_sprite.png +0 -0
  15. data/app/assets/images/pageflow/themes/default/internal_links_sprite.png +0 -0
  16. data/app/assets/images/pageflow/themes/default/loading_spinner.png +0 -0
  17. data/app/assets/images/pageflow/themes/default/loading_spinner_bg.png +0 -0
  18. data/app/assets/images/pageflow/themes/default/logo_header.png +0 -0
  19. data/app/assets/images/pageflow/themes/default/logo_header_invert.png +0 -0
  20. data/app/assets/images/pageflow/themes/default/scroll_indicator_sprite.png +0 -0
  21. data/app/assets/images/pageflow/themes/default/text_sprite.png +0 -0
  22. data/app/assets/images/pageflow/themes/default/video_sprite.png +0 -0
  23. data/app/assets/javascripts/pageflow/editor/base.js +1 -0
  24. data/app/assets/javascripts/pageflow/editor/collections/mixins/files_collection.js +11 -0
  25. data/app/assets/javascripts/pageflow/editor/collections/subset_collection.js +11 -0
  26. data/app/assets/javascripts/pageflow/editor/controllers/sidebar_controller.js +8 -1
  27. data/app/assets/javascripts/pageflow/editor/initializers/setup_config.js +3 -0
  28. data/app/assets/javascripts/pageflow/editor/models/audio_file.js +1 -0
  29. data/app/assets/javascripts/pageflow/editor/models/chapter.js +1 -0
  30. data/app/assets/javascripts/pageflow/editor/models/configuration.js +1 -0
  31. data/app/assets/javascripts/pageflow/editor/models/encoding_confirmation.js +45 -0
  32. data/app/assets/javascripts/pageflow/editor/models/entry.js +6 -14
  33. data/app/assets/javascripts/pageflow/editor/models/entry_publication.js +40 -0
  34. data/app/assets/javascripts/pageflow/editor/models/file_stage.js +5 -0
  35. data/app/assets/javascripts/pageflow/editor/models/image_file.js +5 -0
  36. data/app/assets/javascripts/pageflow/editor/models/mixins/encoded_file.js +31 -14
  37. data/app/assets/javascripts/pageflow/editor/models/mixins/files_count_watcher.js +4 -0
  38. data/app/assets/javascripts/pageflow/editor/models/mixins/stage_provider.js +2 -2
  39. data/app/assets/javascripts/pageflow/editor/models/other_entry.js +1 -0
  40. data/app/assets/javascripts/pageflow/editor/models/page.js +1 -0
  41. data/app/assets/javascripts/pageflow/editor/models/video_file.js +1 -0
  42. data/app/assets/javascripts/pageflow/editor/routers/sidebar_router.js +2 -0
  43. data/app/assets/javascripts/pageflow/editor/templates/confirm_encoding.jst.ejs +15 -0
  44. data/app/assets/javascripts/pageflow/editor/templates/confirmable_file_item.jst.ejs +7 -0
  45. data/app/assets/javascripts/pageflow/editor/templates/{quota_decorator.jst.ejs → entry_publication_quota_decorator.jst.ejs} +1 -1
  46. data/app/assets/javascripts/pageflow/editor/templates/files_explorer.jst.ejs +5 -3
  47. data/app/assets/javascripts/pageflow/editor/templates/notifications.jst.ejs +6 -1
  48. data/app/assets/javascripts/pageflow/editor/views/confirm_encoding_view.js +76 -0
  49. data/app/assets/javascripts/pageflow/editor/views/confirmable_file_item_view.js +42 -0
  50. data/app/assets/javascripts/pageflow/editor/views/entry_publication_quota_decorator_view.js +49 -0
  51. data/app/assets/javascripts/pageflow/editor/views/file_meta_data_item_view.js +1 -1
  52. data/app/assets/javascripts/pageflow/editor/views/file_stage_item_view.js +1 -0
  53. data/app/assets/javascripts/pageflow/editor/views/file_thumbnail_view.js +2 -1
  54. data/app/assets/javascripts/pageflow/editor/views/files_explorer_view.js +3 -3
  55. data/app/assets/javascripts/pageflow/editor/views/input_view.js +2 -2
  56. data/app/assets/javascripts/pageflow/editor/views/inputs/select_input_view.js +1 -1
  57. data/app/assets/javascripts/pageflow/editor/views/notifications_view.js +12 -1
  58. data/app/assets/javascripts/pageflow/editor/views/publish_entry_view.js +5 -4
  59. data/app/assets/javascripts/pageflow/page_types/video.js +0 -1
  60. data/app/assets/javascripts/pageflow/widgets/player_controls.js +1 -1
  61. data/app/assets/stylesheets/pageflow/editor/base.css.scss +1 -0
  62. data/app/assets/stylesheets/pageflow/editor/confirmable_files.css.scss +67 -0
  63. data/app/assets/stylesheets/pageflow/editor/file_stages.css.scss +5 -0
  64. data/app/assets/stylesheets/pageflow/editor/file_thumbnails.css.scss +10 -0
  65. data/app/assets/stylesheets/pageflow/editor/files.css.scss +3 -1
  66. data/app/assets/stylesheets/pageflow/editor/files_explorer.css.scss +30 -2
  67. data/app/assets/stylesheets/pageflow/editor/files_gallery.css.scss +1 -2
  68. data/app/assets/stylesheets/pageflow/editor/notifications.css.scss +18 -1
  69. data/app/assets/stylesheets/pageflow/editor/quotas.css.scss +1 -1
  70. data/app/assets/stylesheets/pageflow/editor/tabs_view.css.scss +2 -0
  71. data/app/assets/stylesheets/pageflow/mixins.css.scss +2 -1
  72. data/app/assets/stylesheets/pageflow/mixins/icons.css.scss +4 -308
  73. data/app/assets/stylesheets/pageflow/mixins/icons/entypo.css.scss +295 -0
  74. data/app/assets/stylesheets/pageflow/mixins/icons/fontawesome.css.scss +520 -0
  75. data/app/assets/stylesheets/pageflow/mixins/label.css.scss +5 -0
  76. data/app/assets/stylesheets/pageflow/themes/default.css.scss +11 -0
  77. data/app/assets/stylesheets/pageflow/themes/default/anchors.css.scss +3 -8
  78. data/app/assets/stylesheets/pageflow/themes/default/loading_spinner.css.scss +96 -9
  79. data/app/assets/stylesheets/pageflow/themes/default/navigation.css.scss +128 -183
  80. data/app/assets/stylesheets/pageflow/themes/default/overview.css.scss +48 -6
  81. data/app/assets/stylesheets/pageflow/themes/default/page.css.scss +3 -6
  82. data/app/assets/stylesheets/pageflow/themes/default/player_controls.css.scss +31 -0
  83. data/app/controllers/concerns/pageflow/quota_verification.rb +4 -4
  84. data/app/controllers/pageflow/editor/encoding_confirmations_controller.rb +45 -0
  85. data/app/controllers/pageflow/editor/entry_publications_controller.rb +48 -0
  86. data/app/controllers/pageflow/entries_controller.rb +8 -3
  87. data/app/controllers/pageflow/revisions_controller.rb +0 -10
  88. data/app/controllers/pageflow/video_files_controller.rb +7 -1
  89. data/app/helpers/pageflow/config_helper.rb +9 -0
  90. data/app/helpers/pageflow/entries_helper.rb +3 -3
  91. data/app/helpers/pageflow/pages_helper.rb +2 -2
  92. data/app/helpers/pageflow/quota_helper.rb +1 -1
  93. data/app/jobs/pageflow/poll_meta_data_from_zencoder_job.rb +9 -0
  94. data/app/jobs/pageflow/poll_zencoder_job.rb +3 -3
  95. data/app/jobs/pageflow/request_meta_data_from_zencoder_job.rb +14 -0
  96. data/app/jobs/pageflow/submit_file_to_zencoder_job.rb +0 -2
  97. data/app/models/pageflow/account.rb +9 -4
  98. data/app/models/pageflow/audio_file.rb +2 -0
  99. data/app/models/pageflow/draft_entry.rb +5 -1
  100. data/app/models/pageflow/edit_lock.rb +2 -0
  101. data/app/models/pageflow/encoding_confirmation.rb +40 -0
  102. data/app/models/pageflow/entry.rb +3 -3
  103. data/app/models/pageflow/entry_publication.rb +27 -0
  104. data/app/models/pageflow/page.rb +6 -6
  105. data/app/models/pageflow/published_entry.rb +3 -3
  106. data/app/models/pageflow/theming.rb +20 -0
  107. data/app/models/pageflow/video_file.rb +2 -0
  108. data/app/state_machines/pageflow/encoded_file_state_machine.rb +41 -1
  109. data/app/views/admin/accounts/_account_details.html.arb +5 -0
  110. data/app/views/admin/accounts/_entries_panel.html.arb +15 -0
  111. data/app/views/admin/accounts/_form.html.erb +18 -0
  112. data/app/views/admin/accounts/_theming_details.html.arb +6 -0
  113. data/app/views/admin/accounts/_users_panel.html.arb +15 -0
  114. data/app/views/admin/entries/_links.html.arb +3 -2
  115. data/app/views/admin/users/_form.html.erb +2 -2
  116. data/app/views/admin/users/_quota_exhausted.html.erb +1 -0
  117. data/app/views/pageflow/config/_editor_seeds.json.jbuilder +2 -0
  118. data/app/views/pageflow/editor/encoding_confirmations/_summary.html.erb +1 -0
  119. data/app/views/pageflow/editor/encoding_confirmations/check.json.jbuilder +3 -0
  120. data/app/views/pageflow/editor/entry_publications/check.json.jbuilder +11 -0
  121. data/app/views/pageflow/editor/quotas/{_published_entries_exceeded.html.erb → _published_entries_exhausted.html.erb} +1 -1
  122. data/app/views/pageflow/entries/_entry.html.erb +1 -1
  123. data/app/views/pageflow/entries/_navigation.html.erb +2 -2
  124. data/app/views/pageflow/entries/_social_meta_tags.html.erb +2 -2
  125. data/app/views/pageflow/entries/_theming.css.erb +1 -0
  126. data/app/views/pageflow/entries/edit.html.erb +3 -1
  127. data/app/views/pageflow/entries/navigation/_bar_top.html.erb +2 -2
  128. data/app/views/pageflow/entries/show.css.erb +3 -1
  129. data/app/views/pageflow/entries/show.html.erb +13 -13
  130. data/config/initializers/page_type_helpers.rb +1 -0
  131. data/config/locales/activerecord.de.yml +41 -22
  132. data/config/locales/admin/accounts.yml +0 -1
  133. data/config/locales/admin/entries.yml +6 -2
  134. data/config/locales/admin/themings.yml +7 -0
  135. data/config/locales/admin/users/me.de.yml +2 -2
  136. data/config/locales/editor.de.yml +9 -3
  137. data/config/locales/quotas.de.yml +1 -1
  138. data/config/routes.rb +34 -27
  139. data/db/migrate/20140624135420_create_themings.rb +15 -0
  140. data/db/migrate/20140624135421_create_themings_for_existing_accounts.rb +26 -0
  141. data/db/migrate/20140624135422_change_theme_references_to_theming_references.rb +45 -0
  142. data/db/migrate/20140624135423_remove_attributes_from_themes.rb +10 -0
  143. data/db/migrate/20140624135424_create_accounts_themes_join_table.rb +8 -0
  144. data/db/migrate/20140624135425_move_cname_from_account_to_theming.rb +21 -0
  145. data/db/migrate/20140625184800_drop_themes.rb +14 -0
  146. data/db/migrate/20140704110631_add_confirmed_by_to_encoded_files.rb +6 -0
  147. data/lib/generators/pageflow/initializer/templates/pageflow.rb +9 -0
  148. data/lib/generators/pageflow/theme/theme_generator.rb +28 -0
  149. data/lib/pageflow.rb +9 -2
  150. data/lib/pageflow/ability_mixin.rb +1 -1
  151. data/lib/pageflow/built_in_page_type.rb +1 -1
  152. data/lib/pageflow/configuration.rb +49 -6
  153. data/lib/pageflow/engine.rb +11 -1
  154. data/lib/pageflow/quota.rb +42 -15
  155. data/lib/pageflow/quotas.rb +15 -0
  156. data/lib/pageflow/seeds.rb +12 -16
  157. data/lib/pageflow/theme.rb +14 -0
  158. data/lib/pageflow/themes.rb +25 -0
  159. data/lib/pageflow/user_mixin.rb +1 -1
  160. data/lib/pageflow/version.rb +1 -1
  161. data/lib/pageflow/zencoder_meta_data_output_definition.rb +23 -0
  162. data/spec/factories/accounts.rb +9 -0
  163. data/spec/factories/audio_files.rb +46 -0
  164. data/spec/factories/chapters.rb +21 -0
  165. data/spec/factories/edit_locks.rb +11 -0
  166. data/spec/factories/entries.rb +33 -0
  167. data/spec/factories/file_usages.rb +8 -0
  168. data/spec/factories/folders.rb +8 -0
  169. data/spec/factories/image_files.rb +38 -0
  170. data/spec/factories/invited_user.rb +10 -0
  171. data/spec/factories/memberships.rb +8 -0
  172. data/spec/factories/pages.rb +14 -0
  173. data/spec/factories/revisions.rb +22 -0
  174. data/spec/factories/themings.rb +8 -0
  175. data/spec/factories/users.rb +39 -0
  176. data/spec/factories/video_files.rb +46 -0
  177. metadata +103 -39
  178. data/app/assets/javascripts/pageflow/editor/models/quota.js +0 -18
  179. data/app/assets/javascripts/pageflow/editor/views/quota_decorator_view.js +0 -45
  180. data/app/controllers/pageflow/editor/quotas_controller.rb +0 -13
  181. data/app/models/pageflow/theme.rb +0 -4
  182. data/app/views/admin/users/_quota_exceeded.html.erb +0 -1
  183. data/app/views/pageflow/editor/quotas/show.json.jbuilder +0 -5
@@ -0,0 +1,5 @@
1
+ @mixin label {
2
+ overflow: hidden;
3
+ text-overflow: ellipsis;
4
+ white-space: nowrap;
5
+ }
@@ -19,6 +19,16 @@ $addInfobox-border-color: #505050;
19
19
  $standard-font: SourceSansPro;
20
20
  $standard-font-size: 16px;
21
21
 
22
+ @mixin shine-gradient {
23
+ background: #ffffff; /* Old browsers */
24
+ background: -moz-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(0, 0, 0, 0.1) 29%,rgba(0,0,0,0.05) 90%,rgba(246,246,246,0.1) 100%); /* FF3.6+ */
25
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(29%,rgba(0,0,0,0.1)), color-stop(90%,rgba(0,0,0,0.05)), color-stop(100%,rgba(246,246,246,0.1))); /* Chrome,Safari4+ */
26
+ background: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(0, 0, 0, 0.1) 29%,rgba(0,0,0,0.05) 90%,rgba(246,246,246,0.1) 100%); /* Chrome10+,Safari5.1+ */
27
+ background: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(0, 0, 0, 0.1) 29%,rgba(0,0,0,0.05) 90%,rgba(246,246,246,0.1) 100%); /* Opera 11.10+ */
28
+ background: -ms-linear-gradient(top, rgba(255,255,255,0.1) 0%,rgba(0, 0, 0, 0.1) 29%,rgba(0,0,0,0.05) 90%,rgba(246,246,246,0.1) 100%); /* IE10+ */
29
+ background: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%,rgba(0, 0, 0, 0.1) 29%,rgba(0,0,0,0.05) 90%,rgba(246,246,246,0.1) 100%); /* W3C */
30
+ }
31
+
22
32
  @import "bourbon";
23
33
  @import "pageflow/mixins";
24
34
  @import "pageflow/animations";
@@ -28,3 +38,4 @@ $standard-font-size: 16px;
28
38
  @import "./default/page";
29
39
  @import "./default/navigation";
30
40
  @import "./default/overview";
41
+ @import "./default/player_controls";
@@ -20,22 +20,17 @@ $anchor-color: $main-color;
20
20
  margin-right: 5px;
21
21
  }
22
22
 
23
+ @include fa-caret-right-icon;
24
+
23
25
  &:before {
24
- left: -16px;
25
26
  top: 7px;
26
- position: absolute;
27
- background-image: image-url('pageflow/anchor_white.png');
28
27
  width: 10px;
29
28
  height: 12px;
30
- content: "";
31
29
  display: inline-block;
32
30
  background-repeat: no-repeat;
33
31
  background-position: center;
34
32
 
35
-
36
33
  @include phone {
37
- left: -12px;
38
- top: 3px;
39
34
  }
40
35
  }
41
36
  }
@@ -59,6 +54,6 @@ $anchor-color: $main-color;
59
54
 
60
55
  &:hover {
61
56
  text-decoration: underline;
62
- color: $anchor_color;
57
+ color: $anchor-color;
63
58
  }
64
59
  }
@@ -12,18 +12,33 @@
12
12
  margin-left: -102px;
13
13
  margin-top: -101px;
14
14
  position: absolute;
15
+ z-index: 0;
16
+ background-color: $main-color;
17
+ animation: fadeInLoadingSpinner linear 2s;
18
+ animation-iteration-count: 1;
19
+ -webkit-animation: fadeInLoadingSpinner linear 2s;
20
+ -webkit-animation-iteration-count: 1;
21
+ -moz-animation: fadeInLoadingSpinner linear 2s;
22
+ -moz-animation-iteration-count: 1;
23
+ -o-animation: fadeInLoadingSpinner linear 2s;
24
+ -o-animation-iteration-count: 1;
25
+ -ms-animation: fadeInLoadingSpinner linear 2s;
26
+ -ms-animation-iteration-count: 1;
15
27
 
16
28
  &:before {
17
29
  content: " ";
18
- width: 204px;
19
- height: 202px;
30
+ width: 208px;
31
+ height: 208px;
20
32
  position: absolute;
21
33
  background-image: image-url('pageflow/themes/#{$theme-name}/loading_spinner_bg.png');
34
+ z-index: 1;
35
+ top:-2px;
36
+ left: -2px;
22
37
  }
23
38
 
24
39
  div {
25
40
  width: 204px;
26
- height: 202px;
41
+ height: 204px;
27
42
  position: absolute;
28
43
  background-image: image-url('pageflow/themes/#{$theme-name}/loading_spinner.png');
29
44
  @include animation-duration (1.5s);
@@ -34,6 +49,66 @@
34
49
  }
35
50
  }
36
51
 
52
+ @keyframes fadeInLoadingSpinner {
53
+ 0% {
54
+ opacity:0;
55
+ }
56
+ 48% {
57
+ opacity:0;
58
+ }
59
+ 100% {
60
+ opacity:1;
61
+ }
62
+ }
63
+
64
+ @-moz-keyframes fadeInLoadingSpinner {
65
+ 0% {
66
+ opacity:0;
67
+ }
68
+ 48% {
69
+ opacity:0;
70
+ }
71
+ 100% {
72
+ opacity:1;
73
+ }
74
+ }
75
+
76
+ @-webkit-keyframes fadeInLoadingSpinner {
77
+ 0% {
78
+ opacity:0;
79
+ }
80
+ 48% {
81
+ opacity:0;
82
+ }
83
+ 100% {
84
+ opacity:1;
85
+ }
86
+ }
87
+
88
+ @-o-keyframes fadeInLoadingSpinner {
89
+ 0% {
90
+ opacity:0;
91
+ }
92
+ 48% {
93
+ opacity:0;
94
+ }
95
+ 100% {
96
+ opacity:1;
97
+ }
98
+ }
99
+
100
+ @-ms-keyframes fadeInLoadingSpinner {
101
+ 0% {
102
+ opacity:0;
103
+ }
104
+ 48% {
105
+ opacity:0;
106
+ }
107
+ 100% {
108
+ opacity:1;
109
+ }
110
+ }
111
+
37
112
  @include keyframes(rotateSpinner) {
38
113
  from {
39
114
  @include transform(rotate(0deg));
@@ -45,15 +120,27 @@
45
120
 
46
121
  .js .vjs-default-skin {
47
122
  .vjs-loading-spinner {
48
- top: 29px;
49
- left: 30px;
123
+ top: 8px;
124
+ left: 10px;
50
125
  opacity: 1;
51
- margin-left: -39px;
52
- margin-top: -39px;
126
+ width: 43px;
127
+ height: 43px;
128
+ margin-left: 0;
129
+ margin-top: 0;
130
+
131
+ @include fa-gear-icon;
132
+
133
+ @include phone {
134
+ }
53
135
 
54
136
  &:before {
55
- content: " ";
56
- background-image: image-url('pageflow/themes/#{$theme-name}/loading_small.png');
137
+ width: 43px;
138
+ height: 43px;
139
+ top: 0;
140
+ left: 0;
141
+ font-size: 43px;
142
+ color: $main-color;
143
+ background-image: none;
57
144
  }
58
145
  }
59
146
  }
@@ -8,232 +8,161 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
8
8
 
9
9
 
10
10
  .navigation {
11
- .button, .navigation_mute, .navigation_share {
12
- background-image: image-url("pageflow/themes/#{$theme-name}/menu_sprite.png");
13
- height: 42px;
14
- width: 42px;
15
- }
16
-
17
- $normalOffset: -30px;
18
- $mousedownOffset: -140px;
19
- $hoverOffset: -85px;
20
- $deactiveOffset: -195px;
21
11
 
22
- .navigation_main {
23
- $main: -22px;
24
- .button {
25
- background-position: $main $normalOffset;
26
-
27
- @include hover {
28
- background-position: $main $hoverOffset;
29
- }
30
-
31
- @include pressed {
32
- background-position: $main $mousedownOffset;
33
- }
12
+ .navigation_bullet, .navigation_menu > a {
13
+ font-size: 16px;
14
+ width: 28px;
15
+ height: 28px;
16
+ display: block;
17
+ background: -webkit-linear-gradient(-75deg, rgba(255, 255, 255, 0.71), rgba(0, 0, 0, 0.32));
18
+ background-color: #03818c !important;
19
+ box-shadow: 1px 2px 1px 0px rgba(0,0,0,0.2);
20
+ border-radius: 18px;
21
+ color: rgba(255,255,255,0.8);
22
+ cursor: pointer;
23
+ margin: 13px 28px;
24
+ position: relative;
25
+ background-color: rgb(219, 219, 219) !important;
26
+ @include shine-gradient;
27
+
28
+ &:hover, &.active {
29
+ background-color: $nav-color !important;
30
+ -webkit-mask-image: none;
31
+
32
+ .button, .navigation_mute, .navigation_share {
33
+ color: rgba(255,255,255,0.9);
34
+ text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.2);
35
+ }
34
36
  }
35
- &.active .button {
36
- $mainActive: -89px;
37
- background-position: $mainActive $normalOffset;
38
-
39
- @include hover {
40
- background-position: $mainActive $hoverOffset;
41
- }
42
-
43
- @include pressed {
44
- background-position: $mainActive $mousedownOffset;
45
- }
37
+ &:active {
38
+ box-shadow: 0px 1px 1px 0px rgba(0,0,0,0.2);
39
+ -webkit-transform: translate(1px,1px);
40
+ background: linear-gradient(to bottom, rgba(0, 0, 0, 0.2) 0%,rgba(0,0,0,0.2) 40%,rgba(0,0,0,0.2) 100%);
46
41
  }
47
42
  }
48
43
 
49
- $home: -155px;
50
- .navigation_home .button {
51
- background-position: $home $normalOffset;
52
-
53
- @include hover {
54
- background-position: $home $hoverOffset;
55
- }
56
-
57
- @include pressed {
58
- background-position: $home $mousedownOffset;
59
- }
60
- }
61
- .navigation_home.deactivated .button {
62
- @include hover {
63
- background-position: $home $deactiveOffset;
64
- }
65
- background-position: $home $deactiveOffset;
44
+ .button, .navigation_mute, .navigation_share {
45
+ font-family: "FontAwesome";
46
+ font-size: 1em;
47
+ color: rgba(0,0,0,0.75);
48
+ text-shadow: -1px -1px 1px rgba(255, 255, 255, 0.6);
49
+ margin: 1px 0px 0px 0px !important;
50
+ display: inline-block;
51
+ width: 100%;
52
+ text-align: center;
53
+ line-height: 28px;
54
+ border-bottom: 0px !important;
66
55
 
67
- cursor: default;
68
56
  }
69
57
 
70
- .navigation_index {
71
- $index: -222px;
58
+ .navigation_bullet.navigation_home {
59
+ padding-top: 0;
72
60
  .button {
73
- background-position: $index $normalOffset;
61
+ border-bottom: 0;
62
+ font-weight: bold;
74
63
 
75
- @include hover {
76
- background-position: $index $hoverOffset;
77
- }
78
-
79
- @include pressed {
80
- background-position: $index $mousedownOffset;
81
- }
82
- }
83
-
84
- &.active .button {
85
- background-position: $index $hoverOffset;
86
-
87
- @include pressed {
88
- background-position: $index $mousedownOffset;
89
- }
64
+ @include fa-home-icon;
90
65
  }
91
66
  }
92
- $fullscreen: -289px;
93
- .navigation_fullscreen .button {
94
- background-position: $fullscreen $normalOffset;
95
-
96
- @include hover {
97
- background-position: $fullscreen $hoverOffset;
98
- }
99
-
100
- @include pressed {
101
- background-position: $fullscreen $mousedownOffset;
67
+ .navigation_bullet.navigation_index {
68
+ .button {
69
+ @include fa-th-icon;
102
70
  }
103
71
  }
104
- .navigation_fullscreen.active .button {
105
- background-position: $fullscreen $hoverOffset;
106
72
 
107
- @include pressed {
108
- background-position: $fullscreen $mousedownOffset;
109
- }
73
+ &.js .navigation_bar_bottom li.fullscreen {
74
+ height: auto;
110
75
  }
111
76
 
112
- $hide_text: -670px;
113
- .navigation_hide_text .button {
114
- background-position: $hide_text $normalOffset;
77
+ &.js a.scroll_indicator {
78
+ background-image: image-url('pageflow/themes/default/scroll_indicator_sprite.png');
79
+ }
115
80
 
116
- @include hover {
117
- background-position: $hide_text $hoverOffset;
118
- }
81
+ .navigation_bullet.navigation_fullscreen {
119
82
 
120
- @include pressed {
121
- background-position: $hide_text -141px;
83
+ .button {
84
+ font-weight: bold;
85
+ @include fa-expand-icon;
122
86
  }
123
87
  }
124
- .navigation_hide_text.active .button {
125
- background-position: $hide_text $hoverOffset;
88
+ .navigation_bullet.navigation_hide_text {
89
+ .button {
90
+ font-weight: bold;
126
91
 
127
- @include pressed {
128
- background-position: $hide_text -141px;
92
+ @include fa-photo-icon;
129
93
  }
130
94
  }
95
+ .navigation_menu {
96
+ .navigation_mute {
97
+ font-weight: bold;
131
98
 
132
- .navigation_mute {
133
- background-position: -355px $normalOffset;
134
- }
135
- .navigation_mute.muted {
136
- background-position: -489px $normalOffset;
137
- }
138
- .navigation_volume_box {
139
- @include hover {
140
- + a .navigation_mute {
141
- background-position: -355px $hoverOffset;
99
+ @include fa-volume-up-icon;
100
+
101
+ &.muted {
102
+ @include fa-volume-off-icon;
103
+ }
104
+ &.muted:before {
105
+ margin-right: 2px;
142
106
  }
143
107
  }
144
108
  }
145
- .navigation_volume_box {
146
- @include hover {
147
- + a .navigation_mute.muted {
148
- background-position: -489px $hoverOffset;
109
+ .navigation_menu {
110
+ .navigation_share {
111
+ font-weight: bold;
112
+
113
+ @include fa-share-icon;
114
+
115
+ &:before {
116
+ margin-left: 1px;
149
117
  }
150
118
  }
151
119
  }
152
- .navigation_share {
153
- background-position: -555px $normalOffset;
154
- }
155
- .navigation_share_box {
156
- @include hover {
157
- + a .navigation_share {
158
- background-position: -555px $hoverOffset;
159
- }
120
+ .navigation_menu {
121
+ .navigation_credits {
122
+ font-weight: bold;
123
+ @include fa-info-icon;
160
124
  }
161
125
  }
162
- .navigation_credits.button {
163
- $credits: -622px;
164
- background-position: $credits $normalOffset;
165
126
 
166
- @include hover {
167
- background-position: $credits $hoverOffset;
127
+ .navigation_share_box {
128
+ a {
129
+ text-align: center;
130
+
131
+ p {
132
+ font-family: SourceSansPro;
133
+ font-size: 12px;
134
+ }
168
135
  }
169
136
 
170
- @include pressed {
171
- background-position: $credits -141px;
137
+ .share_google, .share_facebook, .share_twitter {
138
+ font-size: 1.5em;
139
+ &:before {
140
+ font-family: "FontAwesome";
141
+ color: white;
142
+ text-shadow: none;
143
+ }
172
144
  }
173
- }
174
- .share_google {
175
- background-position: -855px -39px;
176
- }
177
- .share_twitter {
178
- background-position: -789px -39px;
179
- }
180
- .share_facebook {
181
- background-position: -718px -39px;
182
- }
183
145
 
184
- a {
185
- .navigation_mute {
186
- @include pressed {
187
- background-position: -355px $mousedownOffset;
146
+ a:hover {
147
+ p {
148
+ color: $nav-color;
188
149
  }
189
150
 
190
- &.muted {
191
- @include pressed {
192
- background-position: -489px $mousedownOffset;
151
+ .share_google, .share_facebook, .share_twitter {
152
+ &:before {
153
+ color: $nav-color;
193
154
  }
194
155
  }
195
156
  }
196
- .navigation_share {
197
- @include pressed {
198
- background-position: -555px $mousedownOffset;
199
- }
200
- }
157
+
201
158
  .share_google {
202
- @include pressed {
203
- background-position: -855px -145px;
204
- }
205
- }
206
- .share_twitter {
207
- @include pressed {
208
- background-position: -789px -145px;
209
- }
159
+ @include fa-google-plus-icon;
210
160
  }
211
161
  .share_facebook {
212
- @include pressed {
213
- background-position: -718px -145px;
214
- }
162
+ @include fa-facebook-icon;
215
163
  }
216
-
217
- @include hover {
218
- .navigation_mute {
219
- background-position: -355px $hoverOffset;
220
-
221
- &.muted {
222
- background-position: -489px $hoverOffset;
223
- }
224
- }
225
- .navigation_share {
226
- background-position: -555px $hoverOffset;
227
- }
228
- .share_google {
229
- background-position: -855px -92px;
230
- }
231
- .share_twitter {
232
- background-position: -789px -92px;
233
- }
234
- .share_facebook {
235
- background-position: -718px -92px;
236
- }
164
+ .share_twitter {
165
+ @include fa-twitter-icon;
237
166
  }
238
167
  }
239
168
  }
@@ -281,11 +210,16 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
281
210
  }
282
211
 
283
212
  .overview_mobile .credits a:before, .navigation_credits_box a:before {
284
- background-image: image-url('pageflow/themes/#{$theme-name}/anchor_main_color.png');
213
+ background-image: none;
214
+ top: 1px;
285
215
  }
286
216
 
287
217
  .navigation .navigation_home.deactivated .button {
288
- background-position: -155px -140px
218
+ background-position: -155px -140px;
219
+ }
220
+
221
+ .navigation .navigation_home.deactivated {
222
+ pointer-events: none;
289
223
  }
290
224
 
291
225
  div.navigation > ul.navigation_bar_top > li:nth-child(1) {
@@ -318,6 +252,17 @@ div.navigation .menu_li {
318
252
  background-color: $nav-bg-color;
319
253
  }
320
254
  .navigation .scroller ul a, .navigation.js .scroller ul a {
321
- background-color: $nav-bg-color;
322
- background-color: $nav-bg-color-transparent;
255
+ background-color: transparent;
256
+
257
+ &:after {
258
+ content: "";
259
+ background-color: $nav-bg-color;
260
+ width: 100%;
261
+ height: 100%;
262
+ top: 0;
263
+ position: absolute;
264
+ z-index: -1;
265
+ left: 0;
266
+ opacity: 0.9;
267
+ }
323
268
  }