alchemy_cms 7.0.8 → 7.1.0.pre.b1

data/app/assets/stylesheets/alchemy/_mixins.scss

@@ -1,7 +1,8 @@
 @mixin default-focus-style(
   $border-color: $focus-color,
   $box-shadow: 0 0 0 2px $focus-color,
-  $border-radius: $default-border-radius) {
+  $border-radius: $default-border-radius
+) {
   border-color: $border-color;
   border-radius: $border-radius;
   box-shadow: $box-shadow;
@@ -25,12 +26,15 @@
   $color: $button-text-color,
   $line-height: $form-field-line-height,
   $focus-border-color: $button-focus-border-color,
-  $focus-box-shadow: $button-focus-box-shadow) {
-  display: inline-block;
+  $focus-box-shadow: $button-focus-box-shadow
+) {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
   font-family: $default-font-family;
   font-size: $default-font-size;
   font-weight: $button-font-weight;
-  line-height: $line-height;
+  height: 30px;
   padding: $padding;
   cursor: pointer;
   border-radius: $border-radius;
@@ -49,7 +53,8 @@
     border-color: $hover-border-color;
   }
 
-  &:active, &.active {
+  &:active,
+  &.active {
     box-shadow: inset $button-box-shadow;
   }
 
@@ -60,9 +65,12 @@
     );
   }
 
