alchemy_cms 3.4.2 → 3.5.0.rc1

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

@@ -1,10 +1,10 @@
 #dashboard {
   overflow: auto;
-  padding: 4 * $default-padding;
+  padding: 4*$default-padding 2*$default-padding;
   width: 100%;
   position: relative;
-  @include box-sizing(border-box);
-  * { @include box-sizing(border-box) }
+  box-sizing: border-box;
+  * { box-sizing: border-box }
 
   h1 {
     font-size: 2em;

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

@@ -9,7 +9,7 @@
   height: 100%;
   text-align: center;
   white-space: nowrap;
-  @include opacity(0);
+  opacity: 0;
   @include transition(opacity 200ms linear);
 
   // vertical aligment
@@ -23,7 +23,7 @@
   }
 
   &.open {
-    @include opacity(1);
+    opacity: 1;
   }
 }
 
@@ -64,11 +64,11 @@
   background-color: $light-gray;
   margin: 2*$default-margin;
   @include border-top-radius($default-border-radius);
-  @include box-shadow(0 0 2px rgba(#000,0.8));
+  box-shadow: 0 0 2px rgba(#000,0.8);
   @include transition(min-height 200ms ease-in-out);
 
   &.modal {
-    @include box-shadow(0 0 4px #666);
+    box-shadow: 0 0 4px #666;
   }
 
   div#jscropper {
@@ -88,7 +88,9 @@
       padding: 0 8px 0 32px;
     }
 
-    .jcrop-holder { @include inline-block }
+    .jcrop-holder {
+      display: inline-block;
+    }
 
     img {
       width: auto;
@@ -121,7 +123,7 @@
 }
 
 .alchemy-dialog-header {
-  @include box-sizing(border-box);
+  box-sizing: border-box;
   position: relative;
   height: $dialog-header-height;
   padding: 0 2*$default-padding;
@@ -170,7 +172,7 @@
 }
 
 .alchemy-dialog-body {
-  @include box-sizing(border-box);
+  box-sizing: border-box;
   position: relative;
   color: $text-color;
 
@@ -209,7 +211,7 @@
 }
 
 .alchemy-dialog-buttons {
-  @include box-sizing(border-box);
+  box-sizing: border-box;
   float: left;
   clear: both;
   width: 100%;

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

@@ -1,5 +1,5 @@
 #alchemy_elements_window {
-  @include box-sizing(border-box);
+  box-sizing: border-box;
   position: absolute;
   right: 0;
   top: 73px;
@@ -10,7 +10,7 @@
 }
 
 #element_area {
-  @include box-sizing(border-box);
+  box-sizing: border-box;
   overflow-x: hidden;
   overflow-y: auto;
 
@@ -36,6 +36,10 @@
   margin-left: $default-margin;
   text-overflow: ellipsis;
 
+  .has-hint & {
+    max-width: 80%;
+  }
+
   .preview_text_quote {
     font-size: 10px;
     line-height: 15px;
@@ -141,7 +145,7 @@
   margin-bottom: 2*$default-margin;
 
   &.not-draggable {
-    @include opacity(0.5);
+    opacity: 0.5;
   }
 
   &.dirty {
@@ -154,7 +158,7 @@
 
   &.selected {
     border-color: $blue;
-    @include box-shadow(0 0 4px $blue);
+    box-shadow: 0 0 4px $blue;
   }
 
   &.folded {
@@ -239,7 +243,7 @@
     margin: 0 0 4*$default-margin 0;
     border: 0 none;
     border-top: 1px solid $medium-gray;
-    @include opacity(1);
+    opacity: 1;
   }
 }
 
@@ -255,6 +259,24 @@
     top: 9px;
     right: 9px;
   }
+
+  > .hint-with-icon {
+    position: absolute;
+    right: 32px;
+    top: 8px;
+
+    .hint-bubble {
+      left: auto;
+      right: -24px;
+      transform: none;
+
+      &:before {
+        left: auto;
+        right: 24px;
+        transform: none;
+      }
+    }
+  }
 }
 
 .element-toolbar {
@@ -324,7 +346,12 @@
     position: absolute;
     bottom: 3px;
     right: 28px;
-    @include border-radius(0);
+    border-radius: 0;
+
+    &.link-essence,
+    &.unlink-essence {
+      border: 1px solid #c0c0c0;
+    }
 
     &.linked.link-essence {
       @include linked-button($border-radius: 0 0 0 0);
@@ -365,7 +392,7 @@
   border: 1px dotted $button-border-color;
   background-color: $medium-gray;
   margin-bottom: 2*$default-margin;
-  @include border-radius($default-border-radius);
+  border-radius: $default-border-radius;
 }
 
 .edit_images_bottom {
@@ -402,14 +429,15 @@
   }
 
   a.disabled, > span.icon {
-    @include opacity(0.3);
+    opacity: 0.3;
     cursor: default;
   }
 }
 
 .content_editor.essence_date {
   float: none;
-  @include inline-block;
+  display: inline-block;
+  vertical-align: middle;
   vertical-align: top;
 
   input.date {
@@ -497,6 +525,11 @@ div.file {
   background-color: #f3f3f3;
   @extend %rounded-border;
   height: 24px;
+
+  .validation_failed & {
+    color: $error_text_color;
+    border-color: $error_border_color;
+  }
 }
 
 div.file_icon {
@@ -609,7 +642,8 @@ select.long {
   }
 
   &.display_inline {
-    @include inline-block;
+    display: inline-block;
+    vertical-align: middle;
     margin-right: 4px;
     vertical-align: top;
 
@@ -641,7 +675,8 @@ select.long {
     }
 
     &.inline {
-      @include inline-block;
+      display: inline-block;
+      vertical-align: middle;
       min-width: 90px;
       margin-right: 4px;
     }
@@ -679,7 +714,8 @@ select.long {
   }
 
   &:hover label a.icon_button.small {
-    @include inline-block;
+    display: inline-block;
+    vertical-align: middle;
   }
 
   select.essence_editor_select {
@@ -711,7 +747,8 @@ select.long {
 
   &.essence_date {
     float: none;
-    @include inline-block;
+    display: inline-block;
+    vertical-align: middle;
     vertical-align: top;
 
     input.date {
@@ -722,7 +759,8 @@ select.long {
   &.essence_picture_editor {
     float: none;
     height: auto;
-    @include inline-block;
+    display: inline-block;
+    vertical-align: middle;
   }
 }
 
@@ -769,41 +807,27 @@ textarea.has_tinymce {
   }
 }
 
-a.hint {
-  position: absolute;
-  right: 32px;
-  top: 8px;
-  width: 16px;
-  height: 16px;
-  cursor: help !important;
+.content_editor .hint-with-icon,
+.content_editor .with-hint,
+.element-handle .warning {
+  margin-left: 0;
 
-  &:hover span.bubble { display: block }
-  span.bubble { @extend %tooltip }
-}
-
-.content_editor .hint {
-  position: relative;
-  top: auto;
-  right: auto;
-  display: inline-block;
-  margin-right: 4px;
-  margin-top: -2px;
-  margin-left: -1px;
-
-  .bubble {
-    right: auto;
-    left: -4px;
-    top: 24px;
+  > .hint-bubble {
+    left: -7px;
+    transform: none;
 
     &:before {
-      right: auto;
-      left: 5px;
+      left: 16px;
     }
   }
 }
 
+.content_editor .hint-with-icon {
+  top: -1px;
+}
+
 .nestable-elements {
-  @include box-shadow(inset 0 4px 8px -2px darken($medium-gray, 15%));
+  box-shadow: inset 0 4px 8px -2px darken($medium-gray, 15%);
   background-color: $medium-gray;
 
   .expanded.element-editor > & {

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

@@ -37,3 +37,10 @@ div#errors, div.errors {
     margin-bottom: 0.5em;
   }
 }
+
+body.error {
+  .error.message {
+    max-height: 95%;
+    overflow-y: scroll;
+  }
+}

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

@@ -22,7 +22,7 @@ div#flash_notices {
 
 div.flash {
   @extend %rounded-border;
-  @include opacity(0.95);
+  opacity: 0.95;
   padding: 8px 8px 8px 30px;
   font-weight: bold;
   border-width: 1px;

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

@@ -30,43 +30,6 @@ textarea {
   line-height: 19px;
 }
 
-input#search_input_field {
-  width: 204px;
-  text-align: left;
-  @include border-radius(21px);
-  padding: 3px 16px 3px 28px;
-  margin: 0;
-  height: 29px;
-}
-
-div.search_field span.icon, div.js_filter_field_box span.icon {
-  position: absolute;
-  left: 8px;
-  top: 8px;
-}
-
-.js_filter_field_box {
-  position: absolute;
-  right: 4px;
-  top: 8px;
-
-  .js_filter_field {
-    width: 220px;
-    text-align: left;
-    @include border-radius($default-border-radius);
-    padding: 3px 24px 3px 28px;
-    height: 29px;
-    margin: 0;
-  }
-
-  label {
-    font-size: 10px;
-    display: block;
-    text-align: center;
-    padding-top: 3px;
-  }
-}
-
 .alchemy-char-counter {
   display: block;
   clear: both;

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

@@ -26,7 +26,7 @@ form {
 
   .input {
     padding: $default-padding 0;
-    @include pie-clearfix;
+    @include clearfix;
 
     > input[type="url"],
     > input[type="text"],
@@ -35,7 +35,8 @@ form {
     > textarea,
     > .select2-container,
     > .autocomplete_tag_list,
-    > .mce-tinymce {
+    > .mce-tinymce,
+    > .with-hint {
       width: $form-right-width;
       float: right;
     }
@@ -97,7 +98,7 @@ form {
         margin-bottom: 4px;
 
         input[type="text"] {
-          @include box-shadow(none);
+          box-shadow: none;
         }
       }
 
@@ -116,21 +117,30 @@ form {
 
     &.language_locale small.error {
       @include form-hint(
-        $background-color: $error_background_color,
-        $border-color: $error_border_color
+      $background-color: $error_background_color,
+      $border-color: $error_border_color
       );
       text-align: left;
     }
   }
 
+  .input > .with-hint,
+  .checkbox > .with-hint {
+    cursor: default;
+
+    input, textarea {
+      cursor: not-allowed;
+    }
+  }
+
   .inline-input {
     @include clearfix;
     margin: 0 -1*$default-margin;
-    @include box-sizing(border-box);
+    box-sizing: border-box;
 
     .left-column, .right-column {
       padding: 0 $default-padding;
-      @include box-sizing(border-box);
+      box-sizing: border-box;
     }
 
     .left-column {
@@ -170,7 +180,7 @@ form {
   }
 
   .input-column {
-    @include box-sizing(border-box);
+    box-sizing: border-box;
     float: left;
     padding: 0 $default-padding;
     width: 50%;
@@ -195,25 +205,6 @@ textarea#essence_picture_caption {
   height: 61px;
 }
 
-.resource_info {
-
-  h2 {
-    @include form-heading;
-  }
-
-  .value {
-    overflow: hidden;
-
-    label {
-      @include form-label;
-    }
-
-    p {
-      @include form-value-display;
-    }
-  }
-}
-
 // styles for link overlay selects
 .window_form {