alchemy_cms 2.1.beta1 → 2.1.beta5

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

@@ -177,7 +177,7 @@ div.element_editor {
 }
 
 div.element_editor.not-draggable {
-	@include opacity-50;
+	@include opacity(50);
 }
 
 div.element_editor.dirty {
@@ -422,7 +422,7 @@ a.icon_button.linked {
 }
 
 .edit_images_bottom a.disabled {
-	@include opacity-50;
+	@include opacity(50);
 	cursor: default;
 }
 
@@ -473,7 +473,7 @@ div.essence_picture_editor:hover .picture_tool_delete {
 .picture_thumbnail div.missing_image {
 	height: 94px;
 	text-align: center;
-	line-height: 47px;
+	line-height: 28px;
 	color: #b3b3b3;
 }
 
@@ -605,12 +605,12 @@ div.essence_richtext_loader {
 	width: 100%;
 	height: 100%;
 	background-color: #ededed;
-	@include opacity-95;
+	@include opacity(75);
 }
 
 div.essence_richtext_loader img {
 	position: absolute;
-	top: 43%;
+	top: 46%;
 	left: 46%;
 }
 
@@ -621,7 +621,7 @@ div.content_text_editor.text_short {
 }
 
 div.content_editor input.thin_border {
-	width: 378px;
+	width: 97%;
 }
 
 input.long,
@@ -750,11 +750,18 @@ textarea {
 	font: 12px Tahoma, Arial, sans-serif;
 	padding: 4px;
 	margin: 0;
-	width: 362px;
+	width: 97%;
 	border-style: inset;
 	border-width: 1px;
 	@include rounded-corner;
-	height: 100px;
+	height: 140px;
+}
+
+textarea.tinymce {
+	padding: 0;
+	margin: 0;
+	width: 100%;
+	border: 0 none;
 }
 
 .text_short_float_left {

data/app/assets/stylesheets/alchemy/{jquery-ui.alchemy.css → jquery-ui.alchemy.css.scss}

@@ -1,7 +1,4 @@
-/* @override 
-	http://localhost:3000/stylesheets/alchemy/jquery-ui-1.8.7.alchemy.css
-	http://0.0.0.0:3000/stylesheets/alchemy/jquery-ui-1.8.7.alchemy.css
-*/
+@import "defaults";
 
 /*
  * jQuery UI CSS Framework 1.8.7
@@ -119,8 +116,8 @@
 ----------------------------------*/
 
 #alchemy .ui-widget {
-	font-family: Lucida Grande, Lucida Sans, Arial, sans-serif;
-	font-size: 12px;
+	font-family: $default-font-face;
+	font-size: $default-font-size;
 }
 
 #alchemy .ui-widget .ui-widget {
@@ -128,19 +125,19 @@
 }
 
 #alchemy .ui-widget-content {
-	border: 1px solid #afafaf;
-	background-color: #ededed;
-	color: #333333;
+	border: $default-border;
+	background-color: $light-gray;
+	color: $text-color;;
 }
 
 #alchemy .ui-widget-content a {
-	color: #333333;
+	color: $text-color;;
 }
 
 #alchemy .ui-widget-header {
 	border: 1px none #afafaf;
-	background: #c6dbe7;
-	color: #333333;
+	background: $light-blue;
+	color: $text-color;;
 	font-weight: bold;
 	-moz-border-radius-bottomleft:	0 !important;
 	-webkit-border-bottom-left-radius: 0 !important;
@@ -151,47 +148,47 @@
 }
 
 #alchemy .ui-widget-header a {
-	color: #333333;
+	color: $text-color;;
 }
 
 /* Interaction states
 ----------------------------------*/
 
 #alchemy .ui-state-default, #alchemy .ui-widget-content .ui-state-default, #alchemy .ui-widget-header .ui-state-default {
-	border: 1px solid #9a9a9a;
-	background: #ededed url('/assets/alchemy/shading.png') repeat-x 50% -67px;
+	border: 1px solid $button-border-color;
+	background: #ededed image-url('alchemy/shading.png') repeat-x 50% -67px;
 	font-weight: normal;
-	color: #333333;
-	text-shadow: #f2f2f2 1px 1px 0;
+	color: $text-color;;
+	text-shadow: $button-text-shadow;
 }
 
 #alchemy .ui-state-default a, #alchemy .ui-state-default a:link, #alchemy .ui-state-default a:visited {
