pageflow 0.9.2 → 0.10.0

data/app/assets/stylesheets/pageflow/navigation_mobile.css.scss

@@ -99,6 +99,44 @@ body {
     }
   }
 
+  .parent_page {
+    @include background-icon-center($color: #ddd);
+    @include fa-arrow-left-icon;
+    cursor: pointer;
+    pointer-events: all;
+    position: absolute;
+    top: 16px;
+    right: 60px;
+    width: 45px;
+    height: 45px;
+    visibility: hidden;
+    @include transform(translate3d(0, -100px, 0));
+    @include transition(transform 0.4s ease, visibility 0.4s, right 250ms);
+
+    &.is_visible {
+      visibility: visible;
+      @include transform(translate3d(0, 0, 0));
+    }
+
+    &:before {
+      z-index: 2;
+    }
+
+    &:after {
+      content: '';
+      display: block;
+      position: absolute;
+      top: 6px;
+      left: 6px;
+      width: 34px;
+      height: 34px;
+      border-radius: 17px;
+      background-color: rgba(53, 53, 53, 0.9);
+      @include box-shadow(0 0 7px #ccc);
+      z-index: 1;
+    }
+  }
+
   .overview_mobile, .imprint_mobile, .sharing_mobile {
     position: absolute;
     top: 0;
@@ -217,6 +255,20 @@ body {
         width: 200px;
         height: 112px;
       }
+
+      &.filtered {
+        display: none;
+      }
+
+      &.animate_in.moving_up {
+        @include animation(pageflow-navigation-bar-slide-in-from-left 0.4s ease-out);
+      }
+
+      &.animate_out.moving_up {
+        opacity: 0;
+        @include animation(pageflow-navigation-bar-slide-out-to-right 0.4s ease-in);
+        @include transform(translate3d(100%, 0, 0));
+      }
     }
 
     a.active {
@@ -251,6 +303,10 @@ body {
       }
     }
 
+    .parent_page {
+      right: 250px;
+    }
+
     .menu.index,
     &.sharing .menu.sharing,
     &.imprint .menu.imprint {

data/app/assets/stylesheets/pageflow/page_transitions.css.scss

@@ -7,4 +7,7 @@
 @import "./page_transitions/cut";
 
 @import "./page_transitions/scroll_right";
-@import "./page_transitions/scroll_left";
+@import "./page_transitions/scroll_left";
+
+@import "./page_transitions/scroll_over_from_right";
+@import "./page_transitions/scroll_over_from_left";

data/app/assets/stylesheets/pageflow/page_transitions/scroll_over_from_left.scss

@@ -0,0 +1,12 @@
+section.scroll_over_from_left {
+  &.animate-in-forwards, &.animate-out-backwards {
+    z-index: 2;
+  }
+
+  &.animate-in-forwards {
+    @include animation(scroll-in-left forwards 1s 1);
+  }
+  &.animate-out-backwards {
+    @include animation(scroll-out-left forwards 1s 1);
+  }
+}

data/app/assets/stylesheets/pageflow/page_transitions/scroll_over_from_right.scss

@@ -0,0 +1,12 @@
+section.scroll_over_from_right {
+  &.animate-in-forwards, &.animate-out-backwards {
+    z-index: 2;
+  }
+
+  &.animate-in-forwards {
+    @include animation(scroll-in-right forwards 1s 1);
+  }
+  &.animate-out-backwards {
+    @include animation(scroll-out-right forwards 1s 1);
+  }
+}

data/app/assets/stylesheets/pageflow/page_types/video.css.scss

@@ -218,4 +218,8 @@
       margin-left: auto;
     }
   }
-}
+}
+
+.js .non_js_video {
+  display: none;
+}

data/app/assets/stylesheets/pageflow/themes/default/page.css.scss

