pageflow 0.10.0 → 0.11.0

data/app/assets/javascripts/pageflow/widgets/share_menu.js

@@ -9,15 +9,16 @@
           $closeOnMouseLeaving = options.closeOnMouseLeaving,
           scroller = options.scroller;
 
-      $links.on('touchend click', function(event) {
+      $links.on('click', function(event) {
+
         var $this = $(this),
             $a = $this.find('a').length ? $this.find('a') : $this,
             active = $a.hasClass('active');
 
-        $links.removeClass('active');
-        $a.addClass('active');
-
         if ($a.data('share-page')) {
+          $links.removeClass('active');
+          $a.addClass('active');
+
           event.preventDefault();
 
           var $currentPage = pageflow.slides.currentPage(),

data/app/assets/stylesheets/pageflow/{admin.css.scss → admin.scss}

@@ -1,11 +1,17 @@
 @import "pageflow/mixins";
 
 @import "pageflow/admin/columns";
+@import "pageflow/admin/embedded_index_table";
 @import "pageflow/admin/entries";
 @import "pageflow/admin/forms";
 @import "pageflow/admin/features";
+@import "pageflow/admin/filters";
 @import "pageflow/admin/quotas";
 @import "pageflow/admin/tabs_view";
+@import "pageflow/admin/tooltip_bubble";
+@import "pageflow/admin/icon_link";
+@import "pageflow/admin/icon_button";
+@import "pageflow/admin/publication_state_indicator";
 
 #wrapper {
   overflow: hidden;
@@ -22,13 +28,9 @@
     padding: 12px 17px 10px;
     span.icon { vertical-align: bottom; margin-right: 4px;}
     margin: 0px;
-
-    &:hover{
-      @include icon-color(#000);
-    }
   }
 }
 
 .blank_slate_container {
   margin: 10px 0;
-}
+}

data/app/assets/stylesheets/pageflow/admin/embedded_index_table.scss

@@ -0,0 +1,14 @@
+.embedded_index_table {
+  .sortable a {
+    background: url("/assets/active_admin/orderable.png") no-repeat 100% 2px;
+    padding-right: 13px;
+  }
+
+  .sorted-asc a {
+    background-position: 100% -29px;
+  }
+
+  .sorted-desc a {
+    background-position: 100% -58px;
+  }
+}

data/app/assets/stylesheets/pageflow/admin/{entries.css.scss → entries.scss}

@@ -11,7 +11,10 @@
     }
 
     .published td {
-      background-color: $published-color;
+      // scss-lint:disable ImportantRule
+      // Win against overly specific Active Admin rule
+      background-color: $published-color !important;
+      // scss-lint:enable ImportantRule
       color: #000;
     }
   }
@@ -60,14 +63,7 @@
     clear: both;
   }
 
-  td.buttons {
-    padding: 5px;
-  }
-
-  td.members {
-    max-width: 130px;
-  }
-
-  @import './entries/folders';
-  @import './entries/user_badge_list';
+  @import "./entries/index_table";
+  @import "./entries/folders";
+  @import "./entries/user_badge_list";
 }

data/app/assets/stylesheets/pageflow/admin/entries/index_table.scss

@@ -0,0 +1,15 @@
+.index_table {
+  .publication_state {
+    width: 16px;
+    padding: 5px;
+  }
+
+  .buttons {
+    width: 85px;
+    padding: 5px;
+  }
+
+  .members {
+    max-width: 130px;
+  }
+}

data/app/assets/stylesheets/pageflow/admin/filters.scss

@@ -0,0 +1,3 @@
+#filter_sidebar_section {
+  display: none;
+}

data/app/assets/stylesheets/pageflow/admin/icon_button.scss

@@ -0,0 +1,25 @@
+$icon-button-color: #fff;
+
+a.icon_button:link {
+  @include background-icon-left($font-size: 15px,
+                                $color: $icon-button-color,
+                                $left: 9px,
+                                $top: 50%);
+  padding-left: 30px;
+
+  &:before {
+    font-weight: normal;
+  }
+
+  &.editor {
+    @include fa-pencil-icon;
+  }
+
+  &.preview {
+    @include fa-eye-icon;
+  }
+
+  &.show_public {
+    @include fa-external-link-icon;
+  }
+}

data/app/assets/stylesheets/pageflow/admin/icon_link.scss

@@ -0,0 +1,31 @@
+$icon-link-color: #555;
+
+$icon-link-acitve-color: #000;
+
+.icon_link_to {
+  a {
+    @include background-icon-center($font-size: 16px, $color: $icon-link-color);
+    position: relative;
+    display: inline-block;
+    width: 25px;
+    height: 25px;
+    vertical-align: bottom;
+
+    &:focus,
+    &:hover {
+      @include background-icon-color($icon-link-acitve-color);
+    }
+
+    &.editor {
+      @include fa-pencil-icon;
+    }
+
+    &.preview {
+      @include fa-eye-icon;
+    }
+
+    &.show_public {
+      @include fa-external-link-icon;
+    }
+  }
+}

data/app/assets/stylesheets/pageflow/admin/publication_state_indicator.scss

