pageflow 15.6.1 → 15.7.0

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

@@ -1,39 +1,23 @@
 .text_tracks {
-  $table-cell-color: #eee;
-
-  height: 700px;
-
   .text_tracks_container {
-    background-color: #fff;
-    min-height: 100%;
+    margin-top: space(4);
+    display: flex;
   }
 
   .files_upload_panel {
-    position: absolute;
-    top: 60px;
-    right: 370px;
-    bottom: 50px;
-    left: 20px;
-    overflow: auto;
+    flex: 1;
+    margin-right: space(8);
   }
 
   .selected_file_panel {
-    position: absolute;
-    right: 20px;
-    top: 60px;
-    width: 330px;
+    width: 300px;
   }
 
   .table_view {
     width: 100%;
   }
 
-  td {
-    background-color: $table-cell-color;
-  }
-
   .upload {
-    position: relative;
-    top: 12px;
+    margin-top: space(4);
   }
 }

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

@@ -18,11 +18,11 @@
   }
 
   .settings {
-    @include icon-only-button(#aaa);
+    @include icon-only-button;
     @include cog-icon;
     display: none;
     position: absolute;
     right: 0;
-    top: 19px;
+    bottom: 5px;
   }
 }

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

@@ -4,28 +4,26 @@
   position: relative;
 
   > a {
-    @include background-icon-center($font-size: 12px);
+    @include background-icon-center($color: var(--ui-on-surface-color-light), $font-size: 12px);
     @include hidden-text;
-
     margin: 0;
     display: inline-block;
     width: 25px;
     height: 25px;
     vertical-align: top;
-
-    border: solid 1px #eee;
+    background-color: var(--ui-primary-color-lightest);
+    border-radius: rounded(sm);
 
     &:hover {
-      background-color: #eee;
+      background-color: var(--ui-primary-color-lighter);
     }
   }
 
-  > .wysihtml5-command-active {
-    border: solid 1px #bbb;
-    background-color: #ddd;
+  > a.wysihtml5-command-active {
+    background-color: var(--ui-primary-color-light);
+    @include background-icon-color(var(--ui-on-primary-color));
   }
 
-
   [data-wysihtml5-command="bold"] {
     @include font-bold-icon;
   }
@@ -86,31 +84,35 @@
 
   .fragment_link_panel {
     display: none;
-    margin: 0 -2px;
+    margin-bottom: space(2);
+  }
 
-    label {
-      margin: -1px 2px;
+  .url_link_panel {
+    label span {
+      display: inline-block;
+      width: 84%;
+      vertical-align: middle;
+      line-height: 15px;
     }
   }
 
   .link_type_select {
+    margin-bottom: space(2);
+
     label {
       display: inline;
+      margin-right: space(2);
     }
   }
 
   .open_in_new_tab_section {
     position: relative;
-    margin: 4px -4px 0 0;
+    margin-top: space(2);
     padding-right: 20px;
 
     label {
       z-index: 4;
     }
-
-    .inline_help {
-      top: -3px;
-    }
   }
 
   .internal {
@@ -118,10 +120,7 @@
   }
 
   label input {
-    display: inline;
-    width: 15px;
-    margin: 5px 0;
-    vertical-align: middle;
+    margin-right: space(1);
 
     &:focus {
       outline: none;
@@ -129,19 +128,26 @@
   }
 
   .dialog {
+    box-shadow: var(--ui-box-shadow);
     position: absolute;
     top: 30px;
     left: -2px;
     right: -6px;
-    padding: 5px 10px;
-
-    background-color: #fff;
-    border: solid 1px #444;
+    padding: space(4);
+    border: solid 1px var(--ui-on-surface-color-lighter);
+    background-color: var(--ui-surface-color);
+    z-index: 10;
 
     .button {
-      @include button;
+      @include simple-button;
+      padding: 5px 10px;
+      margin-top: 0.5rem;
+    }
+
+    [data-wysihtml5-dialog-action="save"] {
+      @include simple-button("primary");
       padding: 5px 10px;
-      margin-top: 5px;
+      margin-top: 0.5rem;
     }
   }
 
@@ -153,7 +159,7 @@
     pointer-events: none;
     border-top: solid 10px transparent;
     border-right: solid 10px transparent;
-    border-bottom: solid 10px #222;
+    border-bottom: solid 10px var(--ui-on-surface-color-lighter);
     border-left: solid 10px transparent;
   }
 
@@ -165,7 +171,7 @@
     pointer-events: none;
     border-top: solid 9px transparent;
     border-right: solid 9px transparent;
-    border-bottom: solid 9px #fff;
+    border-bottom: solid 9px var(--ui-surface-color);
     border-left: solid 9px transparent;
   }
 }

