pageflow 12.0.0.rc3 → 12.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdda86a7651604acbc2fcd947408cfa39fec92b0
-  data.tar.gz: 4871846efc3baf5a247310ef19059d6584c3e75f
+  metadata.gz: 5e9d7ee3858177965bae6a99ab766a47d99e378d
+  data.tar.gz: e0e1d1c4ac6b3c8078096ede75861ead51491a63
 SHA512:
-  metadata.gz: f6f9f206ce5ef78cc200fd3b94ef57edbb9493de28cbffcf863ecbdcbda2e901de679aa838777d5cc2edbd05b2e4133f3436b2b2fb79bd5367984a26f995ec0e
-  data.tar.gz: 53945fb69b645f38ce6a82f8e9b9ec3dc02e1669704e560dd5b60bbe38cc42d26e0a1785786ab29e82accb1a7863d4968466dd89507c57b9bf8643c493ad54f6
+  metadata.gz: 658f05b900adab883cf1dfa36a08733ca8d851b0f28d7bf10f3c7da14adea54586c988fbf08c02060f063a73e5b8311a3683959dd3d8403e97e5916b2a047cd7
+  data.tar.gz: 7ffb315ba5b767a1c1a0234d465eac90a80f1ce85d773470f1dfdc4ba960b590c6e35ecbaad850fa63bd4dfc4eac0a164eb0bfb0a3636c9f2e240c3ac046872a

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # CHANGELOG
 
