alchemy_cms 7.0.14 → 7.1.0.pre.b1

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,48 @@ input.button {
 }
 
 .icon_button {
-  width: 27px;
-  height: 27px;
-  line-height: 21px;
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 30px;
+  height: 30px;
   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;
     background: none;
     border: none;
+  }
 
-    .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 +97,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 +122,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;
   }
 }
 

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

@@ -19,7 +19,7 @@ $dialog-transition-duration: 150ms;
 
   // vertical aligment
   &:before {
-    content: '';
+    content: "";
     width: 0;
     height: 100%;
     display: inline-block;
@@ -41,7 +41,7 @@ $dialog-transition-duration: 150ms;
   z-index: 30;
   width: 100%;
   height: 100%;
-  background-color: rgba(0, 0, 0, 0.0);
+  background-color: rgba(0, 0, 0, 0);
   transition: background-color $dialog-transition-duration linear;
 
   &.closable {
@@ -50,7 +50,6 @@ $dialog-transition-duration: 150ms;
 }
 
 .alchemy-dialog-overlay {
-
   &.open {
     background-color: rgba($dialog-overlay-color, $dialog-overlay-opacity);
   }
@@ -67,7 +66,7 @@ $dialog-transition-duration: 150ms;
 
 .alchemy-dialog {
   white-space: normal;
-  margin: 2*$default-margin;
+  margin: 2 * $default-margin;
   @include border-top-radius($default-border-radius);
   box-shadow: $dialog-box-shadow;
   background-color: $dialog-background-color;
@@ -122,25 +121,23 @@ $dialog-transition-duration: 150ms;
 }
 
 .alchemy-dialog-header {
+  display: flex;
+  align-items: center;
+  gap: $default-padding;
   position: relative;
   height: $dialog-header-height;
-  padding: 0 2*$default-padding;
-  line-height: $dialog-header-height;
+  padding: 0 2 * $default-padding;
   background: $dialog-header-color;
   color: $dialog-header-text-color;
   font-weight: normal;
   font-size: $dialog-header-font-size;
   @include border-top-radius($default-border-radius);
-
-  .ui-draggable & {
-    cursor: move;
-  }
 }
 
 .alchemy-dialog-title {
+  flex-grow: 1;
   font-weight: bold;
   padding: 0 $default-padding;
-  margin-right: 22px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -149,15 +146,10 @@ $dialog-transition-duration: 150ms;
 
 .alchemy-image-overlay-close,
 .alchemy-dialog-close {
-  position: absolute;
-  z-index: 1;
   cursor: pointer;
 }
 
 .alchemy-dialog-close {
-  top: 0;
-  right: 2*$default-padding;
-  padding: 0 $default-padding;
   color: inherit;
 
   .icon {
@@ -174,7 +166,7 @@ $dialog-transition-duration: 150ms;
   }
 
   &.padded {
-    padding: 4*$default-padding;
+    padding: 4 * $default-padding;
 
     .message {
       margin: 0 0 8px 0;
@@ -192,22 +184,14 @@ $dialog-transition-duration: 150ms;
 }
 
 .alchemy-dialog-buttons {
-  padding-top: 4*$default-padding;
+  padding-top: 4 * $default-padding;
   text-align: right;
 
   button:first-child {
-    margin-right: 2*$default-margin;
+    margin-right: 2 * $default-margin;
   }
 }
 
 #overlay_tabs {
-  margin: -4*$default-padding;
-
-  .ui-tabs-panel {
-    padding: 4*$default-padding;
-  }
-
-  .ui-tabs.ui-corner-all {
-    border-radius: 0;
-  }
+  margin: -4 * $default-padding;
 }