alchemy_cms 7.4.10 → 8.0.0.b

data/app/{assets/stylesheets → stylesheets}/alchemy/admin/frame.scss

@@ -1,3 +1,6 @@
+@use "base";
+@use "navigation";
+
 alchemy-overlay {
   visibility: hidden;
   position: fixed;
@@ -7,7 +10,7 @@ alchemy-overlay {
   height: 100%;
   z-index: 400000;
   background-color: transparent;
-  transition: all $transition-duration $transition-easing;
+  transition: all var(--transition-duration) var(--transition-easing);
   transition-delay: 0;
 
   &.visible {
@@ -42,18 +45,21 @@ div#overlay_text_box {
   bottom: 0;
   left: 0;
   width: 100%;
-  margin-bottom: 0;
+
+  .main_navi_entry {
+    margin-bottom: 0;
+  }
 
   &:not(:hover) {
-    background-color: $main-menu-bg-color;
+    background-color: var(--main-menu-bg-color);
   }
 }
 
 #header {
   display: flex;
-  height: $header-height;
-  background: $header-background;
-  border-bottom: $default-border;
+  height: var(--header-height);
+  background: var(--header-background);
+  border-bottom: var(--header-border-bottom);
   position: relative;
 
   a:hover {
@@ -63,12 +69,12 @@ div#overlay_text_box {
   .page_status_and_name {
     align-items: center;
     padding: var(--spacing-1) var(--spacing-2);
-    background-color: var(--color-grey_light);
-    text-shadow: $text-shadow-light;
+    background-color: var(--toolbar-bg-color);
+    text-shadow: var(--text-shadow-light);
     @extend .disable-user-select;
     @extend .locked_page;
     cursor: default;
-    border-bottom-color: $toolbar-bg-color;
+    border-bottom-color: var(--toolbar-bg-color);
   }
 
   .page_name {
@@ -83,30 +89,26 @@ div#overlay_text_box {
   padding-top: 84px;
   padding-right: var(--spacing-2);
   padding-bottom: var(--spacing-2);
-  padding-left: calc(#{$collapsed-main-menu-width} + var(--spacing-2));
+  padding-left: calc(var(--main-menu-width) + var(--spacing-2));
   z-index: 0;
   width: 100%;
   height: 100%;
-
-  @media screen and (min-width: $large-screen-break-point) {
-    padding-left: calc(#{$main-menu-width} + var(--spacing-2));
-  }
 }
 
 #user_info {
   display: flex;
   align-items: center;
-  height: $header-height;
+  height: var(--header-height);
   padding-left: var(--spacing-2);
   margin-left: auto;
-  border-bottom: $default-border;
-  background-color: $header-background;
+  border-bottom: var(--border-default);
+  background-color: var(--header-background);
 
   select {
     background-color: transparent;
     border: none;
     border-radius: 0;
-    border-left: $default-border;
+    border-left: var(--border-default);
   }
 
   .current-user-name {

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

@@ -0,0 +1,5 @@
+.like-hint-tooltip {
+  cursor: help;
+  --sl-tooltip-background-color: var(--hint-background-color);
+  --sl-tooltip-color: var(--hint-text-color);
+}

data/app/{assets/stylesheets → stylesheets}/alchemy/admin/icons.scss

@@ -17,7 +17,7 @@ alchemy-icon {
 }
 
 .icon {
-  fill: var(--color-icon, currentColor);
+  fill: var(--icon-color, currentColor);
   width: var(--icon-size, var(--icon-size-md));
   height: var(--icon-size, var(--icon-size-md));
 

data/app/{assets/stylesheets → stylesheets}/alchemy/admin/image_library.scss

@@ -1,6 +1,8 @@
+@use "../mixins";
+
 .alchemy-image-overlay {
   &.open {
-    background-color: rgba(0, 0, 0, 0.6);
+    background-color: var(--dialog-overlay-color);
   }
 }
 
@@ -80,7 +82,7 @@
   .icon {
     font-size: 2em;
     color: var(--color-grey_light);
-    text-shadow: 0 0 4px var(--color-text);
+    text-shadow: 0 0 4px var(--text-color);
     transition: color var(--image-overlay-transition-duration) linear;
 
     &:hover {
@@ -93,8 +95,8 @@
 .picture-overlay-handle {
   position: absolute;
   top: 0;
-  background-color: var(--color-grey_light);
-  box-shadow: -2px 0 4px -2px var(--color-text);
+  background-color: var(--dialog-background-color);
+  box-shadow: var(--image-overlay-box-shadow);
   transition: right var(--image-overlay-transition-duration)
     var(--image-overlay-transition-easing);
 }
@@ -106,8 +108,7 @@
   padding: var(--spacing-2) var(--spacing-4) var(--spacing-2) var(--spacing-1);
   overflow: auto;
 
-  form .control-label,
-  .resource_info .value label {
+  form .control-label {
     text-align: left;
   }
 
@@ -117,8 +118,7 @@
 
   form .input .select2-container,
   form .input input[type="text"],
-  form .input textarea,
-  .resource_info .value p {
+  form .input textarea {
     width: 100%;
   }
 }
@@ -128,6 +128,7 @@
   height: 100%;
   right: var(--image-overlay-form-width);
   cursor: pointer;
+  transition-property: right, background-color;
 
   .icon {
     position: absolute;
@@ -135,13 +136,13 @@
     left: 50%;
     transform: translate(-50%, -50%);
     font-size: 1.2em;
-    color: var(--color-icon);
+    color: var(--icon-color);
     transition: transform var(--image-overlay-transition-duration)
       var(--image-overlay-transition-easing);
   }
 
   &:hover {
-    background-color: hsl(0deg, 0%, 89%);
+    background-color: var(--image-overlay-hover-bg-color);
   }
 }
 
@@ -174,53 +175,16 @@
     height: auto;
     max-width: 100%;
     max-height: 100%;
-    box-shadow: 0 0 var(--spacing-2) var(--color-text);
-    background: $thumbnail-background;
+    border: 1px solid var(--border-color);
+    box-shadow: var(--dialog-box-shadow);
+    background: var(--thumbnail-background);
     vertical-align: middle;
     cursor: default;
   }
 }
 
-.picture-file-infos,
-.picture-usage-info {
-  padding: var(--spacing-2) 0;
-
-  .message {
-    margin: var(--spacing-2) 0;
-  }
-}
-
-#pictures_page_list {
-  h3 {
-    display: flex;
-    align-items: center;
-    gap: var(--spacing-1);
-    padding: var(--spacing-1) var(--spacing-2) 0;
-    margin: 0;
-  }
-
-  ul {
-    padding-left: 0;
-    list-style-type: none;
-  }
-
-  .list {
-    margin: var(--spacing-2) 0;
-
-    li {
-      display: flex;
-      align-items: center;
-      gap: var(--spacing-1);
-      padding: var(--spacing-2);
-      border-radius: var(--border-radius_medium);
-      white-space: normal;
-      margin-bottom: 1em;
-    }
-  }
-
-  p {
-    margin: 0;
-  }
+.picture-form {
+  margin-bottom: var(--spacing-3);
 }
 
 .picture-overlay-navigation {
@@ -242,20 +206,16 @@
     align-items: center;
     text-decoration: none;
     transition: background-color var(--image-overlay-transition-duration) linear;
+    color: var(--color-white);
 
-    .icon {
+    alchemy-icon svg {
       width: 32px;
       height: 32px;
-      fill: var(--color-white);
       filter: drop-shadow(0 0 1px var(--color-grey_very_dark));
     }
 
     &:hover {
       background-color: rgba(0, 0, 0, 0.3);
-
-      .icon {
-        transition: fill var(--image-overlay-transition-duration) linear;
-      }
     }
   }
 
@@ -266,20 +226,20 @@
   .icon {
     --icon-size: 4em;
     fill: var(--color-grey_light);
-    filter: drop-shadow(0 0 4px var(--color-icon));
+    filter: drop-shadow(0 0 4px var(--icon-color));
     transition: all var(--image-overlay-transition-duration) linear;
     vertical-align: middle;
   }
 
   .previous-picture {
     left: 0;
-    @include border-right-radius($default-border-radius);
+    @include mixins.border-right-radius(var(--border-radius_medium));
   }
 
   .next-picture {
     right: calc(
       var(--image-overlay-form-width) + var(--picture-overlay-handle-width)
     );
-    @include border-left-radius($default-border-radius);
+    @include mixins.border-left-radius(var(--border-radius_medium));
   }
 }

data/app/{assets/stylesheets → stylesheets}/alchemy/admin/images.scss

@@ -1,6 +1,6 @@
 img {
   opacity: 1;
-  transition: opacity $transition-duration;
+  transition: opacity var(--transition-duration);
 
   &.loading {
     opacity: 0;

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

@@ -0,0 +1,5 @@
+@use "../mixins";
+
+.label {
+  @include mixins.label-base($margin: 0, $padding: 0 var(--spacing-2));
+}

data/app/{assets/stylesheets → stylesheets}/alchemy/admin/lists.scss

@@ -27,16 +27,16 @@ ul.list {
       margin-bottom: var(--spacing-2);
 
       .list-secondary {
-        color: var(--color-text);
+        color: var(--text-color);
       }
     }
 
     &.even {
-      background-color: $table-row-even-background-color;
+      background-color: var(--table-row-even-background-color);
     }
 
     &.odd {
-      background-color: $table-row-odd-background-color;
+      background-color: var(--table-row-odd-background-color);
     }
   }
 

data/app/{assets/stylesheets → stylesheets}/alchemy/admin/navigation.scss

@@ -1,18 +1,16 @@
+@use "base";
+@use "../mixins";
+@use "../variables" as vars;
+
 #top_menu {
   position: fixed;
   top: 0;
-  margin-left: $collapsed-main-menu-width;
-  padding-right: $collapsed-main-menu-width;
+  margin-left: var(--main-menu-width);
+  padding-right: var(--main-menu-width);
   z-index: 20;
   width: 100%;
+  height: var(--top-menu-height);
   @extend .disable-user-select;
-
-  @media screen and (min-width: $large-screen-break-point) {
-    body:not(.collapsed-menu) & {
-      margin-left: $main-menu-width;
-      padding-right: $main-menu-width;
-    }
-  }
 }
 
 #left_menu {
@@ -21,15 +19,9 @@
   position: fixed;
   top: 0;
   left: 0;
-  width: $collapsed-main-menu-width;
-  background-color: $main-menu-bg-color;
+  width: var(--main-menu-width);
+  background-color: var(--main-menu-bg-color);
   @extend .disable-user-select;
-
-  @media screen and (min-width: $large-screen-break-point) {
-    body:not(.collapsed-menu) & {
-      width: $main-menu-width;
-    }
-  }
 }
 
 #main_navi {
@@ -37,7 +29,7 @@
   padding-top: var(--spacing-7);
   padding-bottom: 80px;
 
-  @media screen and (max-width: $medium-screen-break-point) {
+  @media screen and (max-width: vars.$medium-screen-break-point) {
     overflow-x: hidden;
     overflow-y: auto;
     -webkit-overflow-scrolling: touch;
@@ -50,32 +42,33 @@
   line-height: 46px;
   margin-bottom: var(--spacing-3);
   background-color: transparent;
-  transition: background-color $transition-duration $transition-easing;
+  transition: background-color var(--transition-duration)
+    var(--transition-easing);
 
   &:hover {
-    background-color: $main-menu-active-bg-color;
+    background-color: var(--main-menu-active-bg-color);
 
     .sub_navigation {
       visibility: visible;
       opacity: 1;
-      background-color: $main-menu-active-bg-color;
+      background-color: var(--main-menu-active-bg-color);
     }
   }
 
   &.active,
   &:hover {
-    background-color: $main-menu-active-bg-color;
+    background-color: var(--main-menu-active-bg-color);
     cursor: default;
 
     a,
     .icon {
-      color: $main-menu-active-text-color;
+      color: var(--main-menu-active-text-color);
       text-decoration: none;
       text-shadow: none;
 
       &:focus {
-        @include default-focus-style(
-          $box-shadow: inset 0 0 0 2px $main-menu-active-text-color,
+        @include mixins.default-focus-style(
+          $box-shadow: inset 0 0 0 2px var(--main-menu-active-text-color),
           $border-radius: 0
         );
       }
@@ -85,23 +78,22 @@
   label {
     position: absolute;
     top: 0;
-    left: $collapsed-main-menu-width - 1;
+    left: calc(var(--main-menu-width) - 1px);
     width: auto;
     padding-left: var(--spacing-4);
     padding-right: var(--spacing-4);
     visibility: hidden;
     opacity: 0;
-    background-color: $main-menu-active-bg-color;
-    transition: opacity $transition-duration $transition-easing;
+    background-color: var(--main-menu-active-bg-color);
+    transition: opacity var(--transition-duration) var(--transition-easing);
     vertical-align: middle;
     cursor: pointer;
-    @include truncate($collapsed-main-menu-entry-max-width, $wrap: nowrap);
 
-    @media screen and (min-width: $large-screen-break-point) {
+    @media screen and (min-width: vars.$large-screen-break-point) {
       body:not(.collapsed-menu) & {
         position: static;
         visibility: visible;
-        max-width: $main-menu-entry-max-width;
+        max-width: var(--main-menu-entry-max-width);
         opacity: 1;
         padding-left: var(--spacing-2);
         background-color: transparent;
@@ -112,7 +104,7 @@
   &.has_sub_navigation label {
     display: none;
 
-    @media screen and (min-width: $large-screen-break-point) {
+    @media screen and (min-width: vars.$large-screen-break-point) {
       body:not(.collapsed-menu) & {
         display: inline-block;
       }
@@ -126,7 +118,7 @@
 
   svg {
     fill: currentColor;
-    transition: fill $transition-duration $transition-easing;
+    transition: fill var(--transition-duration) var(--transition-easing);
   }
 
   img,
@@ -150,13 +142,14 @@
     height: 46px;
     padding-left: 14px;
     font-weight: bold;
-    color: $main-menu-text-color;
-    transition: color $transition-duration $transition-easing;
-    @include antialiased-font-smoothing;
+    color: var(--main-menu-text-color);
+    transition: color var(--transition-duration) var(--transition-easing);
+    @include mixins.antialiased-font-smoothing;
+    white-space: nowrap;
 
     &:focus {
-      @include default-focus-style(
-        $box-shadow: inset 0 0 0 2px $focus-color,
+      @include mixins.default-focus-style(
+        $box-shadow: inset 0 0 0 2px var(--focus-color),
         $border-radius: 0
       );
     }
@@ -166,16 +159,16 @@
 .sub_navigation {
   position: absolute;
   width: auto;
-  left: $collapsed-main-menu-width;
+  left: var(--main-menu-width);
   top: 0;
   visibility: hidden;
   opacity: 0;
-  transition: opacity $transition-duration $transition-easing;
+  transition: opacity var(--transition-duration) var(--transition-easing);
 }
 
 .subnavi_tab {
   &:first-of-type {
-    border-left: 1px solid $main-menu-active-bg-color;
+    border-left: 1px solid var(--main-menu-active-bg-color);
     margin-left: -1px;
   }
 
@@ -183,8 +176,8 @@
     padding-left: var(--spacing-4);
     padding-right: var(--spacing-4);
     background-color: transparent;
-    transition: background-color $transition-duration $transition-easing;
-    @include truncate($main-menu-width, $display: block, $wrap: nowrap);
+    transition: background-color var(--transition-duration)
+      var(--transition-easing);
   }
 
   &.active a,
@@ -193,18 +186,20 @@
   }
 }
 
-:root {
-  --main-menu-width: #{$main-menu-width};
+.collapsed-menu {
+  --main-menu-width: 48px;
 }
 
-.collapsed-menu {
-  --main-menu-width: #{$collapsed-main-menu-width};
+@media screen and (max-width: vars.$large-screen-break-point) {
+  body {
+    --main-menu-width: 48px;
+  }
 }
 
-@media screen and (min-width: $large-screen-break-point) {
+@media screen and (min-width: vars.$large-screen-break-point) {
   body:not(.collapsed-menu) {
     .sub_navigation {
-      left: $main-menu-width;
+      left: var(--main-menu-width);
     }
 
     .main_navi_entry.active {
@@ -230,7 +225,7 @@
   display: flex;
   flex-grow: 1;
   flex-wrap: nowrap;
-  height: $header-height + 1px;
+  height: calc(var(--header-height) + 1px);
 
   label {
     float: left;
@@ -254,9 +249,8 @@
   display: flex;
   align-items: center;
   flex-wrap: nowrap;
-  color: #444;
-  border-right: $default-border;
-  border-bottom: $default-border;
+  border-right: var(--border-default);
+  border-bottom: var(--border-default);
 
   form {
     align-self: center;
@@ -266,35 +260,37 @@
   }
 
   &:hover {
-    color: var(--color-text);
+    color: var(--text-color);
     text-decoration: none;
   }
 
   > a {
     display: flex;
-    align-items: end;
+    align-items: center;
     cursor: pointer;
     padding: var(--spacing-1) var(--spacing-2);
 
     &:focus {
-      @include default-focus-style($box-shadow: inset 0 0 0 2px $focus-color);
+      @include mixins.default-focus-style(
+        $box-shadow: inset 0 0 0 2px var(--focus-color)
+      );
     }
   }
 
   .icon.close {
     vertical-align: text-bottom;
-    text-shadow: $text-shadow-light;
+    text-shadow: var(--text-shadow-light);
   }
 
   .page_name {
     margin-right: var(--spacing-1);
-    text-shadow: $text-shadow-light;
+    text-shadow: var(--text-shadow-light);
   }
 
   .page_language,
   .page_site {
     display: inline-block;
-    color: var(--color-text_muted);
+    color: var(--text-color-muted);
     font-size: var(--font-size_small);
     margin-right: var(--spacing-1);
   }

data/app/{assets/stylesheets → stylesheets}/alchemy/admin/node-select.scss

@@ -34,19 +34,10 @@
 .node-select--node-url {
   margin-left: auto;
   padding: var(--spacing-1) var(--spacing-2);
-  color: var(--color-grey_dark);
+  color: var(--text-color);
   font-size: var(--font-size_small);
 
   .select2-highlighted & {
     color: var(--color-white);
   }
 }
-
-// The container of the rendered node is slightly larger than other a line of
-// text, as it would be for the Alchemy::Ingredients::Page. Reducing the padding here from 0.6em
-// to 0.4em centers the content nicely.
-.ingredient-editor.node {
-  .select2-container.alchemy_selectbox .select2-choice {
-    padding: 0.4em 0.75em;
-  }
-}