-	color: #333333;
+	color: $text-color;;
 	text-decoration: none;
 }
 
 #alchemy .ui-state-hover, #alchemy .ui-widget-content .ui-state-hover, #alchemy .ui-widget-header .ui-state-hover, #alchemy .ui-state-focus, #alchemy .ui-widget-content .ui-state-focus, #alchemy .ui-widget-header .ui-state-focus, #alchemy .ui-dialog .ui-dialog-titlebar-refresh:hover, #alchemy .ui-dialog .ui-dialog-titlebar-refresh:focus
  {
-	border: 1px solid #888888;
-	background: #e6f0f5 url('/assets/alchemy/shading.png') repeat-x 50% -65px;
+	border: 1px solid $button-hover-border-color;
+	background: $button-hover-bg-color image-url('alchemy/shading.png') repeat-x 50% -65px;
 	font-weight: normal;
-	color: #333;
+	color: $text-color;;
 }
 
 #alchemy .ui-state-hover a, #alchemy .ui-state-hover a:hover {
-	color: #666666;
+	color: $dark-gray;
 	text-decoration: none;
 }
 
 #alchemy .ui-state-active, #alchemy .ui-widget-content .ui-state-active, #alchemy .ui-widget-header .ui-state-active {
-	color: #333333;
+	color: $text-color;;
 	text-decoration: none;
 	text-shadow: none;
 	background-color: #e5e5e5;
 }
 
 #alchemy .ui-state-active.stNav.stNext {
-	background-color: #ededed;
+	background-color: $light-gray;
 	margin: 0 -3px 0 0;
 	border: 0 solid #cacaca;
 	border-left-width: 1px;
@@ -199,7 +196,7 @@
 }
 
 #alchemy .ui-state-active.stNav.stPrev {
-	background-color: #ededed;
+	background-color: $light-gray;
 	margin: 0 0 0 -3px;
 	border: 0 solid #cacaca;
 	border-top-width: 1px;
@@ -214,7 +211,7 @@
 }
 
 #alchemy .ui-state-active a, #alchemy .ui-state-active a:link, #alchemy .ui-state-active a:visited {
-	color: #333333;
+	color: $text-color;;
 	text-decoration: none;
 }
 
@@ -227,7 +224,7 @@
 
 #alchemy .ui-state-highlight, #alchemy .ui-widget-content .ui-state-highlight, #alchemy .ui-widget-header .ui-state-highlight {
 	border: 1px solid #f9dd34;
-	background: #ffef8f url('/assets/alchemy/ui-bg_highlight-soft_25_ffef8f_1x100.png') 50% top repeat-x;
+	background: #ffef8f image-url('alchemy/ui-bg_highlight-soft_25_ffef8f_1x100.png') 50% top repeat-x;
 	color: #363636;
 }
 
@@ -237,7 +234,7 @@
 
 #alchemy .ui-state-error, #alchemy .ui-widget-content .ui-state-error, #alchemy .ui-widget-header .ui-state-error {
 	border: 1px solid #cd0a0a;
-	background: #cd0a0a url('/assets/alchemy/ui-bg_flat_15_cd0a0a_40x100.png') 50% 50% repeat-x;
+	background: #cd0a0a image-url('alchemy/ui-bg_flat_15_cd0a0a_40x100.png') 50% 50% repeat-x;
 	color: #ffffff;
 }
 
@@ -273,35 +270,35 @@
 #alchemy .ui-icon {
 	width: 16px;
 	height: 16px;