@@ -0,0 +1,18 @@
+$publication-state-indicator-color: #5d5d5d;
+
+.publication_state_indicator {
+  @include background-icon-center($font-size: 16px, $color: $publication-state-indicator-color);
+  display: inline-block;
+  width: 25px;
+  height: 25px;
+  vertical-align: bottom;
+  border-bottom: none;
+
+  &.published_without_password_protection {
+    @include fa-globe-icon;
+  }
+
+  &.published_with_password_protection {
+    @include fa-lock-icon;
+  }
+}

data/app/assets/stylesheets/pageflow/admin/{tabs_view.css.scss → tabs_view.scss}

@@ -18,9 +18,9 @@
       display: inline-block;
 
       &.active {
-        @include gradient(#f4f4f4, #fff);
+        background-color: #fff;
         color: #444;
-        box-shadow: 1px 1px 1px 0 rgba(0,0,0,0.1) inset;
+        box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, 0.2) inset;
 
         a {
           cursor: default;
@@ -38,6 +38,7 @@
   }
 
   > .tab_container {
+    @include clearfix;
     @extend .panel_contents;
 
     display: none;

data/app/assets/stylesheets/pageflow/admin/tooltip_bubble.scss

@@ -0,0 +1,30 @@
+$tooltip-bubble-background-color: rgba(0, 0, 0, 0.7);
+
+$tooltip-bubble-text-color: #fff;
+
+.tooltip_bubble {
+  position: absolute;
+  display: none;
+  background-color: $tooltip-bubble-background-color;
+  color: $tooltip-bubble-text-color;
+  padding: 5px 10px;
+  top: -30px;
+  white-space: nowrap;
+  border-radius: 2px;
+  pointer-events: none;
+
+  &:before {
+    content: "";
+    position: absolute;
+    top: 100%;
+    left: 8px;
+    @include triangle(10px, $tooltip-bubble-background-color, down);
+  }
+}
+
+:focus,
+:hover {
+  > .tooltip_bubble {
+    display: block;
+  }
+}

data/app/assets/stylesheets/pageflow/{base.css.scss → base.scss}

@@ -8,6 +8,19 @@ html, body, #outer_wrapper {
   -webkit-tap-highlight-color: transparent; /* we need this for some Android browsers */
 }
 
+// Facebook app displays a toolbar at the bottom of the screen on iOS
+// phone which hides parts of the browser viewport. Normally this is
+// hidden once the user scrolls, but since there is no native
+// scrolling in Pageflow, the bar stays and hides page elements like
+// the slim player controls. Setting the wrapper to fixed, makes it
+// work for some reason.
+.has_facebook_toolbar #outer_wrapper {
+  height: auto;
+  position: fixed;
+  top: 0;
+  bottom: 0;
+}
+
 html {
   background-color: black;
 }
@@ -42,8 +55,6 @@ a {
   border: 0 none;
 }
 
-@import "video-js";
-
 @import "bourbon";
 @import "./mixins";
 @import "./animations";
@@ -59,11 +70,10 @@ a {
 @import "./navigation_mobile";
 @import "./overview";
 @import "./header";
+@import "./focus_outline";
 @import "./skip_links";
-@import "./video_player";
-@import "./player_controls";
 @import "./text_variants";
 @import "./multimedia_alert";
 @import "./hide_text";
 @import "./subshare";
-@import "./delayed_text_fade_in";
+@import "./delayed_text_fade_in";

data/app/assets/stylesheets/pageflow/editor/{base.css.scss → base.scss}

@@ -1,8 +1,9 @@
 @import "bourbon";
+
+@import "pageflow/jquery_ui";
 @import "pageflow/ui";
 @import "pageflow/animations";
 
-@import 'pageflow/jquery_ui';
 @import "./blank_entry";
 @import "./dialogs";
 @import "./colors";
@@ -13,6 +14,7 @@
 @import "./help";
 @import "./indicators";
 @import "./disabled_atmo_indicator";
+@import "./unsupported_browser_hint";
 
 .editor {
   @extend %pageflow-ui;

data/app/assets/stylesheets/pageflow/editor/{blank_entry.css.scss → blank_entry.scss}

@@ -21,9 +21,11 @@
       content: "";
       display: block;
       margin: 0 auto 30px auto;
-      width: 61px;
-      height: 60px;
-      background-image: image-url('pageflow/themes/default/logo_header.png');
+      width: 33px;
+      height: 45px;
+      background-size: 33px 45px;
+      background-repeat: no-repeat;
+      background-image: image-url("pageflow/editor/blank_entry/logo.png");
       opacity: 0.3;
     }
   }
@@ -44,4 +46,4 @@
   li {
     padding: 15px 0;
   }
-}
+}

data/app/assets/stylesheets/pageflow/editor/unsupported_browser_hint.scss

@@ -0,0 +1,15 @@
+.unsupported_browser_hint {
+  position: absolute;
+  top: 0;
+  left: 25%;
+  right: 25%;
+  z-index: 1000;
+  line-height: 25px;
+  padding: 10px 50px;
+
+  font-family: sourcesanspro;
+  font-weight: bold;
+  background-color: #fff;
+  color: #444;
+  border: solid 1px #000;
+}