pageflow 15.6.1 → 15.7.1

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

@@ -1,20 +1,14 @@
-$hint-text-color: #777777 !default;
-$hint-icon-color: #8aa5da !default;
-$background-color: #fbfbfb !default;
+$pageflow-hint-icon-directory: "pageflow/admin/icons" !default;
 
 .side_hint {
-  background-color: $background-color;
-  margin: 0 10px;
-  padding: 10px 0;
-  color: $hint-text-color;
+  margin: 10px 0;
+  color: $pageflow-hint-color;
 
   p {
-    @include background-icon-left($font-size: 20px,
-                                  $color: $hint-icon-color,
-                                  $top: 10px,
-                                  $left: -30px);
-    @include fa-info-circle-icon;
-
-    margin-left: 20%;
+    background-size: $pageflow-icon-size $pageflow-icon-size;
+    background-repeat: no-repeat;
+    background-position: left 1px;
+    background-image: image-url("#{$pageflow-hint-icon-directory}/info.svg");
+    padding-left: 1.75rem;
   }
 }

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

@@ -1,25 +1,36 @@
-$icon-button-color: #fff;
+$pageflow-icon-button-icon-directory: "pageflow/admin/icons/buttons" !default;
 
-a.icon_button:link {
-  @include background-icon-left($font-size: 15px,
-                                $color: $icon-button-color,
-                                $left: 9px,
-                                $top: 50%);
+a.icon_button:link,
+a.icon_button:visited,
+a.icon_button:hover,
+a.icon_button:active {
+  position: relative;
   padding-left: 30px;
 
-  &:before {
-    font-weight: normal;
+  &::before {
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 9px;
+    transform: translateY(-50%);
+    width: $pageflow-icon-size;
+    height: $pageflow-icon-size;
+    background-size: $pageflow-icon-size;
+    background-repeat: no-repeat;
+    background-position: center;
   }
 
-  &.editor {
-    @include fa-pencil-icon;
+  $dir: $pageflow-icon-button-icon-directory;
+
+  &.editor::before {
+    background-image: image-url("#{$dir}/editor.svg");
   }
 
-  &.preview {
-    @include fa-eye-icon;
+  &.preview::before {
+    background-image: image-url("#{$dir}/preview.svg");
   }
 
-  &.show_public {
-    @include fa-external-link-icon;
+  &.show_public::before {
+    background-image: image-url("#{$dir}/show_public.svg");
   }
 }

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

@@ -1,31 +1,47 @@
-$icon-link-color: #555;
+$pageflow-icon-link-icon-directory: "pageflow/admin/icons" !default;
 
-$icon-link-acitve-color: #000;
+$pageflow-icon-link-size: 25px !default;
+
+$pageflow-icon-link-opacity: 0.7 !default;
+
+$pageflow-active-icon-link-opacity: 1 !default;
 
 .icon_link_to {
   a {
-    @include background-icon-center($font-size: 16px, $color: $icon-link-color);
-    position: relative;
     display: inline-block;
-    width: 25px;
-    height: 25px;
+    position: relative;
     vertical-align: bottom;
 
-    &:focus,
-    &:hover {
-      @include background-icon-color($icon-link-acitve-color);
+    &::before {
+      content: "";
+      display: block;
+      width: $pageflow-icon-link-size;
+      height: $pageflow-icon-link-size;
+      background-size: $pageflow-icon-size;
+      background-repeat: no-repeat;
+      background-position: center;
+      opacity: $pageflow-icon-link-opacity;
     }
 
-    &.editor {
-      @include fa-pencil-icon;
+    $dir: $pageflow-icon-link-icon-directory;
+
+    &.editor::before {
+      background-image: image-url("#{$dir}/editor.svg");
+    }
+
+    &.preview::before {
+      background-image: image-url("#{$dir}/preview.svg");
     }
 
-    &.preview {
-      @include fa-eye-icon;
+    &.show_public::before {
+      background-image: image-url("#{$dir}/show_public.svg");
     }
 
-    &.show_public {
-      @include fa-external-link-icon;
+    &:focus,
+    &:hover {
+      &::before {
+        opacity: $pageflow-active-icon-link-opacity;
+      }
     }
   }
 }

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

@@ -1,18 +1,25 @@
-$publication-state-indicator-color: #5d5d5d;
+$pageflow-publication-state-indicator-icon-directory: "pageflow/admin/icons" !default;
+
+$pageflow-publication-state-indicator-size: 25px !default;
 
 .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;
+  position: relative;
+  width: $pageflow-publication-state-indicator-size;
+  height: $pageflow-publication-state-indicator-size;
+  vertical-align: middle;
   border-bottom: none;
+  background-size: $pageflow-icon-size $pageflow-icon-size;
+  background-repeat: no-repeat;
+  background-position: center;
+
+  $dir: $pageflow-publication-state-indicator-icon-directory;
 
   &.published_without_password_protection {
-    @include fa-globe-icon;
+    background-image: image-url("#{$dir}/published.svg");
   }
 
   &.published_with_password_protection {
-    @include fa-lock-icon;
+    background-image: image-url("#{$dir}/published_with_password.svg");
   }
 }

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

@@ -1,13 +1,14 @@
-$status-tag-ok-background-color: #8daa92 !default;
+$pageflow-status-tag-ok-background-color: #8daa92 !default;
 
-$status-tag-warning-background-color: #e29b20 !default;
+$pageflow-status-tag-warning-background-color: #e29b20 !default;
 
 .status_tag {
+  &.yes,
   &.ok {
-    background: $status-tag-ok-background-color;
+    background: $pageflow-status-tag-ok-background-color;
   }
 
   &.warning {
-    background: $status-tag-warning-background-color;
+    background: $pageflow-status-tag-warning-background-color;
   }
 }

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

@@ -1,23 +1,25 @@
-.admin_tabs_view {
-  clear: both;
-  background-color: #f4f4f4;
-  @include inset-shadow(0, 1px, 4px, #ddd);
-
-  &-tabs {
-    @include gradient(#efefef, #dfe1e2);
-    box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0 rgba(255,255,255, 0.8) inset;
-    border: solid 1px #c7c7c7;
-    @include border-colors(#d3d3d3, #c7c7c7, #c2c2c2);
-    @include text-shadow;
-    color: $primary-color;
-    font-size: 0.9em;
-    padding: 0;
-    margin: 0;
-
-    li {
-      display: inline-block;
+@if not $pageflow-custom-admin-tabs {
+  .admin_tabs_view {
+    clear: both;
+    background-color: #f4f4f4;
+    @include inset-shadow(0, 1px, 4px, #ddd);
+
+    &-tabs {
+      @include gradient(#efefef, #dfe1e2);
+      box-shadow: 0 1px 1px rgba(0, 0, 0, 0.10), 0 1px 0 0 rgba(255, 255, 255, 0.8) inset;
+      border: solid 1px #c7c7c7;
+      @include border-colors(#d3d3d3, #c7c7c7, #c2c2c2);
+      @include text-shadow;
+      color: $primary-color;
+      font-size: 0.9em;
+      padding: 0;
+      margin: 0;
+
+      > li {
+        display: inline-block;
+      }
 
-      &.active {
+      > .active {
         background-color: #fff;
         color: #444;
         box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, 0.2) inset;
@@ -26,26 +28,26 @@
           cursor: default;
         }
       }
-    }
 
-    a {
-      display: block;
-      padding: 10px 15px;
-      color: $section-header-text-color;
-      text-decoration: none;
-      font-weight: bold;
+      a {
+        display: block;
+        padding: 10px 15px;
+        color: $section-header-text-color;
+        text-decoration: none;
+        font-weight: bold;
+      }
     }
-  }
 
-  &-container {
-    @include clearfix;
-    @extend .panel_contents;
+    &-container {
+      @include clearfix;
+      @extend .panel_contents;
 
-    display: none;
-    padding: 10px;
+      display: none;
+      padding: 10px;
 
-    &.active {
-      display: block;
+      &.active {
+        display: block;
+      }
     }
   }
 }

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

@@ -1,14 +1,17 @@
-$tooltip-bubble-background-color: rgba(0, 0, 0, 0.7);
+$pageflow-tooltip-bubble-background-color: rgba(0, 0, 0, 0.7) !default;
 
-$tooltip-bubble-text-color: #fff;
+$pageflow-tooltip-bubble-text-color: #fff !default;
+
+$pageflow-tooltip-clue-border-color: #aaa !default;
 
 .tooltip_bubble {
-  position: absolute;
   display: none;
-  background-color: $tooltip-bubble-background-color;
-  color: $tooltip-bubble-text-color;
+  position: absolute;
+  background-color: $pageflow-tooltip-bubble-background-color;
+  color: $pageflow-tooltip-bubble-text-color;
   padding: 5px 10px;
-  top: -30px;
+  bottom: 100%;
+  margin-bottom: 5px;
   white-space: nowrap;
   border-radius: 2px;
   pointer-events: none;
@@ -18,7 +21,7 @@ $tooltip-bubble-text-color: #fff;
     position: absolute;
     top: 100%;
     left: 8px;
-    @include triangle(10px, $tooltip-bubble-background-color, down);
+    @include triangle(10px, $pageflow-tooltip-bubble-background-color, down);
   }
 }
 
@@ -31,7 +34,8 @@ $tooltip-bubble-text-color: #fff;
 
 .tooltip_clue {
   position: relative;
-  border-bottom: 1px dotted;
+  cursor: default;
+  border-bottom: dotted 1px $pageflow-tooltip-clue-border-color;
 }
 
 [data-tooltip] {
@@ -40,8 +44,8 @@ $tooltip-bubble-text-color: #fff;
   &:after {
     position: absolute;
     display: none;
-    background-color: $tooltip-bubble-background-color;
-    color: $tooltip-bubble-text-color;
+    background-color: $pageflow-tooltip-bubble-background-color;
+    color: $pageflow-tooltip-bubble-text-color;
     padding: 5px 10px;
     top: -33px;
     white-space: nowrap;
@@ -55,7 +59,7 @@ $tooltip-bubble-text-color: #fff;
     position: absolute;
     top: -6px;
     left: 8px;
-    @include triangle(10px, $tooltip-bubble-background-color, down);
+    @include triangle(10px, $pageflow-tooltip-bubble-background-color, down);
   }
 
   &:hover:after {

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

@@ -1,3 +1,15 @@
+/// Do not includes styles that patch the Active Admin default theme.
+$pageflow-custom-admin-theme: false !default;
+
+/// Do not include styles for admin tabs.
+$pageflow-custom-admin-tabs: false !default;
+
+/// Used for indicator icons, icon links and buttons
+$pageflow-icon-size: 16px !default;
+
+/// Used for inline hint texts
+$pageflow-hint-color: #666 !default;
+
 @import "active_admin/searchable_select";
 
 // Needs to be imported before bourbon which redefines functions used

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

@@ -1,13 +1,8 @@
 .background_positioning {
   .box {
-    top: 5%;
-    width: 90%;
+    min-width: 500px;
+    min-height: 400px;
     max-width: 1000px;
-    max-height: 745px;
-    padding-bottom: 20px;
-    overflow: hidden;
-    height: 80%;
-    overflow-y: scroll;
   }
 
   label {
@@ -18,33 +13,6 @@
     font-size: 12px;
   }
 
-  ul.screens {
-    border-bottom: solid 1px #aaa;
-    padding: 0;
-
-    li {
-      display: inline-block;
-      list-style: none;
-      padding: 5px 10px;
-      margin-bottom: 1px;
-      background-color: #eee;
-
-      a {
-        text-decoration: none;
-        color: #000;
-      }
-
-      &:hover {
-        background-color: #ddd;
-      }
-
-      &.active {
-        background-color: #D2E5FA;
-        font-weight: bold;
-      }
-    }
-  }
-
   .wrapper {
     text-align: center;
     margin: 35px;
@@ -52,7 +20,7 @@
 
   .previews {
     overflow: scroll;
-    overflow-x: scroll;
+    overflow-x: auto;
     overflow-y: hidden;
     margin-bottom: 20px;
 
@@ -68,14 +36,14 @@
     vertical-align: middle;
 
     .image {
-      border: solid 1px #444;
+      outline: solid 1px var(--ui-on-surface-color-light);
       background-size: cover;
     }
 
     .label {
       padding: 3px 0;
       font-size: 11px;
-      color: #444;
+      color: var(--ui-on-surface-color-light);
     }
   }
 
@@ -85,7 +53,7 @@
     height: 100%;
 
     img {
-      border: solid 1px #444;
+      outline: solid 1px var(--ui-on-surface-color-light);
       display: block;
       max-height: 300px;
       max-width: 600px;
@@ -96,22 +64,7 @@
   .slider {
     position: absolute;
     border: none;
-    background: #ddd;
-
-    a {
-      @include background-icon-center($font-size: 20px);
-      @include arrow-combo-icon;
-      position: absolute;
-      display: block;
-      width: 40px;
-      height: 40px;
-      margin: 0;
-      background-color: #fff;
-      border: solid 1px #888;
-      border-radius: 4px;
-      left: auto;
-      top: auto;
-    }
+    background: var(--ui-on-surface-color-lightest);
 
     &.horizontal {
       bottom: -10px;
@@ -146,29 +99,30 @@
     white-space: nowrap;
 
     input {
-      width: 45px;
+      display: inline;
+      width: 55px;
       height: 25px;
       box-sizing: border-box;
-      text-align: right;
+      padding-right: space(1);
     }
 
     &.horizontal {
-      left: -65px;
+      left: -80px;
       bottom: -26px;
     }
 
     &.vertical {
-      left: 100%;
-      top: -30px;
+      left: 115%;
+      top: 0;
     }
   }
 
   a.save {
     @include check-icon;
-    @include icon-button;
+    @include icon-button("primary");
   }
 
   a.close {
-    @include icon-button(#888);
+    @include icon-button;
   }
 }

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

@@ -3,6 +3,7 @@
 @import "pageflow/fonts";
 
 @import "pageflow/jquery_ui";
+@import "pageflow/ui/normalize";
 @import "pageflow/ui";
 @import "pageflow/animations";
 
@@ -24,12 +25,14 @@
   @import "./change_theme";
   @extend %pageflow-ui;
 
-  font-family: Helvetica, Arial, "Sans-Serif";
-  font-size: 13px;
+  font-family: var(--ui-font-family);
+  font-size: var(--ui-font-size);
 
   padding: 0;
   display: block;
-  background-color: #ddd;
+  background-color: var(--ui-surface-color);
+  border: 0;
+  color: var(--ui-on-surface-color);
   overflow: hidden;
 
   * {
@@ -38,10 +41,8 @@
   }
 
   h2 {
-    font-size: 11px;
-    text-transform: uppercase;
-    font-weight: normal;
-    color: #444;
+    font-size: inherit;
+    font-weight: 500;
     margin: 15px 0 5px 0;
   }
 
@@ -51,7 +52,7 @@
   }
 
   a {
-    color: #000;
+    color: var(--ui-on-surface-color);
     text-decoration: none;
   }
 
@@ -93,18 +94,18 @@
 
   a.publish {
     @include eye-icon;
-    @include icon-button;
+    @include icon-button("primary");
     float: right;
   }
 
   a.close {
     @include cancel-icon;
-    @include icon-button(#888);
+    @include icon-button;
   }
 
   a.back {
     @include left-open-icon;
-    @include icon-button(#888);
+    @include icon-button;
   }
 
   a.add_chapter,
@@ -114,13 +115,13 @@
   }
 
   a.destroy {
-    @include icon-button(#d00);
+    @include icon-button("destructive");
     @include trash-icon;
     float: right;
   }
 
   a.upload {
-    @include icon-button;
+    @include icon-button("primary");
     @include up-icon;
     float: right;
   }
@@ -144,6 +145,20 @@ main.ui-layout-pane {
   background-color: #000;
 }
 
+.ui-layout-resizer {
+  background-color: var(--ui-surface-color);
+  border: 0;
+  border-left: solid 1px var(--ui-on-surface-color-lightest);
+  border-top-left-radius: rounded(sm);
+  border-bottom-left-radius: rounded(sm);
+}
+
+.ui-layout-toggler {
+  border: 0;
+  border-top-right-radius: rounded(lg);
+  border-bottom-right-radius: rounded(lg);
+}
+
 main > div {
   height: 100%;
 

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

@@ -6,8 +6,8 @@
   letter-spacing: 0.01em;
   text-align: center;
   padding: 5% 25%;
-  background-color: #fff;
-  color: #333;
+  background-color: var(--ui-surface-color);
+  color: var(--ui-on-surface-color);
   height: 100%;
 
   h2 {
@@ -15,7 +15,7 @@
     font-weight: normal;
     letter-spacing: 0.02em;
     text-transform: uppercase;
-    color: #999;
+    color: var(--ui-on-surface-color-light);
 
     &:before {
       content: "";
@@ -26,7 +26,7 @@
       background-size: 33px 45px;
       background-repeat: no-repeat;
       background-image: image-url("pageflow/editor/blank_entry/logo.png");
-      opacity: 0.3;
+      opacity: 0.6;
     }
   }
 
@@ -39,8 +39,8 @@
     display: inline-block;
     text-align: left;
     padding: 20px 50px;
-    border-bottom: solid 1px #aaa;
-    border-top: solid 1px #aaa;
+    border-bottom: solid 1px var(--ui-on-surface-color-lighter);
+    border-top: solid 1px var(--ui-on-surface-color-lighter);
   }
 
   li {