-  &.disabled, &[disabled],
-  &.disabled:active, &[disabled]:active,
-  &.disabled:hover, &[disabled]:hover {
+  &.disabled,
+  &[disabled],
+  &.disabled:active,
+  &[disabled]:active,
+  &.disabled:hover,
+  &[disabled]:hover {
     background-color: transparentize($button-bg-color, 0.5);
     cursor: not-allowed;
     box-shadow: none;
@@ -90,14 +98,17 @@
   float: right;
   width: $form-right-width;
   margin: $form-field-margin;
-  padding: $default-padding 2*$default-padding;
+  padding: $default-padding 2 * $default-padding;
   line-height: 21px;
   min-height: $form-field-height;
   background: white;
   border-radius: $default-border-radius;
 }
 
-@mixin form-hint($background-color: $light_yellow, $border-color: $medium-gray) {
+@mixin form-hint(
+  $background-color: $light_yellow,
+  $border-color: $medium-gray
+) {
   font-size: $small-font-size;
   line-height: 1.5em;
   padding: $default-padding;
@@ -135,7 +146,10 @@
   box-shadow: $shadow;
 }
 
-@mixin label-base($margin: 2*$default-margin 0, $padding: $default-padding 3*$default-padding) {
+@mixin label-base(
+  $margin: 2 * $default-margin 0,
+  $padding: $default-padding 3 * $default-padding
+) {
   display: inline-block;
   vertical-align: middle;
   padding: $padding;
@@ -147,18 +161,18 @@
   color: $text-color;
 }
 
-@mixin tag-base($margin: 2*$default-margin 0, $padding: $default-padding 3*$default-padding) {
-  @include label-base(
-    $margin: $margin,
-    $padding: $padding
-  );
+@mixin tag-base(
+  $margin: 2 * $default-margin 0,
+  $padding: $default-padding 3 * $default-padding
+) {
+  @include label-base($margin: $margin, $padding: $padding);
 
   &:before {
-    content: fa-content($fa-var-tag);
-    font-family: 'Font Awesome 5 Free';
-    font-weight: 900;
-    font-size: 0.8em;
-    padding-right: 2*$default-padding;
+    content: $ri-price-tag-3-line;
+    font-family: "remixicon";
+    font-weight: 400;
+    font-size: 1em;
+    padding-right: $default-padding;
   }
 
   &:focus {
@@ -169,7 +183,8 @@
 @mixin linked-button(
   $border-radius: $default-border-radius,
   $line-height: $form-field-line-height,
-  $padding: 3px) {
+  $padding: 3px
+) {
   @include button-defaults(
     $line-height: $line-height,
     $background-color: $linked-button-color,
@@ -185,7 +200,7 @@
 
 @mixin zoom-in {
   cursor: pointer;
-  cursor: image-url('alchemy/lupe.cur');
+  cursor: image-url("alchemy/lupe.cur");
   cursor: -webkit-zoom-in;
   cursor: -moz-zoom-in;
   cursor: zoom-in;
@@ -199,13 +214,6 @@
   white-space: $wrap;
 }
 
-@mixin hint-hover-style {
-  visibility: visible;
-  top: 26px;
-  opacity: 1;
-  transition-delay: .2s;
-}
-
 @mixin clearfix {
   &::after {
     clear: both;

data/app/assets/stylesheets/alchemy/_variables.scss

@@ -59,7 +59,7 @@ $form-field-border-style: $default-border-style !default;
 $form-field-border-color: $default-border-color $default-border-color
   $border-inset-color $border-inset-color !default;
 $form-field-box-shadow: inset 0px 0 1px $medium-gray !default;
-$form-field-padding: 0.6em 0.75em !default;
+$form-field-padding: $default-padding 2 * $default-padding !default;
 $form-field-font-size: $default-font-size !default;
 $form-field-line-height: 1.25 !default;
 $form-field-text-color: $text-color !default;
@@ -80,7 +80,7 @@ $button-font-weight: 700 !default;
 $button-text-shadow: none !default;
 $button-box-shadow: 0px 1px 1px -1px #333 !default;
 $button-focus-box-shadow: 0px 1px 1px 0px $button-focus-border-color !default;
-$button-padding: 0.55em 2em !default;
+$button-padding: $default-padding 5 * $default-padding !default;
 $small-button-padding: 0.4em 0.8em !default;
 $button-margin: $form-field-margin !default;
 
@@ -108,7 +108,7 @@ $error_text_color: #a23434 !default;
 $error_background_color: #efd3d3 !default;
 
 $hint-background-color: $light_yellow !default;
-$hint-text-color: $very-dark-gray !default;
+$hint-text-color: #59543e !default;
 
 $form-left-width: 35% !default;
 $form-right-width: 65% !default;
@@ -130,6 +130,7 @@ $main-menu-icon-color: $white !default;
 $main-menu-entry-max-width: 110px !default;
 $toolbar-bg-color: $medium-gray !default;
 $toolbar-height: 46px !default;
+$tab-bar-height: 51px !default;
 $element-toolbar-height: 37px !default;
 $header-height: 29px !default;
 $header-background: #d8d8d8 !default;
@@ -147,7 +148,7 @@ $table-row-hover-color: rgba($light_yellow, 0.5) !default;
 
 $elements-window-width: 22.5vw !default;
 $elements-window-min-width: 400px !default;
-$element-header-bg-color: $medium-gray !default;
+$element-header-bg-color: transparent !default;
 $element-header-active-bg-color: $dark-blue !default;
 $element-header-active-color: $white !default;
 $element-header-deprecated-bg-color: rgba(253, 213, 175, 0.25) !default;
@@ -174,6 +175,12 @@ $select-hover-text-color: $white !default;
 $medium-select-box-width: 90px;
 $large-select-box-width: 120px;
 
-$thumbnail-background-color: opacify($default-border-color, 1) !default;
+$thumbnail-background:
+  linear-gradient(45deg, $medium-gray 25%, transparent 25%) 0.5em 0.5em/1em 1em,
+  linear-gradient(-45deg, $medium-gray 25%, transparent 25%) -0.5em 0/1em 1em,
+  linear-gradient(45deg, transparent 75%, $medium-gray 75%) 0 0/1em 1em,
+  linear-gradient(-45deg, transparent 75%, $medium-gray 75%) 0 0.5em/1em 1em
+    $white !default;
+
 $medium-screen-break-point: 700px;
 $large-screen-break-point: 1000px;

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

@@ -3,9 +3,8 @@
  *= require_self
  */
 
-@import "fontawesome/fontawesome";
-@import "fontawesome/regular";
-@import "fontawesome/solid";
+@import "remixicon";
+@import "alchemy/custom-properties";
 @import "alchemy/defaults";
 @import "alchemy/archive";
 @import "alchemy/navigation";
@@ -39,6 +38,7 @@
 @import "alchemy/resource_info";
 @import "alchemy/search";
 @import "alchemy/selects";
+@import "alchemy/shoelace";
 @import "alchemy/sitemap";
 @import "alchemy/spinner";
 @import "alchemy/tables";
@@ -46,5 +46,4 @@
 @import "alchemy/typography";
 @import "alchemy/lists";
 @import "alchemy/upload";
-@import "alchemy/jquery-ui";
 @import "jquery.Jcrop.min";

data/app/assets/stylesheets/alchemy/archive.scss

@@ -1,5 +1,5 @@
 .resources-header {
-  padding: 2 * $default-padding;
+  padding: 0 2 * $default-padding;
 }
 
 .applied-filter {
@@ -25,18 +25,14 @@
   }
 }
 
-div#image_assign_filter_and_image_sizing {
-  width: 100%;
-  height: 40px;
-}
+.selected_item_tools {
+  margin: -2 * $default-padding;
+  border-bottom: 1px solid $default-border-color;
+  margin-bottom: 4 * $default-padding;
+  padding: 4 * $default-padding;
 
-#picture_archive {
-  .selected_item_tools {
-    margin: -2 * $default-padding;
-    border-bottom: 1px solid $default-border-color;
-    margin-bottom: 4 * $default-padding;
-    padding: 4 * $default-padding;
-    display: none;
+  .button {
+    vertical-align: middle;
   }
 }
 
@@ -45,9 +41,7 @@ div#image_assign_filter_and_image_sizing {
   display: flex;
   align-items: center;
   justify-content: center;
-  background-color: $thumbnail-background-color;
-  width: 100%;
-  height: 120px;
+  box-shadow: 0 0 1px 1px $default-border-color;
 
   &:hover {
     text-decoration: none;
@@ -55,55 +49,62 @@ div#image_assign_filter_and_image_sizing {
 }
 
 .picture_thumbnail {
-  margin: 2 * $default-margin;
-  background-color: #fff;
+  --picture-thumbnail-border-radius: var(--border-radius_medium);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: var(--picture-thumbnail-width);
+  height: var(--picture-thumbnail-height);
   position: relative;
-  box-shadow: 0 0 0 1px $default-border-color;
-  width: 160px;
+  border-radius: var(--picture-thumbnail-border-radius);
+  padding: 2 * $default-padding;
+  padding-bottom: 2.5em;
+  transition: all $transition-duration;
+
+  img,
+  .thumbnail_background {
+    border-radius: var(--picture-thumbnail-border-radius);
+  }
 
   img {
-    width: 100%;
-    height: 100%;
-    object-fit: contain;
+    max-width: 100%;
+    max-height: 100%;
+    background: $thumbnail-background;
 
-    &[src$=".svg"] {
-      width: auto;
-      height: auto;
+    &[src*=".svg"] {
+      width: var(--picture-width);
+      max-height: var(--picture-height);
     }
   }
 
   .picture_name {
-    display: block;
+    position: absolute;
     width: 100%;
     text-align: center;
     white-space: nowrap;
     overflow: hidden;
     bottom: 0;
     left: 0;
-    line-height: 2;
+    line-height: 2.5;
     padding: 0 $default-padding;
     text-overflow: ellipsis;
   }
 
-  &.small {
-    width: 80px;
-
-    .thumbnail_background {
-      height: 60px;
+  &:hover,
+  &:focus-within {
+    .picture_tool,
+    .picture_tags {
+      visibility: visible;
+      opacity: 1;
     }
   }
 
-  &.large {
-    width: 240px;
+  &:hover,
+  &:focus-within,
+  &.active {
+    box-shadow: 0 0 4px 2px $default-border-color;
 
-    .thumbnail_background {
-      height: 180px;
-    }
-  }
-
-  &:hover {
-    .picture_tool,
-    .picture_tags {
+    .picture_tool.select {
       visibility: visible;
       opacity: 1;
     }
@@ -112,8 +113,34 @@ div#image_assign_filter_and_image_sizing {
 
 #pictures,
 #overlay_picture_list {
-  display: flex;
-  flex-wrap: wrap;
+  --picture-width: 160px;
+  --picture-height: 120px;
+  --picture-thumbnail-width: calc(var(--picture-width) + var(--spacing-2));
+  --picture-thumbnail-height: calc(
+    var(--picture-height) + var(--spacing-2) + 2.5em
+  );
+
+  display: grid;
+  gap: 2 * $default-margin;
+  grid-template-columns: repeat(
+    auto-fill,
+    minmax(var(--picture-thumbnail-width), auto)
+  );
+  justify-items: center;
+
+  &.picture-size--small {
+    --picture-width: 80px;
+    --picture-height: 60px;
+  }
+
+  &.picture-size--large {
+    --picture-width: 240px;
+    --picture-height: 180px;
+  }
+}
+
+#picture_archive {
+  overflow: visible;
 }
 
 #pictures {
@@ -133,17 +160,23 @@ div.assign_image_list_image {
 }
 
 .picture_tool {
+  display: flex;
   width: 20px;
   height: 20px;
+  align-items: center;
+  justify-content: center;
   position: absolute;
   background-color: white;
   top: $default-padding;
   padding: $default-padding / 2;
   z-index: 10;
-  text-align: center;
   border-radius: $default-border-radius;
   box-shadow: 0 0 1px $dark-gray;
 
+  &:hover {
+    text-decoration: none;
+  }
+
   &.visible {
     visibility: visible;
     opacity: 1;
@@ -169,22 +202,32 @@ div.assign_image_list_image {
   }
 
   a {
-    display: block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     width: 16px;
     height: 16px;
     cursor: pointer;
+
+    &:hover {
+      text-decoration: none;
+    }
   }
 }
 
 .picture_tags {
   overflow: hidden;
   position: absolute;
-  bottom: 22px;
+  bottom: 28px;
   left: 0;
   width: 100%;
   max-height: 80%;
   padding: $default-padding;
   pointer-events: none;
+
+  .tag {
+    box-shadow: 0 0 2px 2px $default-border-color;
+  }
 }
 
 .picture_tags,
@@ -237,11 +280,25 @@ div#filter_bar {
 #assign_image_list,
 #assign_file_list {
   position: relative;
-  height: 548px;
+  height: 558px;
 }
 
 #assign_image_list {
-  padding-right: 244px;
+  padding-right: 240px;
+  padding-bottom: 60px;
+}
+
+#overlay_picture_list {
+  height: 100%;
+  overflow: auto;
+
+  .picture_thumbnail:hover {
+    box-shadow: none;
+
+    .thumbnail_background {
+      box-shadow: 0 0 4px 4px $default-border-color;
+    }
+  }
 }
 
 #overlay_file_list {
@@ -268,8 +325,8 @@ div#filter_bar {
     }
 
     .icon {
-      margin-top: -2px;
       margin-right: 4px;
+      vertical-align: bottom;
     }
   }
 }

data/app/assets/stylesheets/alchemy/attachments.scss

@@ -2,18 +2,19 @@
   background-color: $medium-gray;
   margin-top: 12px;
 
-  audio, video {
+  audio,
+  video {
     display: block;
   }
 
   &.image-preview {
     height: 300px;
     text-align: center;
-    padding: 2*$default-padding;
+    padding: 2 * $default-padding;
     white-space: nowrap;
 
     &:before {
-      content: '';
+      content: "";
       display: inline-block;
       height: 100%;
       vertical-align: middle;
@@ -34,6 +35,6 @@
 .full-iframe {
   width: 100%;
   background-color: white;
-  min-height: 335px;
+  min-height: 435px;
   margin-top: 12px;
 }