alchemy_cms 2.2.4 → 2.3.rc5

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

@@ -3,8 +3,9 @@
 #dashboard {
   overflow: auto;
   float: left;
-  padding: 8px;
+  padding: 4 * $default-padding;
   width: 450px;
+  position: relative;
 
   h1 {
     font-size: 2em;
@@ -48,10 +49,9 @@
         position: relative;
 
         form {
-          line-height: 10px;
           position: absolute;
           top: 2*$default-padding;
-          right: $default-padding;
+          right: 2*$default-padding;
         }
       }
     }
@@ -61,7 +61,7 @@
 div#sideboard {
   float: right;
   width: 240px;
-  padding-right: 16px;
+  padding: 16px;
 
   div.sideboard_widget img {
     margin-bottom: 16px;

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

@@ -45,7 +45,7 @@ img.add_element_spinner {
   position: absolute;
   top: 0;
   left: 0;
-  background: image-url('alchemy/icons.png') no-repeat -224px -72px;
+  background: url('icons.png') no-repeat -224px -72px;
 }
 
 .element_handle span.icon {
@@ -59,11 +59,6 @@ img.add_element_spinner {
   background-position: -160px -166px;
 }
 
-div.element_foot span.element_public {
-  float: left;
-  margin-top: 1px;
-}
-
 .element_head_all {
   overflow: auto;
   width: 374px;
@@ -85,7 +80,7 @@ div.element_foot span.element_public {
   padding-bottom: 10px;
 }
 
-.add_content {
+.add_picture {
   float: left;
   margin: 1px;
   width: 111px;
@@ -94,27 +89,26 @@ div.element_foot span.element_public {
   border: 1px solid #c2baab;
   @include rounded-corner;
   height: 115px;
-}
 
-.add_content a {
-  text-decoration: none;
-  overflow: hidden;
-  text-align: center;
-  font-weight: bold;
-  line-height: 104px;
-  @include rounded-corner;
-  font-size: 40px;
-  display: block;
-  height: 100%;
-  width: 100%;
-  position: relative;
-}
+  a {
+    text-decoration: none;
+    overflow: hidden;
+    text-align: center;
+    font-weight: bold;
+    line-height: 104px;
+    @include rounded-corner;
+    font-size: 40px;
+    display: block;
+    height: 100%;
+    width: 100%;
+    position: relative;
 
-.add_content a .icon.assign {
-  background: image-url('alchemy/icons.png') no-repeat -288px -72px;
-  position: absolute;
-  top: 52px;
-  left: 47px;
+    .icon {
+      position: absolute;
+      top: 52px;
+      left: 47px;
+    }
+  }
 }
 
 .element_foot {
@@ -123,20 +117,25 @@ div.element_foot span.element_public {
   position: relative;
   background-color: #e5dcca;
   width: 100%;
-  height: 21px;
+  height: 27px;
   margin-left: -8px;
-}
 
-.element_foot .element_tools {
-  float: left;
-  margin-right: 8px;
-  margin-top: 3px;
-}
+  .element_tools {
+    float: left;
+    margin-right: 8px;
+    margin-top: 6px;
+  }
 
-.element_foot .button {
-  position: absolute;
-  right: 8px;
-  bottom: 6px;
+  .element_public {
+    float: left;
+    margin-top: 6px;
+  }
+
+  .button {
+    position: absolute;
+    right: 8px;
+    bottom: 4px;
+  }
 }
 
 .ajax_folder {
@@ -163,7 +162,7 @@ div.element_editor {
   margin-bottom: 8px;
 
   &.not-draggable {
-    @include opacity(50);
+    @include opacity(0.5);
   }
 
   &.dirty {
@@ -230,7 +229,6 @@ div.element_editor {
 #alchemy .ui-dialog div.element_editor form {
   margin: 0;
   padding: 0 8px;
-  overflow: hidden;
 }
 
 div.element_tools {
@@ -249,15 +247,15 @@ span.element_tools_icons {
 }
 
 a.delete_element_button {
-  background: image-url('alchemy/icons.png') no-repeat -63px -72px;
+  background: url('icons.png') no-repeat -63px -72px;
 }
 
 a.element_copy_button {
-  background: image-url('alchemy/icons.png') no-repeat -128px -72px;
+  background: url('icons.png') no-repeat -128px -72px;
 }
 
 a.element_move_button {
-  background: image-url('alchemy/icons.png') no-repeat -97px -72px;
+  background: url('icons.png') no-repeat -97px -72px;
 }
 
 .element_head {
@@ -282,6 +280,10 @@ div.picture_gallery_images {
   @include rounded-corner;
   background-color: #e5dcca;
   padding: 1px;
+
+  .essence_picture_editor {
+    margin: 1px;
+  }
 }
 
 div.picture_thumbnail div.picture_image {
@@ -293,24 +295,6 @@ div.picture_thumbnail div.picture_image {
   }
 }
 
-/* @group add moclecule */
-
-.new_alchemy_element {
-  margin: 0;
-  padding: 0;
-  position: relative;
-  min-height: 25px;
-  overflow: auto;
-}
-
-.new_alchemy_element p {
-  line-height: 21px;
-}
-
-.new_alchemy_element form {
-  line-height: 21px;
-}
-
 div#element_area {
   padding: 0;
   margin: 0;
@@ -326,24 +310,6 @@ div#element_area .sortable_cell {
   padding: 8px 8px 2px;
 }
 
-.new_alchemy_element span {
-  float: left;
-  line-height: 25px;
-}
-
-.new_alchemy_element select {
-  float: left;
-  width: 185px;
-  margin: 0 8px;
-}
-
-.new_alchemy_element input.button {
-  float: right;
-  margin-left: 8px;
-}
-
-/* @end */
-
 .place_element_spinner {
   position: absolute;
   right: 8px;
@@ -356,28 +322,23 @@ span.linkable_text_essence_tools {
   position: absolute;
   bottom: 0;
   right: 2px;
+
   a.icon_button {
     margin: 0 0 0 4px;
     position: absolute;
-    bottom: 0;
-    right: 26px;
+    bottom: 4px;
+    right: 28px;
     @include reset-border-radius;
-    height: 27px;
-    width: 27px;
-    background-position: 0 -72px;
+
     &.unlink {
       right: 0;
       @include right-rounded-border;
     }
-    .icon {
-      left: 5px;
-      top: 6px;
-    }
   }
 }
 
 a.expand_element {
-  background: image-url('alchemy/icons.png') no-repeat -160px -72px;
+  background: url('icons.png') no-repeat -160px -72px;
   height: 16px;
   width: 16px;
   text-decoration: none;
@@ -386,7 +347,7 @@ a.expand_element {
 }
 
 a.fold_element {
-  background: image-url('alchemy/icons.png') no-repeat -192px -72px;
+  background: url('icons.png') no-repeat -192px -72px;
   height: 16px;
   width: 16px;
   text-decoration: none;
@@ -424,7 +385,7 @@ a.icon_button.linked {
 .edit_images_bottom a.linked {
   position: relative;
   @include rounded-corner;
-  background-image: image-url('alchemy/shading.png');
+  background-image: url('shading.png');
   background-repeat: repeat-x;
   background-position: 0 -75px;
   background-color: #ffd77a;
@@ -437,14 +398,13 @@ a.icon_button.linked {
 }
 
 .edit_images_bottom a.disabled {
-  @include opacity(30);
+  @include opacity(0.3);
   cursor: default;
 }
 
 div.content_editor.essence_date {
   float: none;
-  display: inline;
-  display: inline-block;
+  @include inline-block;
   vertical-align: top;
 
   input.date {
@@ -495,7 +455,7 @@ div.essence_picture_editor .picture_thumbnail:hover .picture_tool_delete {
 }
 
 div.essence_picture_editor .thumbnail_background.missing {
-  background-image: image-url('alchemy/placeholder.png');
+  background-image: url('placeholder.png');
   background-repeat: no-repeat;
   background-position: center 12px;
 }
@@ -570,7 +530,7 @@ div.file_icon span.icon {
 div.file_icon a.assign_file {
   display: block;
   height: 16px;
-  background: image-url('alchemy/icons.png') no-repeat -480px -40px;
+  background: url('icons.png') no-repeat -480px -40px;
   width: 16px;
   margin: $default-margin;
 }
@@ -600,11 +560,11 @@ div.essence_file_tools a {
 }
 
 div.essence_file_tools a.assign_file {
-  background: image-url('alchemy/icons.png') -512px -40px;
+  background: url('icons.png') -512px -40px;
 }
 
 div.essence_file_tools a.edit_file {
-  background: image-url('alchemy/icons.png') -160px -167px;
+  background: url('icons.png') -160px -167px;
 }
 
 td.content_editor_essence_type {
@@ -622,9 +582,10 @@ table.content_editor_table {
 
 a.new_content_link {
   float: none;
-  display: inline-block;
+  @include inline-block;
   margin-bottom: 8px;
   margin-top: 4px;
+  line-height: 4em;
 }
 
 div.essence_richtext_loader {
@@ -635,7 +596,7 @@ div.essence_richtext_loader {
   width: 100%;
   height: 100%;
   background-color: #F0E8D7;
-  @include opacity(90);
+  @include opacity(0.9);
 }
 
 div.essence_richtext_loader img {
@@ -690,16 +651,14 @@ div.content_editor {
     font-size: 11px;
 
     span.icon.warning {
-      position: relative;
-      top: 2px;
-      left: 2px;
-      margin-right: 8px;
+      vertical-align: text-bottom;
+      margin-left: 2px;
+      margin-right: 6px;
     }
   }
 
   &.display_inline {
-    display: inline;
-    display: inline-block;
+    @include inline-block;
     margin-right: 4px;
     vertical-align: top;
 
@@ -734,18 +693,32 @@ div.content_editor {
     }
 
     &.inline {
-      display: inline-block;
+      @include inline-block;
       min-width: 90px;
       margin-right: 4px;
     }
 
     a.icon_button.small {
+      width: 10px;
+      height: 10px;
       display: none;
+
+      .icon {
+        top: 1px;
+        right: 1px;
+      }
+
+      &:hover {
+
+        .icon {
+          right: 2px;
+        }
+      }
     }
   }
 
   &:hover label a.icon_button.small {
-    display: inline-block;
+    @include inline-block;
   }
 
   input.text_with_icon.auto_resize.thin_border {
@@ -782,8 +755,7 @@ div.content_editor {
 
   &.essence_date {
     float: none;
-    display: inline;
-    display: inline-block;
+    @include inline-block;
     vertical-align: top;
 
     input.date {
@@ -794,8 +766,7 @@ div.content_editor {
   &.essence_picture_editor {
     float: none;
     height: auto;
-    display: inline;
-    display: inline-block;
+    @include inline-block;
     margin: 8px 0;
   }
 }
@@ -817,14 +788,8 @@ div.pictures_for_element {
   margin-top: 4px;
 }
 
-textarea {
-  font: 12px Tahoma, Arial, sans-serif;
-  padding: 4px;
-  margin: 0;
+#element_area textarea {
   width: 97%;
-  border-style: inset;
-  border-width: 1px;
-  @include rounded-corner;
   height: 140px;
 }
 

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

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