@@ -1,75 +1,212 @@
-$page-font: $standard-font;
-$page-color: $main-color;
+// Typography
+
+/// Default font family for page content
+/// @group page-typography
+$page-font-family: $standard-font !default;
+
+/// Base font size.
+/// @group page-typography
+$page-font-size: 16px !default;
+
+/// Base font size for page content
+/// @group page-typography
+$page-content-font-size: 1em !default;
+
+/// Base font size for page content in phone layout
+/// @group page-typography
+$page-content-phone-font-size: 0.7em !default;
+
+/// Default font fimily for page header
+/// @group page-typography
+$page-header-font-family: $page-font-family !default;
+
+/// Base font size of page header
+/// @group page-typography
+$page-header-font-size: 1.375em !default;
+
+/// Font weight of page header
+/// @group page-typography
+$page-header-font-weight: normal !default;
+
+/// Font size of tagline
+/// @group page-typography
+$page-header-tagline-font-size: 1em !default;
+
+/// Font weight of tagline
+/// @group page-typography
+$page-header-tagline-font-weight: $page-header-font-weight !default;
+
+/// Line height of tagline
+/// @group page-typography
+$page-header-tagline-line-height: normal !default;
+
+/// Margin of tagline
+/// @group page-typography
+$page-header-tagline-margin-top: 0 !default;
+
+/// Font size of title
+/// @group page-typography
+$page-header-title-font-size: 2.3em !default;
+
+/// Font size of title in phone layout
+/// @group page-typography
+$page-header-title-phone-font-size: 1.8em !default;
+
+/// Font size of title on first page of entry
+/// @group page-typography
+$page-header-first-page-title-font-size: 2.5em !default;
+
+/// Font size of title on first page of entry in phone layout
+/// @group page-typography
+$page-header-first-page-title-phone-font-size: 2em !default;
+
+/// Font weight of title
+/// @group page-typography
+$page-header-title-font-weight: $page-header-font-weight !default;
+
+/// Line height of title
+/// @group page-typography
+$page-header-title-line-height: 1em !default;
+
+/// Line height of title
+/// @group page-typography
+$page-header-first-page-title-line-height: 1em !default;
+
+/// Margin top of title
+/// @group page-typography
+$page-header-title-margin-top: 0.4em !default;
+
+/// Margin bottom of title
+/// @group page-typography
+$page-header-title-margin-bottom: 0.4em !default;
+
+/// Font size of subtitle
+/// @group page-typography
+$page-header-subtitle-font-size: 1em !default;
+
+/// Font weight of subtitle
+/// @group page-typography
+$page-header-subtitle-font-weight: $page-header-font-weight !default;
+
+/// Line height of subtitle
+/// @group page-typography
+$page-header-subtitle-line-height: normal !default;
+
+/// Margin of subtitle
+/// @group page-typography
+$page-header-subtitle-margin-bottom: 1.875em !default;
+
+/// Font family of content text
+/// @group page-typography
+$page-content-text-font-family: $page-font-family !default;
+
+/// Font size of content text
+/// @group page-typography
+$page-content-text-font-size: 1.2em !default;
+
+/// Line height of content text
+/// @group page-typography
+$page-content-text-line-height: 1.5em !default;
+
+// Colors
+
+/// Color of text
+/// @group page-colors
+$page-text-color: #fff !default;
+
+/// Color of text on inverted pages
+/// @group page-colors
+$page-inverted-text-color: #000 !default;
+
+/// Background-color of pages
+/// @group page-colors
+$page-background-color: #000 !default;
+
+/// Background-color of inverted pages
+/// @group page-colors
+$page-inverted-background-color: #fff !default;
+
+/// Color of the gradient
+/// @group page-colors
+$page-shadow-color: #000 !default;
+
+/// Color of the gradient on inverted pages
+/// @group page-colors
+$page-shadow-inverted-color: #fff !default;
 
 .page {
-  font-size: 16px;
-  color: #fff;
-  background-color: #000;
-  font-family: $page-font;
+  font-family: $page-font-family;
+  font-size: $page-font-size;
+  color: $page-text-color;
+  background-color: $page-background-color;
 
   .content {
-    font-size: 1em;
+    font-size: $page-content-font-size;
 
     @include phone {
-      font-size: 0.7em;
+      font-size: $page-content-phone-font-size;
     }
   }
 
   .shadow {
-    @include shadow(#000);
+    @include shadow($page-shadow-color);
   }
 
   &.invert {
-    color: #000;
-    background-color: #fff;
+    color: $page-inverted-text-color;
+    background-color: $page-inverted-background-color;
 
     .shadow {
-      @include shadow(#fff);
+      @include shadow($page-shadow-inverted-color);
     }
   }
 
   h2 {
-    font-size: 1.375em;
-  }
+    font-family: $page-header-font-family;
+    font-size: $page-header-font-size;
 
-  h2 .tagline {
+    .tagline {
       display: block;
-      font-size: 1em;
-      font-weight: normal;
-      margin-top: 0;
-      letter-spacing: 0em;
-  }
+      font-size: $page-header-tagline-font-size;
+      font-weight: $page-header-tagline-font-weight;
+      line-height: $page-header-tagline-line-height;
+      margin-top: $page-header-tagline-margin-top;
+      letter-spacing: 0;
+    }
 
-  h2 .title {
-      font-family: $page-font;
+    .title {
       display: block;
-      font-size: 2.3em;
-      font-weight: normal;
-      margin-top: 0.4em;
-      margin-bottom: 0.4em;
-      letter-spacing: 0em;
-      line-height: 1em;
+      font-size: $page-header-title-font-size;
+      font-weight: $page-header-title-font-weight;
+      line-height: $page-header-title-line-height;
+      margin-top: $page-header-title-margin-top;
+      margin-bottom: $page-header-title-margin-top;
+      letter-spacing: 0;
+
       @include phone {
-        font-size: 1.8em;
+        font-size: $page-header-title-phone-font-size;
       }
-  }
+    }
 
-  h2 .subtitle {
+    .subtitle {
       display: block;
-      font-size: 1em;
-      font-weight: normal;
+      font-size: $page-header-subtitle-font-size;
+      font-weight: $page-header-subtitle-font-weight;
+      line-height: $page-header-subtitle-line-height;
       margin-top: 0;
-      margin-bottom: 1.875em;
+      margin-bottom: $page-header-subtitle-margin-bottom;
+    }
   }
 
   .contentText > * {
-    font-size: 1.2em;
-    line-height: 1.5em;
+    font-family: $page-content-text-font-family;
+    font-size: $page-content-text-font-size;
+    line-height: $page-content-text-line-height;
   }
+
   p {
     margin-top: 0;
   }
-
 }
 
 .js .page:first-child {
@@ -110,11 +247,12 @@ $page-color: $main-color;
   }
 
   h2 .title {
-    font-size: 2.5em;
-    letter-spacing: 0em;
-    line-height: 1em;
+    font-size: $page-header-first-page-title-font-size;
+    line-height: $page-header-first-page-title-line-height;
+    letter-spacing: 0;
+
     @include phone {
-        font-size: 2em;
+      font-size: $page-header-first-page-title-phone-font-size;
     }
   }
 }
@@ -125,7 +263,7 @@ $page-color: $main-color;
 .vjs-duration,
 .vjs-time-divider,
 .vjs-current-time {
-  font-family: $page-font;
+  font-family: $standard-font;
   color: white;
 }
 

data/app/assets/stylesheets/pageflow/ui.css.scss

@@ -4,6 +4,7 @@
 %pageflow-ui {
   @import "./ui/forms";
   @import "./ui/tabs_view";
+  @import "./ui/tooltip";
 }
 
 @import "./ui/input/extended_select_input";

data/app/assets/stylesheets/pageflow/ui/forms.css.scss

@@ -6,6 +6,13 @@ label {
   color: #444;
   font-size: 11px;
   font-weight: bold;
+
+  .name {
+    display: inline-block;
+    width: 84%;
+    vertical-align: middle;
+    line-height: 15px;
+  }
 }
 
 /** Make sure the label is on top when an inline help text is displayed */
@@ -237,6 +244,7 @@ textarea.short {
     width: 20px;
     height: 17px;
     text-align: center;
+    pointer-events: all;
   }
 
   position: absolute;
@@ -245,14 +253,15 @@ textarea.short {
   width: 30px;
   height: 0;
   overflow: hidden;
+  pointer-events: none;
 
-  padding-top: 23px;
+  padding-top: 32px;
   margin: 1px;
 
   &:hover {
     padding-left: 5px;
     padding-right: 5px;
-    padding-bottom: 5px;
+    padding-bottom: 12px;
     margin: 0;
     background-color: #e4eef6;
     border: solid 1px #aaa;

data/app/assets/stylesheets/pageflow/ui/input/extended_select_input.css.scss

@@ -41,6 +41,7 @@
     top: 0;
     bottom: 0;
     margin: auto 0;
+    background-repeat: no-repeat;
   }
 
   .text-container {