-	background-image: url('/assets/alchemy/ui-icons_666666_256x240.png');
+	background-image: image-url('alchemy/ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-widget-content .ui-icon {
-	background-image: url('/assets/alchemy/ui-icons_666666_256x240.png');
+	background-image: image-url('alchemy/ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-widget-header .ui-icon {
-	background-image: url('/assets/alchemy/ui-icons_666666_256x240.png');
+	background-image: image-url('alchemy/ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-default .ui-icon {
-	background-image: url('/assets/alchemy/ui-icons_666666_256x240.png');
+	background-image: image-url('alchemy/ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-hover .ui-icon, #alchemy .ui-state-focus .ui-icon {
-	background-image: url('/assets/alchemy/ui-icons_666666_256x240.png');
+	background-image: image-url('alchemy/ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-active .ui-icon {
-	background-image: url('/assets/alchemy/ui-icons_666666_256x240.png');
+	background-image: image-url('alchemy/ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-highlight .ui-icon {
-	background-image: url('/assets/alchemy/ui-icons_2e83ff_256x240.png');
+	background-image: image-url('alchemy/ui-icons_2e83ff_256x240.png');
 }
 
 #alchemy .ui-state-error .ui-icon, #alchemy .ui-state-error-text .ui-icon {
-	background-image: url('/assets/alchemy/ui-icons_ffffff_256x240.png');
+	background-image: image-url('alchemy/ui-icons_ffffff_256x240.png');
 }
 
 /* positioning */
@@ -1085,7 +1082,7 @@
 #alchemy .ui-widget-shadow {
 	margin: -8px 0 0 -8px;
 	padding: 8px;
-	background: #000000 url('/assets/alchemy/ui-bg_flat_70_000000_40x100.png') 50% 50% repeat-x;
+	background: #000000 image-url('alchemy/ui-bg_flat_70_000000_40x100.png') 50% 50% repeat-x;
 	opacity: .30;
 	filter: Alpha(Opacity=30);
 	-moz-border-radius: 3px;
@@ -1472,7 +1469,7 @@ button.ui-button::-moz-focus-inner {
 }
 
 #alchemy .ui-dialog .ui-dialog-titlebar {
-	padding: 6px 8px;
+	padding: 8px 12px;
 	position: relative;
 	margin-bottom: 0;
 }
@@ -1484,7 +1481,7 @@ button.ui-button::-moz-focus-inner {
 
 #alchemy .ui-dialog .ui-dialog-titlebar-close {
 	position: absolute;
-	right: .3em;
+	right: 2*$default-padding;
 	top: 50%;
 	width: 19px;
 	margin: -10px 0 0 0;
@@ -1494,7 +1491,7 @@ button.ui-button::-moz-focus-inner {
 
 #alchemy .ui-dialog .ui-dialog-titlebar-refresh {
 	position: absolute;
-	right: 46px;
+	right: 50px;
 	top: 50%;
 	width: 19px;
 	margin: -10px 0 0 0;
@@ -1504,7 +1501,7 @@ button.ui-button::-moz-focus-inner {
 
 #alchemy .ui-dialog .ui-dialog-titlebar-maximize,
 #alchemy .ui-dialog .ui-dialog-titlebar-restore {
-	margin-right: 8px;
+	margin-right: 12px;
 }
 
 #alchemy .ui-dialog .ui-dialog-titlebar-close span {
@@ -1530,8 +1527,7 @@ button.ui-button::-moz-focus-inner {
 }
 
 #alchemy .ui-dialog .ui-dialog-content form {
-	padding: 8px;
-	overflow: auto;
+	padding: 12px;
 }
 
 #alchemy .ui-dialog .ui-dialog-buttonpane {
@@ -1663,7 +1659,7 @@ button.ui-button::-moz-focus-inner {
 
 #alchemy .ui-tabs .ui-tabs-nav {
 	padding: 4px 8px 0;
-	background: #e5e5e5 url('/assets/alchemy/shading.png') 0 -59px;
+	background: #e5e5e5 image-url('alchemy/shading.png') 0 -59px;
 	-webkit-border-radius: 0;
 	-moz-border-radius: 0;
 	border-radius: 0;
@@ -1691,7 +1687,7 @@ button.ui-button::-moz-focus-inner {
 #alchemy .ui-tabs .ui-tabs-nav li.ui-tabs-selected {
 	margin-bottom: 0;
 	padding-bottom: 1px;
-	background: #EDEDED;
+	background: $light-gray;
 	height: 25px;
 }
 

data/app/assets/stylesheets/alchemy/jquery.sb.css.scss

@@ -16,7 +16,7 @@
 }
 
 #alchemy .selectbox.full_width .display.full_width {
-	width: 340px;
+	width: 402px;
 }
 
 #alchemy .selectbox .display {
@@ -43,15 +43,15 @@
 }
 
 #alchemy .selectbox .display.long {
-	width: 100px;
+	width: 190px;
 }
 
 #alchemy .selectbox .display.short {
-
+	width: 60px;
 }
 
 #alchemy .selectbox .display.medium {
