alchemy_cms 7.0.8 → 7.1.0.pre.b2

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,65 @@ 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%;
+
+    &:not([src*="alchemy/missing-image"]) {
+      background: $thumbnail-background;
+    }
 
-    &[src$=".svg"] {
-      width: auto;
-      height: auto;
+    &[src$=".svg"]:not([src*="alchemy/missing-image"]) {
+      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 +116,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 +163,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 +205,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 +283,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 +328,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;
 }

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

@@ -26,16 +26,20 @@ input.button {
 
   &.small {
     padding: $small-button-padding;
-    vertical-align: inherit;
     line-height: 4 * $default-padding;
     font-size: inherit;
   }
 
-  &.with_icon .icon {
-    position: relative;
-    top: -1px;
-    margin-right: 2 * $default-margin;
-    color: inherit;
+  &.with_icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+
+    .icon {
+      font-weight: normal;
+      margin-right: $default-margin;
+      color: inherit;
+    }
   }
 
   &[disabled] {
@@ -44,64 +48,49 @@ input.button {
 }
 
 .icon_button {
-  width: 27px;
-  height: 27px;
-  line-height: 21px;
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: $icon-button-width;
+  height: $icon-button-height;
   margin: 0;
-  padding: 3px;
-  overflow: hidden;
-  text-align: center;
+  padding: 0;
   text-shadow: none;
   border-radius: $default-border-radius;
 
-  img {
-    position: absolute;
-    top: 2px;
-    left: 3px;
-  }
-
   &.small {
-    width: 15px;
-    height: 15px;
-    padding: 0;
-    float: none;
-    display: inline-block;
-    vertical-align: middle;
-    position: relative;
-    top: 0px;
+    width: $icon-button-small-width;
+    height: $icon-button-small-height;
     background: none;
     border: none;
+    padding: 0; // button.small has padding
+  }
 
-    .icon {
-      position: absolute;
-      top: 50%;
-      transform: translateX(-50%) translateY(-50%);
-      transition: color 250ms;
-    }
-
-    &:hover {
-      border: $default-border-width $default-border-style $icon-color;
-      color: $icon-color;
+  &.active,
+  &:active,
+  &:hover:not([disabled]):not(.disabled):not(.linked) {
+    text-decoration: none;
+    background-color: $default-border-color;
+    cursor: pointer;
+  }
 
-      .icon {
-        color: inherit;
-      }
-    }
+  .icon {
+    color: inherit;
+    transition: color 250ms;
   }
 
   &.disabled,
   &[disabled] {
-    span {
-      opacity: 0.3;
-      cursor: not-allowed;
-    }
+    pointer-events: none;
 
     i {
       opacity: 0.3;
     }
 
     &:hover {
-      cursor: not-allowed;
+      text-decoration: none;
+      cursor: default;
     }
   }
 
@@ -109,15 +98,21 @@ input.button {
     @include linked-button;
   }
 
-  &:focus {
+  &:focus:not(.disabled):not([disabled]) {
     @include default-focus-style;
   }
+
+  .spinner {
+    position: static;
+    transform: none;
+  }
 }
 
 button.icon_button {
   background: transparent;
   border: 0 none;
   box-shadow: none;
+  font-weight: normal;
 
   &:disabled,
   &.disabled {
@@ -128,123 +123,3 @@ button.icon_button {
 #new_element button.button {
   float: right;
 }
-
-.button_with_label {
-  position: relative;
-  display: inline-block;
-  text-align: center;
-
-  .toolbar_buttons & {
-    margin: 0 2 * $default-margin;
-  }
-
-  &.active,
-  &:active,
-  &:hover {
-    .icon_button:not([disabled]) {
-      background-color: $default-border-color;
-      cursor: pointer;
-    }
-  }
-
-  .select2-container,
-  select {
-    margin: 0;
-    top: 0;
-  }
-
-  .icon_button {
-    float: none;
-    margin-right: auto;
-    margin-left: auto;
-    display: inline-block;
-    vertical-align: middle;
-    position: relative;
-  }
-
-  &.disabled {
-    opacity: 0.5;
-    cursor: default;
-  }
-}
-
-.button_with_label,
-.button_group {
-  .icon_button {
-    width: 29px;
-    height: 29px;
-    line-height: 24px;
-  }
-
-  label {
-    border-radius: $default-border-radius;
-    position: absolute;
-    visibility: hidden;
-    top: -20px;
-    left: 50%;
-    margin-left: -13px;
-    z-index: 30;
-    background-color: $tooltip-background-color;
-    color: $white;
-    padding: $default-padding 2 * $default-padding 1.5 * $default-padding;
-    line-height: 1;
-    box-shadow: 0 0 4px $default-border-color;
-    white-space: nowrap;
-    pointer-events: none;
-    opacity: 0;
-    transition: 0.3s;
-
-    &:before {
-      content: "";
-      position: absolute;
-      bottom: -10px;
-      left: 8px;
-      border: 5px transparent solid;
-      border-top-color: $tooltip-background-color;
-    }
-
-    &.center {
-      left: auto;
-      right: 50%;
-      margin-left: 0;
-      transform: translateX(50%);
-
-      &:before {
-        left: auto;
-        right: 50%;
-        transform: translateX(50%);
-      }
-    }
-
-    &.left {
-      left: auto;
-      right: 50%;
-      margin-left: 0;
-      margin-right: -13px;
-
-      &:before {
-        left: auto;
-        right: 8px;
-      }
-    }
-
-    &.right-aligned {
-      left: auto;
-      margin-left: auto;
-      right: 50%;
-      margin-right: -13px;
-
-      &:before {
-        left: auto;
-        right: 8px;
-      }
-    }
-  }
-
-  &:hover label {
-    visibility: visible;
-    opacity: 1;
-    top: -25px;
-    transition-delay: 0.2s;
-  }
-}

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

@@ -1,6 +1,6 @@
 #dashboard {
   overflow: auto;
-  padding: 4*$default-padding 0;
+  padding: 4 * $default-padding 0;
   width: 100%;
   position: relative;
 
@@ -35,8 +35,13 @@
       td {
         position: relative;
 
-        &:first-child { width: 40% }
-        form { float: right }
+        &:first-child {
+          width: 40%;
+        }
+
+        form {
+          float: right;
+        }
       }
     }
   }
@@ -53,10 +58,30 @@
     display: none;
   }
 
-  & > span { display: none }
+  > span {
+    display: inline-flex;
+    gap: $default-padding;
+    align-items: center;
+
+    &.hidden {
+      display: none;
+    }
+
+    .icon {
+      color: inherit;
+    }
+  }
+
+  #up_to_date {
+    color: $success_text_color;
+  }
+
+  #error {
+    color: $error_text_color;
+  }
 
-  span.icon {
-    vertical-align: top;
+  #update_available {
+    color: $warning_text_color;
   }
 }