alchemy_cms 4.0.0.rc2 → 4.0.0

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

@@ -3,8 +3,6 @@
   padding: 4*$default-padding 2*$default-padding;
   width: 100%;
   position: relative;
-  box-sizing: border-box;
-  * { box-sizing: border-box }
 
   h1 {
     font-size: 2em;

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

@@ -81,9 +81,15 @@
       position: relative;
     }
 
+    form,
     .info.message {
-      float: right;
-      width: 134px;
+      position: absolute;
+      right: 2 * $default-padding;
+      width: 256px;
+    }
+
+    .info.message {
+      top: 2 * $default-padding;
       margin: 0 0 0 8px;
       padding: 0 8px 0 32px;
     }
@@ -99,27 +105,22 @@
 
     form {
       padding: 0;
-      position: absolute;
       bottom: 2 * $default-padding;
-      right: 2 * $default-padding;
-      width: 176px;
       margin-left: 8px;
 
-      .reset_mask, button {
-        display: block;
+      button {
         margin-bottom: 0;
-        text-align: center;
+        width: calc(50% - #{$default-padding});
       }
 
-      .reset_mask { padding-top: 4px }
-
-      button { width: 100% }
+      button[type="submit"] {
+        float: right;
+      }
     }
   }
 }
 
 .alchemy-dialog-header {
-  box-sizing: border-box;
   position: relative;
   height: $dialog-header-height;
   padding: 0 2*$default-padding;
@@ -168,7 +169,6 @@
 }
 
 .alchemy-dialog-body {
-  box-sizing: border-box;
   position: relative;
   color: $text-color;
 
@@ -207,7 +207,6 @@
 }
 
 .alchemy-dialog-buttons {
-  box-sizing: border-box;
   float: left;
   clear: both;
   width: 100%;

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

@@ -1,5 +1,4 @@
 #alchemy_elements_window {
-  box-sizing: border-box;
   position: absolute;
   right: 0;
   top: 73px;
@@ -10,7 +9,6 @@
 }
 
 #element_area {
-  box-sizing: border-box;
   overflow-x: hidden;
   overflow-y: auto;
 
@@ -251,7 +249,6 @@
 
 .element-header {
   position: relative;
-  height: 20px;
   padding: 2*$default-padding;
   background-color: $medium-gray;
   @extend .disable-user-select;
@@ -277,14 +274,13 @@
 }
 
 .element-toolbar {
-  padding: 6px 0;
-  height: 6*$default-padding;
+  padding: $default-padding 0;
+  height: $element-toolbar-height;
   background-color: #f0f0f0;
 
   .element_tools {
     float: left;
-    margin-top: -3px;
-    margin-left: -4px;
+    margin-left: -$default-margin;
   }
 }
 