-
+	width: 100px;
 }
 
 #alchemy .selectbox.disabled .display {
@@ -141,22 +141,26 @@
 	font-size: 11px;
 }
 
-#alchemy .items.long {
+#alchemy .items.short {
+	width: 88px;
+}
+
+#alchemy .items.medium {
 	width: 128px;
 }
 
+#alchemy .items.long {
+	width: 218px;
+}
+
 #alchemy .items.full_width {
-	width: 386px;
+	width: 431px;
 }
 
 #new_page_form tbody tr td.second_row div.selectbox .display{
 	width: 100px;
 }
 
-#alchemy .items.very_long {
-	min-width: 191px;
-}
-
 #alchemy .items.above {
 	
 }

data/app/assets/stylesheets/alchemy/{tinymce_content.css → tinymce_content.css.scss}

@@ -1,8 +1,9 @@
+@import "defaults";
+
 body, td, pre {
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 12px;
-	margin: 4px;
+	color: $text-color;
+	font: $default-font-style;
+	margin: $default-margin;
 }
 
 body {
@@ -47,13 +48,13 @@ a.mceItemAnchor {
 	line-height: 6px;
 	overflow: hidden;
 	padding-left: 12px;
-	background: url(../default/img/items.gif) no-repeat bottom left;
+	background: image-url('tiny_mce/themes/advanced/skins/default/img/items.gif') no-repeat bottom left;
 }
 
 img.mceItemAnchor {
 	width: 12px;
 	height: 12px;
-	background: url(../default/img/items.gif) no-repeat;
+	background: image-url('tiny_mce/themes/advanced/skins/default/img/items.gif') no-repeat;
 }
 
 img {

data/app/assets/stylesheets/alchemy/{tinymce_dialog.css → tinymce_dialog.css.scss}

@@ -1,4 +1,4 @@
-/* @override http://0.0.0.0:3000/stylesheets/alchemy/alchemy_tinymce_dialog.css */
+@import "defaults";
 
 /* Generic */
 
@@ -96,7 +96,7 @@ input.checkbox {
 	padding-right: 8px;
 	padding-bottom: 2px;	
 	margin: 0;
-	background: #eaeaea url('/assets/alchemy/shading.png') repeat-x 0 -75px;
+	background: #eaeaea image-url('alchemy/shading.png') repeat-x 0 -75px;
 	-webkit-border-radius: 2px;
 	-moz-border-radius: 2px;
 	border-radius: 2px;
@@ -115,7 +115,7 @@ a.browse span {
 	display: block;
 	width: 20px;
 	height: 18px;
-	background: url(../../img/icons.gif) -860px 0;
+	background: image-url('tiny_mce/themes/advanced/img/icons.gif') -860px 0;
 	border: 1px solid #FFF;
 	margin-left: 1px;
 }
@@ -146,7 +146,7 @@ a.pickcolor span {
 	display: block;
 	width: 20px;
 	height: 16px;
-	background: url(../../img/icons.gif) -840px 0;
+	background: image-url('tiny_mce/themes/advanced/img/icons.gif') -840px 0;
 	margin-left: 2px;
 }
 
@@ -234,7 +234,7 @@ td.charmap, #charmap a {
 
 .tabs li {
 	float: left;
-	background: url('/assets/alchemy/shading.png') repeat-x 0 0;
+	background: image-url('alchemy/shading.png') repeat-x 0 0;
 	margin: 0 2px 0 0;
 	padding: 0 0 0 10px;
 	line-height: 17px;
@@ -253,12 +253,12 @@ td.charmap, #charmap a {
 .tabs span {
 	float: left;
 	display: block;
-	background: url(../default/img/tabs.gif) no-repeat right -36px;
+	background: image-url('tiny_mce/themes/advanced/skins/default/img/tabs.gif') no-repeat right -36px;
 	padding: 0px 10px 0 0;
 }
 
 .tabs .current span {
-	background: url(../default/img/tabs.gif) no-repeat right -54px;
+	background: image-url('tiny_mce/themes/advanced/skins/default/img/tabs.gif') no-repeat right -54px;
 }
 
 .tabs a {