data/app/assets/stylesheets/pageflow/mixins/background_icons.scss

@@ -1,4 +1,4 @@
-@mixin background-icon-right($color: #444, $font-size: 19px, $right: 7px, $top: 7px) {
+@mixin background-icon-right($color: var(--ui-primary-color-light), $font-size: 19px, $right: 7px, $top: 7px) {
   position: relative;
 
   &:before {
@@ -11,7 +11,7 @@
   }
 }
 
-@mixin background-icon-left($color: #444, $font-size: 19px, $left: 7px, $top: 49%) {
+@mixin background-icon-left($color: var(--ui-primary-color-light), $font-size: 19px, $left: 7px, $top: 49%) {
   position: relative;
 
   &:before {
@@ -27,7 +27,7 @@
   }
 }
 
-@mixin background-icon-center($color: #444, $font-size: 19px, $left: 50%, $top: 50%) {
+@mixin background-icon-center($color: var(--ui-primary-color-light), $font-size: 19px, $left: 50%, $top: 50%) {
   position: relative;
 
   &:before {

data/app/assets/stylesheets/pageflow/mixins/buttons.scss

@@ -1,100 +1,82 @@
-$icon-button-default-base-color: #6aacf7 !default;
+@mixin icon-button($type: nil) {
+  @include simple-button($type);
 
-@mixin icon-button($base-color: $icon-button-default-base-color) {
-  @include simple-button($base-color);
-
-  color: #fff;
-  padding-top: 5px;
-  padding-bottom: 4px;
   padding-left: 12px;
 
   &:before {
     font-size: 16px;
     margin-right: 6px;
-    vertical-align: middle;
+    vertical-align: top;
   }
 }
 
-@mixin icon-only-button($base-color: $icon-button-default-base-color) {
-  @include simple-button($base-color);
+@mixin icon-only-button($type: nil) {
+  @include simple-button($type);
 
-  padding-top: 5px;
-  padding-bottom: 4px;
   padding-left: 8px;
   padding-right: 8px;
 
   &:before {
     font-size: 16px;
-    vertical-align: middle;
+    vertical-align: top;
   }
 }
 
-@mixin simple-button($base-color) {
-  $grayscale: $base-color == grayscale($base-color);
-  $color: hsl(0, 0, 100%);
-  $border: adjust-color($base-color, $saturation: 9%, $lightness: -14%);
-  $inset-shadow: adjust-color($base-color, $saturation: -8%, $lightness: 15%);
-  $stop-gradient: adjust-color($base-color, $saturation: 9%, $lightness: -11%);
-  $text-shadow: adjust-color($base-color, $saturation: 15%, $lightness: -18%);
-
-  @if lightness($base-color) > 70% {
-    $color: hsl(0, 0, 20%);
-    $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
-  }
-
-  @if $grayscale == true {
-    $border: grayscale($border);
-    $inset-shadow: grayscale($inset-shadow);
-    $stop-gradient: grayscale($stop-gradient);
-    $text-shadow: grayscale($text-shadow);
-  }
-
-  border: 1px solid $border;
-  border-radius: 3px;
-  box-shadow: inset 0 1px 0 0 $inset-shadow;
-  color: $color;
+@mixin simple-button($type: nil) {
+  border-radius: rounded();
   display: inline-block;
   font-size: 11px;
-  font-weight: bold;
-  @include linear-gradient ($base-color, $stop-gradient);
-  padding: 7px 18px;
+  font-weight: 500;
+  padding: 6px 18px;
   text-decoration: none;
-  text-shadow: 0 1px 0 $text-shadow;
-  background-clip: padding-box;
+  line-height: 16px;
 
-  &:hover:not(:disabled):not(.disabled) {
-    $base-color-hover: adjust-color($base-color, $saturation: -4%, $lightness: -5%);
-    $inset-shadow-hover: adjust-color($base-color, $saturation: -7%, $lightness: 5%);
-    $stop-gradient-hover: adjust-color($base-color, $saturation: 8%, $lightness: -14%);
+  @if $type == "primary" {
+    background-color: var(--ui-primary-color);
+    border: solid 1px var(--ui-primary-color);
+    color: var(--ui-on-primary-color);
 
-    @if $grayscale == true {
-      $base-color-hover: grayscale($base-color-hover);
-      $inset-shadow-hover: grayscale($inset-shadow-hover);
-      $stop-gradient-hover: grayscale($stop-gradient-hover);
+    &:hover:not(:disabled):not(.disabled) {
+      opacity: 0.92;
     }
 
-    box-shadow: inset 0 1px 0 0 $inset-shadow-hover;
-    cursor: pointer;
-    @include linear-gradient ($base-color-hover, $stop-gradient-hover);
-  }
-
-  &:active:not(:disabled):not(.disabled) {
-    $border-active: adjust-color($base-color, $saturation: 9%, $lightness: -14%);
-    $inset-shadow-active: adjust-color($base-color, $saturation: 7%, $lightness: -17%);
-    $inset-shadow: #eee;
+    &:disabled,
+    &.disabled {
+      background-color: var(--ui-on-surface-color-lightest-solid);
+      border-color: var(--ui-on-surface-color-lightest-solid);
+      color: var(--ui-primary-color-light);
+      cursor: default;
+    }
+  } @else {
+    background-color: transparent;
+    border: solid 1px var(--ui-primary-color-light);
+    color: var(--ui-primary-color);
+
+    @if $type == "destructive" {
+      &:hover:not(:disabled):not(.disabled) {
+        background-color: var(--ui-error-color);
+        border-color: var(--ui-error-color);
+        color: var(--ui-on-error-color);
+      }
+    } @else {
+      &:hover:not(:disabled):not(.disabled) {
+        border: 1px solid var(--ui-primary-color);
+      }
+    }
 
-    @if $grayscale == true {
-      $border-active: grayscale($border-active);
-      $inset-shadow-active: grayscale($inset-shadow-active);
+    &:disabled,
+    &.disabled {
+      opacity: 0.5;
+      cursor: default;
     }
+  }
 
-    border: 1px solid $border-active;
-    box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active, 0 1px 1px 0 $inset-shadow;
+  &:hover:not(:disabled):not(.disabled) {
+    cursor: pointer;
   }
 
-  &:disabled,
-  &.disabled {
-    opacity: 0.5;
-    cursor: default;
+  &:active:not(:disabled):not(.disabled),
+  &:focus:not(:disabled):not(.disabled) {
+    box-shadow: 0 0 0 2px var(--ui-primary-color-lighter);
   }
 }

data/app/assets/stylesheets/pageflow/themes/default/base.scss

@@ -16,6 +16,7 @@
 
 @import "./built_in_page_types";
 @import "./anchors";
+@import "./consent";
 @import "./cookie_notice_bar";
 @import "./logo";
 @import "./page";
@@ -31,5 +32,6 @@
 @import "./video_player";
 @import "./uncropped_media_wrapper";
 @import "./text_track_cues";
+@import "./third_party_embed_consent";
 @import "./slideshow";
 @import "./probes";

data/app/assets/stylesheets/pageflow/themes/default/consent/bar.scss

@@ -0,0 +1,156 @@
+/// Color of the cookie notice bar
+$consent-bar-background-color: rgba(20, 20, 20, 0.95);
+
+/// Color of the text inside cookie notice bar
+$consent-bar-text-color: #fff;
+
+$consent-bar-link-text-color: $main-color;
+
+$consent-bar-typography: ();
+
+$consent-bar-accept-all-button-background-color: $main-color-dark;
+$consent-bar-deny-all-button-background-color: #333;
+$consent-bar-configure-button-background-color: #333;
+$consent-bar-save-button-background-color: #333;
+
+$consent-bar-accept-all-button-text-color: #fff;
+$consent-bar-deny-all-button-text-color: #fff;
+$consent-bar-configure-button-text-color: #fff;
+$consent-bar-save-button-text-color: #fff;
+
+.consent_bar {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: $consent-bar-background-color;
+  color: $consent-bar-text-color;
+  padding: 10px 20px;
+  z-index: 2;
+
+  @include standard-typography(
+    $consent-bar-typography
+  );
+
+  &-content {
+    @extend %pageflow_widget_margin_right_max !optional;
+  }
+
+  &-text {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    display: inline-block;
+
+    a {
+      color: $consent-bar-link-text-color;
+    }
+  }
+
+  &-accept_all,
+  &-deny_all,
+  &-configure,
+  &-save {
+    border: none;
+    border-radius: 3px;
+    margin: 10px 5px 5px;
+    padding: 10px 15px;
+    font: inherit;
+    display: inline-block;
+    cursor: pointer;
+
+    @include phone {
+      display: block;
+      width: 100%;
+      margin: 10px 0;
+    }
+  }
+
+  &-accept_all {
+    background-color: $consent-bar-accept-all-button-background-color;
+    color: $consent-bar-accept-all-button-text-color;
+  }
+
+  &-deny_all {
+    background-color: $consent-bar-deny-all-button-background-color;
+    color: $consent-bar-deny-all-button-text-color;
+  }
+
+  &-configure {
+    background-color: $consent-bar-configure-button-background-color;
+    color: $consent-bar-configure-button-text-color;
+
+    svg {
+      fill: currentColor;
+      margin-right: 8px;
+    }
+  }
+
+  &-save {
+    background-color: $consent-bar-save-button-background-color;
+    color: $consent-bar-save-button-text-color;
+    float: right;
+  }
+
+  &-vendor_box {
+    @extend %pageflow_widget_margin_right_max !optional;
+
+    display: none;
+
+    h3 {
+      margin: 0.5em 0;
+      font-size: 1em;
+    }
+
+    a {
+      color: $consent-bar-text-color;
+    }
+  }
+
+  @include phone {
+    .consent_bar-vendor_box {
+      // scss-lint:disable ImportantRule
+      // Ensure widget margin is not being applied in phone layout
+      margin-right: 0 !important;
+      // scss-lint:enable ImportantRule
+    }
+  }
+
+  @include desktop {
+    &-vendor_box {
+      position: absolute;
+      bottom: 100%;
+      right: 0;
+      margin-bottom: 5px;
+      max-width: 400px;
+      width: 90%;
+      box-sizing: border-box;
+      padding: 10px 20px;
+      background-color: $consent-bar-background-color;
+      color: $consent-bar-text-color;
+    }
+
+    &-save {
+      float: right;
+    }
+
+    &-buttons {
+      float: right;
+      text-align: right;
+    }
+
+    &-decision_buttons {
+      display: inline-block;
+      white-space: nowrap;
+    }
+  }
+
+  &-expanded {
+    .consent_bar-vendor_box {
+      display: block;
+    }
+
+    .consent_bar-configure {
+      display: none;
+    }
+  }
+}

data/app/assets/stylesheets/pageflow/themes/default/consent/vendor_list.scss

@@ -0,0 +1,62 @@
+$consent-vendor-list-icon-color: #ddd;
+$consent-vendor-list-active-icon-color: #fff;
+$consent-vendor-list-toggle-color: #444;
+$consent-vendor-list-checked-toggle-color: $main-color;
+
+.consent_vendor_list {
+  overflow: auto;
+  max-height: 40vh;
+  padding-right: 5px;
+  margin: 5px 0;
+
+  @include phone {
+    max-height: 20vh;
+  }
+
+  &-vendor {
+    position: relative;
+    margin-bottom: 5px;
+    padding: 5px 0;
+
+    p {
+      font-size: 13px;
+    }
+  }
+
+  &-expand_vendor {
+    border: none;
+    background: transparent;
+    position: absolute;
+    right: 5px;
+    top: 4px;
+    cursor: pointer;
+
+    svg {
+      fill: $consent-vendor-list-icon-color;
+    }
+
+    &:hover svg,
+    &:active svg {
+      fill: $consent-vendor-list-active-icon-color;
+    }
+  }
+
+  &-toggle {
+    border: none;
+    background: transparent;
+    padding: 0;
+    position: absolute;
+    top: -2px;
+    right: 40px;
+    color: $consent-vendor-list-toggle-color;
+    cursor: pointer;
+
+    &[aria-checked=true] {
+      color: $consent-vendor-list-checked-toggle-color;
+    }
+
+    svg {
+      display: block;
+    }
+  }
+}

data/app/assets/stylesheets/pageflow/themes/default/consent.scss

@@ -0,0 +1,2 @@
+@import "./consent/bar";
+@import "./consent/vendor_list";

data/app/assets/stylesheets/pageflow/themes/default/logo/alignment.scss

@@ -9,6 +9,9 @@ $logo-alignment: "left" !default;
 // Left position relative to page when logo is left aligned.
 $logo-left: 8% !default;
 
+// Left position relative to page when logo is left aligned in desktop layout.
+$logo-mobile-left: null !default;
+
 // Right position relative to page when logo is right aligned.
 $logo-right: 14% !default;
 
@@ -24,4 +27,8 @@ $logo-right: 14% !default;
   @include phone {
     left: $logo-left;
   }
+
+  @include mobile {
+    @include position-start($logo-mobile-left);
+  }
 }

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

@@ -6,7 +6,51 @@ $page-shadow-color: #000 !default;
 /// @group page-colors
 $page-shadow-inverted-color: #fff !default;
 
+/// Name of image file in theme directory to display behind the shadow
+$page-shadow-image: null !default;
+
+/// Opactiy of shadow image
+$page-shadow-image-opacity: null !default;
+
+/// Background position of shadow image
+$page-shadow-image-position: right bottom !default;
+
+/// Background size of shadow image
+$page-shadow-image-size: contain !default;
+
+/// Background size of shadow image in mobile layout.
+$page-shadow-mobile-image-size: null !default;
+
 .page {
+  @if $page-shadow-image {
+    .shadow_wrapper::after {
+      content: "";
+      background-image: image-url("pageflow/themes/#{$theme-name}/#{$page-shadow-image}");
+      background-size: $page-shadow-image-size;
+      background-repeat: no-repeat;
+      background-position: $page-shadow-image-position;
+      opacity: $page-shadow-image-opacity;
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      @include transition(opacity 0.2s linear);
+
+      @include mobile {
+        background-size: $page-shadow-mobile-image-size;
+      }
+
+      .hideText & {
+        opacity: 0;
+      }
+    }
+
+    .video_page.should_play .shadow_wrapper::after {
+      opacity: 0;
+    }
+  }
+
   .shadow {
     @include shadow-start($page-shadow-color);
   }