@@ -393,17 +389,16 @@
 }
 
 .edit_images_bottom {
-  height: 19px;
   position: absolute;
+  left: 0;
+  bottom: 0;
   z-index: 0;
-  left: 5px;
-  bottom: 2px;
-  width: 111px;
+  width: inherit;
+  padding: $default-padding;
 
   > a, > span.icon {
     float: left;
-    margin-left: 2px;
-    margin-right: 2px;
+    margin: 0 $default-margin/2;
     width: 18px;
     height: 18px;
   }
@@ -447,8 +442,8 @@
   }
 
   .picture_thumbnail {
-    width: 111px;
-    height: 115px;
+    width: 121px;
+    height: 125px;
     margin: $default-margin 0;
 
     .thumbnail_background {
@@ -495,72 +490,67 @@
 .picture_thumbnail .picture_handle {
   position: absolute;
   z-index: 1;
-  width: 110px;
-  height: 93px;
-  top: 4px;
-  left: 4px;
+  width: 100%;
+  height: 97px;
+  top: 0;
+  left: 0;
   background-color: transparent;
   @extend .disable-user-select;
 }
 
-div.file {
-  padding: 0;
-  margin-top: 8px;
-  margin-bottom: 4px;
-  border: 1px solid #c0c0c0;
-  background-color: #f3f3f3;
-  @extend %rounded-border;
-  height: 24px;
+.content_editor.essence_file {
 
-  .validation_failed & {
-    color: $error_text_color;
-    border-color: $error_border_color;
+  .file {
+    margin: 6px 0 $default-margin;
+    border: $default-border;
+    background-color: $white;
+    @extend %rounded-border;
+    height: $default-form-field-height;
+
+    .validation_failed & {
+      color: $error_text_color;
+      border-color: $error_border_color;
+    }
   }
-}
 
-div.file_icon {
-  text-align: center;
-  float: left;
-  height: 24px;
-  width: 24px;
+  .file_icon {
+    text-align: center;
+    float: left;
+    line-height: 25px;
+    width: 24px;
 
-  span.icon {
-    margin: $default-margin;
-  }
+    .icon {
+      margin: $default-margin;
+    }
 
-  a.assign_file {
-    display: block;
-    height: 16px;
-    background: image-url('alchemy/icons.png') no-repeat -480px -40px;
-    width: 16px;
-    margin: $default-margin;
+    .assign_file {
+      background-position: -480px -40px;
+    }
   }
-}
-
-.content_editor.essence_file {
 
   .file_name {
     white-space: nowrap;
     overflow: hidden;
     float: left;
     max-width: 80%;
-    line-height: 25px;
+    line-height: $default-form-field-height;
     font-size: 10px;
     text-overflow: ellipsis;
   }
 }
 
 .essence_file_tools {
-  height: 24px;
+  height: 27px;
   float: right;
   background-color: white;
   width: 48px;
+  border-radius: 0 $default-border-radius $default-border-radius 0;
 
   a {
     text-decoration: none;
     width: 16px;
     height: 16px;
-    margin: $default-margin;
+    margin: 5px $default-margin;
     float: left;
 
     &.assign_file {

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

@@ -136,11 +136,9 @@ form {
   .inline-input {
     @include clearfix;
     margin: 0 -1*$default-margin;
-    box-sizing: border-box;
 
     .left-column, .right-column {
       padding: 0 $default-padding;
-      box-sizing: border-box;
     }
 
     .left-column {
@@ -180,7 +178,6 @@ form {
   }
 
   .input-column {
-    box-sizing: border-box;
     float: left;
     padding: 0 $default-padding;
     width: 50%;

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

@@ -29,7 +29,6 @@ div#overlay_text_box {
 }
 
 #logout {
-  box-sizing: border-box;
   position: absolute;
   z-index: 1;
   bottom: 0;
@@ -99,7 +98,6 @@ div#overlay_text_box {
 }
 
 #main_content {
-  box-sizing: border-box;
   background-color: $light-gray;
   padding: 84px 8px 8px $main-menu-width + 10px;
   z-index: 0;
@@ -108,7 +106,6 @@ div#overlay_text_box {
 }
 
 #archive_all {
-  box-sizing: border-box;
   height: 100%;
   padding-bottom: 60px;
 

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

@@ -88,7 +88,6 @@ $image-overlay-transition-easing: ease-in;
 }
 
 .picture-details-overlay {
-  box-sizing: border-box;
   right: 0;
   width: $image-overlay-form-width;
   height: 100%;
@@ -138,7 +137,6 @@ $image-overlay-transition-easing: ease-in;
 }
 
 .zoomed-picture-background {
-  box-sizing: border-box;
   width: 100%;
   height: 100%;
   padding-top: 2*$default-padding;
@@ -175,7 +173,6 @@ $image-overlay-transition-easing: ease-in;
   padding: 2*$default-padding 0;
 
   .message {
-    box-sizing: border-box;
     margin: 2*$default-padding 0;
   }
 }

data/app/assets/stylesheets/alchemy/jquery.datetimepicker.scss

@@ -24,7 +24,6 @@ $datepicker_day_color: $text-color !default;
   padding-top: 2px;
   position: absolute;
   z-index: 9999;
-  box-sizing: border-box;
   display: none;
 }
 
@@ -61,7 +60,6 @@ $datepicker_day_color: $text-color !default;
 }
 
 .xdsoft_datetimepicker * {
-  box-sizing: border-box;
   padding: 0;
   margin: 0;
 }

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

@@ -25,6 +25,7 @@ ul.list {
       background-color: transparent;
       font-weight: bold;
       padding: $default-padding;
+      margin-bottom: $default-margin;
 
       .list-secondary {
         color: $text-color;

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

@@ -1,5 +1,4 @@
 #top_menu {
-  box-sizing: border-box;
   position: fixed;
   top: 0;
   margin-left: $main-menu-width;
@@ -15,7 +14,6 @@
 }
 
 #left_menu {
-  box-sizing: border-box;
   z-index: 30;
   height: 100%;
   position: fixed;
@@ -49,7 +47,6 @@
       }
 
       label {
-        box-sizing: border-box;
         position: absolute;
         top: 0;
         left: $collapsed-main-menu-width - 1;
@@ -80,7 +77,7 @@
 }
 
 #main_navi {
-  padding-top: 30px;
+  padding-top: 28px;
   padding-bottom: 80px;
 }
 

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

@@ -1,5 +1,4 @@
 .pagination {
-  box-sizing: border-box;
   background: $light_gray;
   color: $text-color;
   position: fixed;
@@ -7,7 +6,7 @@
   right: 0;
   width: 100%;
   left: 0px;
-  height: 50px;
+  height: 52px;
   padding: 2*$default-padding;
   padding-left: $main-menu-width + 10px;
   text-align: left;
@@ -16,7 +15,6 @@
 
   a, span, em {
     font-size: $default-font-size;
-    height: 25px;
     line-height: 25px;
     padding: $default-padding;
   }

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

@@ -13,8 +13,8 @@ select {
     text-shadow: #FFF 0px 1px 0px;
 
     .select2-choice {
-      height: 27px;
-      line-height: 27px;
+      height: $default-form-field-height;
+      line-height: $default-form-field-height - 2;
       @include button-defaults($padding: 0 2*$default-padding, $margin: 0);
       display: block;
       font-weight: normal;

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

@@ -98,7 +98,7 @@
 .sitemap_left_images {
   @extend .left-rounded-border;
   position: relative;
-  width: 16px;
+  width: 32px;
   height: $sitemap-line-height;
   line-height: $sitemap-line-height - 2px;
   float: left;

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

@@ -42,7 +42,6 @@
 }
 
 .overall-upload {
-  box-sizing: border-box;
   position: fixed;
   bottom: -100%;
   left: 0;

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -29,7 +29,6 @@
 }
 
 .mce-widget button {
-  box-sizing: border-box;
 }
 
 .mce-container *[unselectable] {
@@ -255,7 +254,6 @@ div.mce-tinymce-inline {
 .mce-panel {
   border: 0 solid $default-border-color;
   background-color: $medium-gray;
-  box-sizing: border-box;
 }
 
 .mce-toolbar-grp {

data/app/helpers/alchemy/elements_helper.rb

@@ -187,7 +187,12 @@ module Alchemy
 
     # Renders the HTML tag attributes required for preview mode.
     def element_preview_code(element)
-      tag_options(element_preview_code_attributes(element))
+      if respond_to?(:tag_options)
+        tag_options(element_preview_code_attributes(element))
+      else
+        # Rails 5.1 uses TagBuilder
+        tag_builder.tag_options(element_preview_code_attributes(element))
+      end
     end
 
     # Returns a hash containing the HTML tag attributes required for preview mode.
@@ -205,7 +210,12 @@ module Alchemy
     #   HTML tag attributes containing the element's tag information.
     #
     def element_tags(element, options = {})
-      tag_options(element_tags_attributes(element, options))
+      if respond_to?(:tag_options)
+        tag_options(element_tags_attributes(element, options))
+      else
+        # Rails 5.1 uses TagBuilder
+        tag_builder.tag_options(element_tags_attributes(element, options))
+      end
     end
 
     # Returns the element's tags information as an attribute hash.