+### Version 12.0.0.rc4
+
+2017-05-23
+
+[Compare changes](https://github.com/codevise/pageflow/compare/v12.0.0.rc3...v12.0.0.rc4)
+
+##### Breaking Changes
+
+- Remove legacy theme files. All themes have to be based on the
+  default theme.
+  ([#768](https://github.com/codevise/pageflow/pull/768))
+
+##### Bug Fixes
+
+- Bug fix: Fix exception when sorting user accounts table by role
+  ([#769](https://github.com/codevise/pageflow/pull/769))
+- Bug fix: Change roles.high to not expect account membership
+  ([#766](https://github.com/codevise/pageflow/pull/766))
+
 ### Version 12.0.0.rc3
 
 2017-05-12

data/app/models/pageflow/roles.rb

@@ -19,7 +19,10 @@ module Pageflow
 
     def high(user, entry)
       roles = [:none, :member, :previewer, :editor, :publisher, :manager]
-      account_role = Membership.where(user: user, entity: entry.account).first.role || :none
+
+      account_membership = Membership.where(user: user, entity: entry.account).first
+      account_role = account_membership ? account_membership.role : :none
+
       if user.entries.include?(entry)
         entry_role = Membership.where(user: user, entity: entry).first.role
       else

data/app/views/components/pageflow/admin/user_accounts_tab.rb

@@ -2,15 +2,16 @@ module Pageflow
   module Admin
     class UserAccountsTab < ViewComponent
       def build(user)
-        embedded_index_table(user.memberships.on_accounts.includes(:account)
-                              .accessible_by(current_ability, :index),
+        embedded_index_table(user.memberships.on_accounts
+                               .includes(:account).references(:pageflow_accounts)
+                               .accessible_by(current_ability, :index),
                              blank_slate_text: t('pageflow.admin.users.no_accounts')) do
           table_for_collection class: 'memberships', sortable: true, i18n: Pageflow::Membership do
             column :account, sortable: 'pageflow_accounts.name' do |membership|
-              if authorized?(:read, membership.entity)
-                link_to(membership.entity.name, admin_account_path(membership.entity))
+              if authorized?(:read, membership.account)
+                link_to(membership.account.name, admin_account_path(membership.account))
               else
-                membership.entity.name
+                membership.account.name
               end
             end
             column :role, sortable: 'pageflow_memberships.role' do |membership|

data/app/views/components/pageflow/admin/user_entries_tab.rb

@@ -2,22 +2,23 @@ module Pageflow
   module Admin
     class UserEntriesTab < ViewComponent
       def build(user)
-        embedded_index_table(user.memberships.on_entries.includes(:entry, entry: :account)
-                              .accessible_by(current_ability, :index),
+        embedded_index_table(user.memberships.on_entries
+                               .includes(:entry, entry: :account).references(:pageflow_entries)
+                               .accessible_by(current_ability, :index),
                              blank_slate_text: t('pageflow.admin.users.no_entries')) do
           table_for_collection class: 'memberships', sortable: true, i18n: Pageflow::Membership do
             column :entry, sortable: 'pageflow_entries.title' do |membership|
-              link_to(membership.entity.title, admin_entry_path(membership.entity))
+              link_to(membership.entry.title, admin_entry_path(membership.entry))
             end
             column :role, sortable: 'pageflow_memberships.role' do |membership|
               membership_role_with_tooltip(membership.role, scope: 'entries')
             end
             column :account, sortable: 'pageflow_accounts.name' do |membership|
-              if authorized?(:read, membership.entity.account)
-                link_to(membership.entity.account.name,
-                        admin_account_path(membership.entity.account))
+              if authorized?(:read, membership.entry.account)
+                link_to(membership.entry.account.name,
+                        admin_account_path(membership.entry.account))
               else
-                membership.entity.account.name
+                membership.entry.account.name
               end
             end
             column :created_at, sortable: 'pageflow_memberships.created_at'

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '12.0.0.rc3'.freeze
+  VERSION = '12.0.0.rc4'.freeze
 end

data/lib/pageflow/view_component.rb

@@ -1,14 +1,5 @@
 module Pageflow
-  # Base class for Arbre components defined by Pageflow. Store the
-  # builder method name to facilitate calling it in specs.
+  # Base class for Arbre components defined by Pageflow.
   class ViewComponent < Arbre::Component
-    class << self
-      attr_reader :builder_method_name
-    end
-
-    def self.builder_method(name)
-      @builder_method_name = name
-      super
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 12.0.0.rc3
+  version: 12.0.0.rc4
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -926,18 +926,6 @@ files:
 - app/assets/images/pageflow/themes/default/player_controls_loading_spinner.png
 - app/assets/images/pageflow/themes/default/player_controls_sprite.png
 - app/assets/images/pageflow/themes/default/text_sprite.png
-- app/assets/images/pageflow/themes/legacy/menu-arrow-short.png
-- app/assets/images/pageflow/themes/legacy/menu_mobile_imprint.png
-- app/assets/images/pageflow/themes/legacy/menu_mobile_sharing.png
-- app/assets/images/pageflow/themes/legacy/menu_mobile_sprite3.png
-- app/assets/images/pageflow/themes/legacy/mobile_sharing.png
-- app/assets/images/pageflow/themes/legacy/page_thumbnail_mask.png
-- app/assets/images/pageflow/themes/legacy/scroll_down_indicator.png
-- app/assets/images/pageflow/themes/legacy/scroll_down_indicator_invert.png
-- app/assets/images/pageflow/themes/legacy/scroll_indicator_sprite.png
-- app/assets/images/pageflow/themes/legacy/touch_indicator.png
-- app/assets/images/pageflow/themes/legacy/touch_indicator_invert.png
-- app/assets/images/pageflow/themes/legacy/volume_control_sprite.png
 - app/assets/images/pageflow/video_controls.png
 - app/assets/images/pageflow/video_pictogram.png
 - app/assets/images/pageflow/video_pictogram_small.png
@@ -1542,17 +1530,6 @@ files:
 - app/assets/stylesheets/pageflow/themes/default/video_player.scss
 - app/assets/stylesheets/pageflow/themes/default/video_player/vjs_base.scss
 - app/assets/stylesheets/pageflow/themes/default/video_wrapper.scss
-- app/assets/stylesheets/pageflow/themes/legacy.scss
-- app/assets/stylesheets/pageflow/themes/legacy/indicators.scss
-- app/assets/stylesheets/pageflow/themes/legacy/navigation.scss
-- app/assets/stylesheets/pageflow/themes/legacy/navigation_mobile.scss
-- app/assets/stylesheets/pageflow/themes/legacy/overview.scss
-- app/assets/stylesheets/pageflow/themes/legacy/page.scss
-- app/assets/stylesheets/pageflow/themes/legacy/page_types.scss
-- app/assets/stylesheets/pageflow/themes/legacy/page_types/audio.scss
-- app/assets/stylesheets/pageflow/themes/legacy/page_types/video.scss
-- app/assets/stylesheets/pageflow/themes/legacy/player_controls.scss
-- app/assets/stylesheets/pageflow/themes/legacy/video_player.scss
 - app/assets/stylesheets/pageflow/ui.scss
 - app/assets/stylesheets/pageflow/ui/forms.scss
 - app/assets/stylesheets/pageflow/ui/input/extended_select_input.scss

data/app/assets/stylesheets/pageflow/themes/legacy.scss

@@ -1,8 +0,0 @@
-@import "video-js";
-
-@import "./legacy/indicators";
-@import "./legacy/page_types";
-@import "./legacy/navigation";
-@import "./legacy/overview";
-@import "./legacy/video_player";
-@import "./legacy/player_controls";

data/app/assets/stylesheets/pageflow/themes/legacy/indicators.scss

@@ -1,64 +0,0 @@
-// scss-lint:disable all
-
-.entry {
-  .indicator {
-    color: #e6e6e6;
-
-    text-transform: uppercase;
-    text-shadow: 1px 1px 4px rgba(43, 43, 43, 1);
-    font-size: 0.92em;
-    letter-spacing: 0.2em;
-
-    padding-left: 40px;
-    font-family: sourcesanspro;
-    padding-top: 6px;
-
-    &:before {
-      background-size: auto auto;
-      background-position: top left;
-      background-repeat: no-repeat;
-      content: "";
-      width: 100%;
-      height: 100%;
-      left: 0;
-      top: 1px;
-      position: absolute;
-    }
-
-    @include phone {
-      text-shadow: 1px 1px 1px rgba(43, 43, 43, 1);
-      font-size: 0.8em;
-      letter-spacing: 0.1em;
-    }
-  }
-
-  .scroll_indicator {
-    &:before {
-      background-image: image-url("pageflow/themes/legacy/scroll_down_indicator.png");
-    }
-
-    &.invert {
-      text-shadow: 1px 1px 4px #FDFDFD;
-      color: #0A0A0A;
-
-      &:before {
-        background-image: image-url("pageflow/themes/legacy/scroll_down_indicator_invert.png");
-      }
-    }
-  }
-
-  .hidden_text_indicator {
-    display: none;
-    left: 8%;
-
-    &:before {
-      background-image: image-url("pageflow/themes/legacy/touch_indicator.png");
-    }
-
-    &.invert {
-      &:before {
-        background-image: image-url("pageflow/themes/legacy/touch_indicator_invert.png");
-      }
-    }
-  }
-}

data/app/assets/stylesheets/pageflow/themes/legacy/navigation.scss

@@ -1,262 +0,0 @@
-// scss-lint:disable all
-
-$bg-color: #353535;
-$nav-color: #9c9c9c;
-
-.navigation {
-  color: $nav-color;
-
-  @mixin box {
-    background-color: $bg-color;
-    border: 2px solid $nav-color;
-    right: 90px;
-
-    &:before {
-      content: " ";
-      background-image: image-url("pageflow/themes/legacy/menu-arrow-short.png");
-      display: block;
-      position: absolute;
-      width: 10px;
-      height: 38px;
-      left: 100%;
-      top: 4px;
-    }
-  }
-
-  a {
-    @include hover {
-      -webkit-mask-image: image-url("pageflow/themes/legacy/page_thumbnail_mask.png");
-      -webkit-mask-position-y: 2px;
-    }
-  }
-
-  .navigation_site_detail {
-    @include box;
-    font-size: 1em;
-    line-height: 1.1em;
-    font-family: sourcesanspro;
-    color: white;
-  }
-
-  .navigation_bullet {
-    background-color: $bg-color;
-
-    @include hover {
-      -webkit-mask-image: none;
-    }
-  }
-
-  .navigation_menu {
-    a {
-      -webkit-mask-position-y: -4px !important;
-    }
-  }
-
-  .navigation_menu_box {
-    @include box;
-
-    a {
-      @include hover {
-        -webkit-mask-image: none;
-      }
-    }
-
-    &:before {
-      top: auto;
-      bottom: -2px;
-    }
-  }
-
-  .navigation_share_box {
-    $size: 28px;
-    width: 210px;
-
-    a {
-      float: left;
-      text-decoration: none;
-      padding: 0 15px 0 15px;
-      width: 39px;
-
-      p {
-        color: $nav-color;
-        font-size: 9px;
-        margin-bottom: 0;
-        text-align: center;
-      }
-
-      .button {
-        width: $size;
-        height: $size;
-        margin: auto;
-      }
-    }
-  }
-
-  .navigation_credits_box {
-    font-family: "sourcesanspro";
-    font-size: 1em;
-
-    a {
-      color: #b4c552;
-    }
-  }
-}
-
-.navigation.js {
-  .navigation_bg,
-  .navigation_bullet .button {
-    background-repeat: no-repeat;
-    border-bottom: 2px solid $nav-color;
-  }
-
-  .navigation_bar_top,
-  .navigation_bar_bottom {
-    opacity: 0.9;
-
-    li:last-child a .button {
-      border-bottom: none;
-    }
-  }
-
-  .navigation_bar_top {
-    top: 0;
-    height: 180px;
-
-    &:after {
-      background-color: $bg-color;
-      content: " ";
-      display: block;
-      height: 50px;
-      width: 100%;
-    }
-  }
-
-  .scroller {
-    top: 180px;
-    bottom: 268px;
-
-    &:after {
-      background-color: $bg-color;
-      opacity: 0.9;
-    }
-
-    a {
-      background-color: $bg-color;
-      background-color: rgba(53, 53, 53, 0.9);
-
-      &.active {
-        img {
-          border-left: 5px solid #A6D513;
-        }
-      }
-    }
-  }
-
-  &.with_home_button {
-    .navigation_bar_top {
-      height: 224px;
-    }
-
-    .scroller {
-      top: 224px;
-    }
-
-    .navigation_scroll_indicator.top {
-      top: 189px;
-    }
-  }
-
-  a.navigation_scroll_indicator {
-    $normal-offset: -14px;
-    $hover-offset: -115px;
-    $pressed-offset: -64px;
-
-    background-image: image-url("pageflow/themes/legacy/scroll_indicator_sprite.png");
-    background-repeat: no-repeat;
-    background-color: transparent;
-    width: 35px;
-    height: 30px;
-    right: 25px;
-    -webkit-mask-image: none;
-
-    &.top {
-      top: 145px;
-
-      $top-offset: -13px;
-      background-position: $top-offset $normal-offset;
-
-      @include hover {
-        background-position: $top-offset $hover-offset;
-      }
-
-      @include pressed {
-        background-position: $top-offset $pressed-offset;
-      }
-    }
-
-    &.bottom {
-      bottom: 234px;
-
-      $bottom-offset: -161px;
-      background-position: $bottom-offset $normal-offset;
-
-      @include hover {
-        background-position: $bottom-offset $hover-offset;
-      }
-
-      @include pressed {
-        background-position: $bottom-offset $pressed-offset;
-      }
-    }
-  }
-
-  .navigation_bar_bottom {
-    height: 268px;
-    bottom: 0;
-
-    & > li > a {
-      background-color: $bg-color;
-    }
-
-    .indicator {
-      background-color: $bg-color;
-    }
-
-    .fullscreen {
-      background-color: $bg-color;
-    }
-  }
-
-  .navigation_menu_box.navigation_volume_box .volume-control {
-    &:before, &:after {
-      background-image: image-url('pageflow/themes/legacy/volume_control_sprite.png');
-      position: absolute;
-      width: 19px;
-      height: 19px;
-      content: " ";
-      background-repeat: no-repeat;
-      top: 8px;
-    }
-
-    &:before {
-      background-position: left top;
-      left: 0;
-      left: 12px;
-    }
-    &:after {
-      right: 8px;
-      background-position: -21px top;
-      top: 8px;
-    }
-  }
-
-  .volume-control {
-    .volume-slider {
-      background-color: gray;
-    }
-
-    .volume-level {
-      background-color: #b4c552;
-    }
-  }
-}

data/app/assets/stylesheets/pageflow/themes/legacy/navigation_mobile.scss

@@ -1,52 +0,0 @@
-// scss-lint:disable all
-
-.navigation_mobile {
-  font-family: sourcesanspro;
-
-  .menu {
-    background-image: image-url('pageflow/themes/legacy/menu_mobile_sprite3.png');
-
-    &.imprint {
-      background-image: image-url('pageflow/themes/legacy/menu_mobile_imprint.png');
-    }
-
-    &.sharing {
-      background-image: image-url('pageflow/themes/legacy/menu_mobile_sharing.png');
-    }
-  }
-
-  .wrapper {
-    a.active {
-      border-left: 5px solid #A6D513;
-    }
-    .credits {
-      color: grey;
-    }
-  }
-
-  .overview_mobile, .imprint_mobile, .sharing_mobile {
-    background-color: #232323;
-
-    .credits{
-      font-family: "sourcesanspro";
-
-      a {
-        color: #b4c552;
-
-        &:hover {
-          color: white;
-        }
-      }
-    }
-  }
-
-  &.active {
-    .sharing_mobile li > a {
-      color: white;
-
-      &:before {
-        background-image: image-url('pageflow/themes/legacy/mobile_sharing.png');
-      }
-    }
-  }
-}

data/app/assets/stylesheets/pageflow/themes/legacy/overview.scss

@@ -1,50 +0,0 @@
-// scss-lint:disable all
-
-.overview {
-  @import "pageflow/themes/default/overview/chapter_border_images";
-
-  font-family: sourcesanspro;
-
-  &:after {
-    background-color: black;
-  }
-
-  &.active:after {
-    opacity: 0.4;
-  }
-
-  .content {
-    color: #fff;
-
-    h2 {
-      font-size: 3em;
-    }
-
-    .ov_chapter {
-      .heading-4 {
-        font-weight: bold;
-        font-size: 1.1em;
-      }
-
-      .heading-5 {
-        font-size: 1em;
-        text-transform: uppercase;
-        font-weight: normal;
-      }
-
-      .ov_page {
-        border: 1px solid #505050;
-        color: #fff;
-
-        &.active {
-          border-color: #ddd;
-        }
-      }
-
-      .ov_page_description {
-        background-color: #5d6c0c;
-        border-right: 1px solid #505050;
-      }
-    }
-  }
-}

data/app/assets/stylesheets/pageflow/themes/legacy/page.scss

@@ -1,48 +0,0 @@
-.js .page {
-  .close_button {
-    cursor: pointer;
-    display: block;
-    background-position: -45px 0;
-    background-repeat: no-repeat;
-    width: 45px;
-    height: 45px;
-    position: absolute;
-    top: 20px;
-
-    right: 100px;
-    z-index: 10;
-    background-size: 200% auto;
-    background-image: image-url('pageflow/close_sprite_shadow.png');
-
-    &:hover {
-      background-position: 0 0;
-    }
-
-    .label {
-      text-transform: uppercase;
-      text-shadow: 1px 1px 4px #2b2b2b;
-      font-size: 1.0em;
-      letter-spacing: 0.1em;
-      color: #FFFEFE;
-      position: absolute;
-      margin-right: 115%;
-      text-align: right;
-      right: 0px;
-      margin-top: 14px;
-      margin-left: 1em;
-    }
-
-    @include phone {
-      right: 40px;
-    }
-
-    @include pad_portrait {
-      right: 40px;
-    }
-  }
-
-  &.invert .close_button .label {
-    color: #2b2b2b;
-    text-shadow: 1px 1px 4px #fff;
-  }
-}

data/app/assets/stylesheets/pageflow/themes/legacy/page_types.scss

@@ -1,2 +0,0 @@
-@import "page_types/audio";
-@import "page_types/video";

data/app/assets/stylesheets/pageflow/themes/legacy/page_types/audio.scss

@@ -1,5 +0,0 @@
-.audioPage {
-  .control_bar_text {
-    display: none;
-  }
-}

data/app/assets/stylesheets/pageflow/themes/legacy/page_types/video.scss

@@ -1,120 +0,0 @@
-// scss-lint:disable all
-
-.videoWrapper {
-  @include desktop {
-    position: relative;
-    height: 100%;
-    width: 100%;
-  }
-  @include pad_portrait {
-    margin-right: 0;
-    position: initial;
-    height: initial;
-  }
-}
-
-.js .videoWrapper {
-  @include desktop {
-    position: relative;
-    height: 100%;
-    width: auto;
-    margin-right: 85px;
-  }
-  @include pad_portrait {
-    margin-right: 0;
-  }
-}
-
-.page .videoPage {
-  .scroller.vjs-fade-out {
-    visibility: initial;
-  }
-}
-
-.js .page .videoPage {
-  .vjs-control-bar {
-    @include transform(translate3d(-50%, 0, 0));
-
-    @include phone {
-      @include transform(translate3d(0, 0, 0));
-    }
-  }
-  /* overwriting video js auto hiding control rules */
-  /* Fading sytles, used to fade control bar. */
-  .vjs-fade-in {
-    display: initial !important;
-    visibility: initial;
-    /* Needed to make sure things hide in older browsers too. */
-    opacity: initial;
-    -webkit-transition: none;
-    -moz-transition: none;
-    -ms-transition: none;
-    -o-transition: none;
-    transition: none }
-
-  .vjs-fade-out {
-    display: initial!important;
-    visibility: initial;
-    opacity: initial;
-    -webkit-transition: none;
-    -moz-transition: none;
-    -ms-transition: none;
-    -o-transition: none;
-    transition: none;
-    /* Wait a moment before fading out the control bar */
-    -webkit-transition-delay: none;
-    -moz-transition-delay: none;
-    -ms-transition-delay: none;
-    -o-transition-delay: none;
-    transition-delay: none; }
-
-  /* Hide disabled or unsupported controls */
-  .vjs-default-skin .vjs-hidden {
-    display: initial; }
-
-  .vjs-lock-showing {
-    display: initial !important;
-    opacity: initial;
-    visibility: initial; }
-
-    /* Fading sytles, used to fade control bar. */
-  .fade-in {
-    display: block !important;
-    /* Needed to make sure things hide in older browsers too. */
-    opacity: 1;
-    -webkit-transition: 0.1s;
-    -moz-transition: 0.1s;
-    -ms-transition: 0.1s;
-    -o-transition: 0.1s;
-    transition: 0.1s;
-  }
-
-  .fade-out {
-    display: block !important;
-    opacity: 0 !important;
-    -webkit-transition: 1.5s;
-    -moz-transition: 1.5s;
-    -ms-transition: 1.5s;
-    -o-transition: 1.5s;
-    transition: 1.5s;
-    /* Wait a moment before fading out the control bar */
-    -webkit-transition-delay: 2s;
-    -moz-transition-delay: 2s;
-    -ms-transition-delay: 2s;
-    -o-transition-delay: 2s;
-    transition-delay: 2s; }
-
-  /* Hide disabled or unsupported controls */
-  .vjs-default-skin .vjs-hidden {
-    display: none; }
-
-  .lock-showing {
-    display: block !important;
-    opacity: 1;
-    visibility: visible;
-  }
-
-  .control_bar_text {
-    display: none;
-  }
-}

data/app/assets/stylesheets/pageflow/themes/legacy/player_controls.scss

@@ -1,364 +0,0 @@
-.controls .add_info_box {
-  width: 87%;
-  margin: 1em 5% 1.5em 8%;
-  position: relative;
-  z-index: 2;
-  font-size: 0.8em;
-  color: white;
-
-  @include phone {
-    font-size: 1.2em;
-  }
-
-  h3,
-  p {
-    margin: 15px 3%;
-    width: 94%;
-  }
-
-  a {
-    color: white;
-  }
-
-  &.empty {
-    display: none;
-  }
-
-  &:before {
-    content: "";
-    position: absolute;
-    left: -3px;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(39, 39, 39, 1);
-    border: 3px solid rgb(39,39,39);
-    z-index: -1;
-    opacity: 0.95;
-    border-radius: 4px;
-  }
-}
-
-.js .vjs-control {
-  pointer-events: all;
-}
-
-.js {
-  .controls {
-    position: absolute;
-    bottom: 10%;
-    left: 50%;
-    z-index: 2;
-
-    @include phone {
-      left: 5%;
-    }
-
-    .control_bar_text {
-      position: absolute;
-      left: 80px;
-      top: 20px;
-      color: #ddd;
-
-      @include phone {
-        display: none;
-      }
-    }
-  }
-
-  .add_info_box {
-    pointer-events: none;
-    margin: 0 0 63px 0;
-    width: 434px;
-    bottom: 0;
-    margin-bottom: 63px;
-    position: absolute;
-    left: 50%;
-    @include transform(translate3d(-50%, 0,0));
-    z-index: 2;
-    font-size: 0.8em;
-
-    @include phone {
-      font-size: 1.2em;
-    }
-  }
-
-  .vjs-control-bar {
-    position: absolute;
-    width: 434px;
-    height: 60px;
-    bottom: 0;
-    background-color: #191919;
-    border: 3px solid #505050;
-    left: 50%;
-    z-index: 2;
-    @include transform(translate3d(-50%, 0, 0));
-    display: block;
-  }
-
-  .vjs-control-bar:before {
-    position: absolute;
-    border-right: 2px solid #505050;
-    top: 0;
-    left: 64px;
-    width: 0;
-    height: 60px;
-    content: "";
-  }
-
-  .vjs-controls {
-    width: 100%;
-    height: 100%;
-    &.vjs-player {
-      display: block;
-    }
-
-    .vjs-progress-control:focus {
-      background: rgba(100, 100, 100, 0.7);
-      -webkit-box-shadow: 0 0 2em white;
-      -moz-box-shadow: 0 0 2em white;
-      box-shadow: 0 0 2em white;
-    }
-  }
-
-  .vjs-control:before {
-    text-shadow: none;
-  }
-
-  .vjs-play-control {
-    width: 40px;
-    height: 40px;
-    margin-top: 10px;
-    margin-left:11px;
-    background-position: center top;
-    background-image: image-url('pageflow/video_controls.png');
-
-    &:hover { background-position: center -40px; }
-    &:active, &.touched { background-position: center -80px; }
-
-    &.vjs-pause { background-position: center -120px; }
-    &.vjs-pause:hover { background-position: center -160px; }
-    &.vjs-pause:active, &.vjs-pause.touched { background-position: center -200px; }
-
-    &.vjs-playing { background-position: center -120px; }
-    &.vjs-playing:hover { background-position: center -160px; }
-    &.vjs-playing:active, &.vjs-paused.touched {  background-position: center -200px; }
-
-    &:before {
-      content: ""
-    }
-  }
-
-  .vjs-progress-control, .vjs-progress-control.vjs-fade-out {
-    left: 90px;
-    right: 114px;
-    top: 25px;
-    height: 9px;
-
-    .vjs-progress-holder {
-      border-radius: 4px;
-      background-color: #333333;
-    }
-
-    .vjs-play-progress {
-      border-radius: 4px;
-      background: initial;
-      /*background-color: #18d4d6;*/
-      background-color: #b4c552;
-    }
-  }
-
-  .vjs-control:before {
-    color: transparent;
-  }
-
-  .vjs-slider-handle {
-    height: 40px;
-    top: -15px;
-    width: 24px;
-    background-image: image-url('pageflow/video_controls.png');
-    background-position: center -240px;
-  }
-
-  .vjs-slider-handle:before {
-    content: "";
-  }
-
-  .vjs-duration-divider, .vjs-fullscreen-control, .vjs-volume-control, .vjs-mute-control {
-    display: none;
-  }
-
-  .vjs-current-time, .vjs-time-divider, .vjs-duration {
-    font-family: SourceSansPro;
-    font-size: 15px;
-    position: relative;
-    margin-top: 7px;
-  }
-
-  .vjs-current-time {
-    left: 276px;
-  }
-
-  .vjs-time-divider {
-    left: 268px;
-  }
-
-  .vjs-duration {
-    left: 260px;
-  }
-
-  .vjs-default-skin {
-    .vjs-loading-spinner {
-      top: 30px;
-      left: 31px;
-      margin-left: -0.5em;
-      margin-top: -0.5em;
-      width: 1em;
-      height: 1em;
-      opacity: 1;
-
-      &:before {
-        content: " ";
-        background-image: image-url('pageflow/loading_small.png');
-        background-repeat: no-repeat;
-        background-position: center;
-      }
-      &:after {
-        content: " ";
-      }
-    }
-  }
-
-  .showing-for-underrun {
-    display: block !important;
-  }
-
-  @include phone {
-    .vjs-progress-control,
-    .vjs-current-time,
-    .vjs-time-divider,
-    .vjs-duration,
-    .vjs-control-bar:before {
-      display: none;
-    }
-
-    .vjs-control-bar {
-      top: 50%;
-      margin-top: -30px;
-      bottom: auto;
-      height: 60px;
-      border: none;
-      background: none;
-      width: 60px;
-      left: 0;
-      margin-left: -4px;
-      max-width: 435px;
-      pointer-events: none;
-      @include transform(translate3d(0,0,0));
-    }
-
-    .add_info_box {
-      position: relative;
-      padding: 1px;
-      margin-bottom: 0;
-      padding-left: 0;
-      max-width: 435px;
-      min-height: 60px;
-      width: 100%;
-      min-width: 260px;
-
-      &.empty {
-        display: block;
-        width: 60px;
-        @include transform(translate3d(0,0,0));
-        left: 0;
-        min-width: 0;
-
-        &:before {
-          display: none;
-        }
-      }
-
-      &:after {
-        content: "";
-        position: absolute;
-        left: -3px;
-        top: 0;
-        width: 60px;
-        height: 100%;
-        padding-bottom: 0px;
-        background-color: #111;
-        z-index: -1;
-        opacity: 0.9;
-      }
-      &:before {
-        border: 0;
-      }
-
-      h3, p {
-        margin-left: 70px;
-        width: 70%;
-      }
-    }
-  }
-
-  @include phone_portrait {
-    .controls {
-      bottom: 50px;
-    }
-  }
-
-/* Controlbar used to toggle embedded media views */
-
-  .controls {
-    pointer-events: none;
-
-    a, .vjs-control-bar {
-      pointer-events: all;
-    }
-
-    @include phone {
-      max-width: 90%;
-
-      .hint {
-        display: block;
-      }
-
-    }
-
-
-  }
-
-  .vjs-control-bar.view-control {
-    .control_bar_text {
-      top: 20px;
-    }
-
-    @include phone {
-      display: block;
-      top: 50%;
-      margin-top: -31px;
-      bottom: auto;
-      height: 60px;
-      width: 60px;
-      left: 0;
-      margin-left: -3px;
-      max-width: 435px;
-      pointer-events: all;
-      @include transform(translate3d(0, 0, 0));
-
-
-      .control_bar_text {
-        display: none;
-      }
-    }
-  }
-}
-
-.vjs-play-control:focus {
-  outline: 3px solid #c1c1c1 !important;
-}
-
-.disable_focus_outline .vjs-play-control:focus {
-  outline: 0 !important;
-}

data/app/assets/stylesheets/pageflow/themes/legacy/video_player.scss

@@ -1,15 +0,0 @@
-.video-js p {
-  position: absolute;
-  top: 30%;
-  left: 20%;
-  width: 60%;
-  max-width: 5000px;
-
-  text-align: center;
-  font-size: 15px;
-  padding: 10px;
-  z-index: 1;
-
-  background-color: #000;
-  color: #fff;
-}