app/assets/stylesheets/alchemy/elements.scss in alchemy_cms-2.4.rc2 vs app/assets/stylesheets/alchemy/elements.scss in alchemy_cms-2.4.rc4

- old
+ new

@@ -205,14 +205,14 @@ } .autocomplete_tag_list { background-color: #e5dcca; margin: 0 -8px 1px -8px; - padding: 2 * $default-padding; + padding: 2*$default-padding; label { - top: 17px; + top: 18px; left: 14px; } input[data-autocomplete] { padding-left: 25px; @@ -269,18 +269,22 @@ overflow: auto; } div.picture_gallery_images { overflow: hidden; - margin-bottom: 8px; + margin: $default-margin 0; border: 1px inset #cecece; @include rounded-corner; background-color: #e5dcca; padding: 1px; .essence_picture_editor { margin: 1px; + float: left; + height: 126px; + + .picture_thumbnail { margin: 0 } } } div.picture_thumbnail div.picture_image { height: 93px; @@ -315,11 +319,11 @@ } span.linkable_essence_tools { position: absolute; bottom: 0; - right: 2px; + right: 0; a.icon_button { margin: 0 0 0 4px; position: absolute; bottom: 4px; @@ -403,31 +407,44 @@ width: 154px; } } div.essence_picture_editor { - float: left; - height: 126px; - margin: 1px; position: relative; -} -div.essence_picture_editor .picture_tool_delete { - position: absolute; - right: 4px; - top: 4px; - padding: 2px 2px 0; - z-index: 2; -} + .picture_tool_delete { + position: absolute; + right: $default-margin; + top: $default-margin; + padding: 2px 2px 0; + z-index: 2; + } -div.essence_picture_editor.validation_failed .picture_thumbnail { - border-color: #931f23; - -webkit-box-shadow: #931f23 0px 1px 3px; - -moz-box-shadow: #931f23 0px 1px 3px; - -ms-box-shadow: #931f23 0px 1px 3px; - -o-box-shadow: #931f23 0px 1px 3px; - box-shadow: #931f23 0px 1px 3px; + .picture_thumbnail:hover .picture_tool_delete { + display: block; + } + + .picture_thumbnail { + width: 111px; + height: 115px; + margin: $default-margin 0; + + .thumbnail_background { + width: 111px; + height: 93px; + } + } + + &.validation_failed .picture_thumbnail { + border-color: $error_border_color + } + + .thumbnail_background.missing { + background-image: url('placeholder.png'); + background-repeat: no-repeat; + background-position: center 12px; + } } div.essence_picture_css_class { position: absolute; z-index: 1; @@ -440,20 +457,10 @@ text-align: right; height: 12px; overflow: hidden; } -div.essence_picture_editor .picture_thumbnail:hover .picture_tool_delete { - display: block; -} - -div.essence_picture_editor .thumbnail_background.missing { - background-image: url('placeholder.png'); - background-repeat: no-repeat; - background-position: center 12px; -} - .dragable_picture { float: left; } .picture_thumbnail .picture_handle { @@ -485,21 +492,10 @@ margin-top: -16px; margin-left: -16px; } } -.essence_picture_editor .picture_thumbnail { - width: 111px; - height: 115px; - margin: 0; -} - -.essence_picture_editor .picture_thumbnail .thumbnail_background { - width: 111px; - height: 93px; -} - div.file { padding: 0; margin-top: 8px; margin-bottom: 4px; border: 1px solid #c0c0c0; @@ -576,25 +572,30 @@ float: none; margin-bottom: 12px !important; margin-top: 4px !important; } +div.tinymce_container { + position: relative; + margin: $default-margin 0; +} + div.essence_richtext_loader { position: absolute; top: 0; left: 0; z-index: 1; width: 100%; height: 100%; background-color: #F0E8D7; @include opacity(0.9); -} -div.essence_richtext_loader img { - position: absolute; - top: 46%; - left: 46%; + img { + position: absolute; + top: 46%; + left: 46%; + } } div.content_text_editor.text_short { margin-top: 0; margin-bottom: 0; @@ -657,23 +658,20 @@ } } &.validation_failed { - label { - color: #931f23; + label { color: $error_text_color } + input { @include field_with_error } + .tinymce_container { + outline: 1px solid $error_border_color; } - - input { - border: 1px solid #931f23; - background-color: #f9e8e9; - } } label { display: block; - margin-bottom: 0.5em; + margin-bottom: 2px; font-size: 10px; text-shadow: #fff5e1 1px 1px 0; line-height: 15px; text-indent: 1px; @@ -705,10 +703,12 @@ } } } } + &.essence_select label { margin-bottom: 4px } + &:hover label a.icon_button.small { @include inline-block; } input.text_with_icon.auto_resize.thin_border { @@ -795,16 +795,15 @@ } .element_errors { margin-top: 8px; margin-bottom: 8px; - background-color: #f1c9ca; + background-color: $error_background_color; padding: 2*$default-padding; list-style-type: none; @include rounded-corner; - color: #931f23; - border-style: solid; - border-width: 1px; + color: $error_text_color; + border: 1px solid $error_border_color; p { margin: 0; line-height: 24px; }