alchemy_cms 2.2.4 → 2.3.rc5

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

@@ -43,7 +43,7 @@
 }
 
 #alchemy .ui-helper-clearfix {
-  display: inline-block;
+  @include inline-block;
 }
 
 /* required comment for clearfix to work in Opera \*/
@@ -127,21 +127,17 @@
 #alchemy .ui-widget-content {
   border: $default-border;
   background-color: $light-gray;
-  color: $text-color;;
+  color: $text-color;
 }
 
 #alchemy .ui-widget-content a {
-  color: $text-color;;
-}
-
-#alchemy .ui-widget-content p {
-  overflow: hidden;
+  color: $text-color;
 }
 
 #alchemy .ui-widget-header {
   border: 1px none #afafaf;
   background: $light-blue;
-  color: $text-color;;
+  color: $text-color;
   font-weight: bold;
   -moz-border-radius-bottomleft: 0 !important;
   -webkit-border-bottom-left-radius: 0 !important;
@@ -152,7 +148,7 @@
 }
 
 #alchemy .ui-widget-header a {
-  color: $text-color;;
+  color: $text-color;
 }
 
 /* Interaction states
@@ -160,22 +156,24 @@
 
 #alchemy .ui-state-default, #alchemy .ui-widget-content .ui-state-default, #alchemy .ui-widget-header .ui-state-default {
   border: 1px solid $button-border-color;
-  background: #ededed image-url('alchemy/shading.png') repeat-x 50% -67px;
+  background-color: #ededed;
   font-weight: normal;
-  color: $text-color;;
+  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: $text-color;;
+  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 $button-hover-border-color;
-  background: $button-hover-bg-color image-url('alchemy/shading.png') repeat-x 50% -65px;
-  font-weight: normal;
-  color: $text-color;;
+.ui-dialog-titlebar-refresh, .ui-dialog-titlebar-close, .ui-dialog-titlebar-maximize, .ui-dialog-titlebar-restore {
+  &:hover, &:focus {
+    border: 1px solid $button-hover-border-color;
+    background: $button-hover-bg-color;
+    font-weight: normal;
+    color: $text-color;
+  }
 }
 
 #alchemy .ui-state-hover a, #alchemy .ui-state-hover a:hover {
@@ -184,7 +182,7 @@
 }
 
 #alchemy .ui-state-active, #alchemy .ui-widget-content .ui-state-active, #alchemy .ui-widget-header .ui-state-active {
-  color: $text-color;;
+  color: $text-color;
   text-decoration: none;
   text-shadow: none;
   background-color: $button-hover-bg-color;
@@ -214,7 +212,7 @@
 }
 
 #alchemy .ui-state-active a, #alchemy .ui-state-active a:link, #alchemy .ui-state-active a:visited {
-  color: $text-color;;
+  color: $text-color;
   text-decoration: none;
 }
 
@@ -251,17 +249,14 @@
 
 #alchemy .ui-priority-primary, #alchemy .ui-widget-content .ui-priority-primary, #alchemy .ui-widget-header .ui-priority-primary {
   font-weight: normal;
-  background-position: 50% -73px;
 }
 
 #alchemy .ui-priority-secondary, #alchemy .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary {
   font-weight: normal;
-  background-position: 50% -73px;
 }
 
 #alchemy .ui-state-disabled, #alchemy .ui-widget-content .ui-state-disabled, #alchemy .ui-widget-header .ui-state-disabled {
-  opacity: .35;
-  filter: Alpha(Opacity = 35);
+  @include opacity(.35);
   background-image: none;
 }
 
@@ -273,35 +268,35 @@
 #alchemy .ui-icon {
   width: 16px;
   height: 16px;
-  background-image: image-url('alchemy/ui-icons_666666_256x240.png');
+  background-image: url('ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-widget-content .ui-icon {
-  background-image: image-url('alchemy/ui-icons_666666_256x240.png');
+  background-image: url('ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-widget-header .ui-icon {
-  background-image: image-url('alchemy/ui-icons_666666_256x240.png');
+  background-image: url('ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-default .ui-icon {
-  background-image: image-url('alchemy/ui-icons_666666_256x240.png');
+  background-image: url('ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-hover .ui-icon, #alchemy .ui-state-focus .ui-icon {
-  background-image: image-url('alchemy/ui-icons_666666_256x240.png');
+  background-image: url('ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-active .ui-icon {
-  background-image: image-url('alchemy/ui-icons_666666_256x240.png');
+  background-image: url('ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-highlight .ui-icon {
-  background-image: image-url('alchemy/ui-icons_666666_256x240.png');
+  background-image: url('ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-error .ui-icon, #alchemy .ui-state-error-text .ui-icon {
-  background-image: image-url('alchemy/ui-icons_666666_256x240.png');
+  background-image: url('ui-icons_666666_256x240.png');
 }
 
 /* positioning */
@@ -1085,12 +1080,9 @@
 #alchemy .ui-widget-shadow {
   margin: -8px 0 0 -8px;
   padding: 8px;
-  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;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
+  background: #000000 50% 50% repeat-x;
+  @include opacity(0.3);
+  @include border-radius($default-border-radius);
 }
 
 /*
@@ -1340,16 +1332,19 @@
  * http://docs.jquery.com/UI/Button#theming
  */
 
-#alchemy .ui-button {
-  display: inline-block;
+#alchemy button.ui-button {
+  @include default-button-style;
+  @include inline-block;
   position: relative;
   margin-right: .1em;
   text-decoration: none !important;
   cursor: pointer;
   text-align: center;
-  zoom: 1;
   overflow: visible;
-  padding: 0;
+
+  &.ui-state-focus {
+    @include default-focus-style;
+  }
 }
 
 /* the overflow property removes extra width in IE */
@@ -1378,12 +1373,10 @@ button.ui-button-icons-only {
 
 #alchemy .ui-button .ui-button-text {
   display: block;
-  line-height: 1.5;
-  font-size: 11px;
 }
 
 #alchemy .ui-button-text-only .ui-button-text {
-  padding: 4px 16px;
+  padding: 0;
 }
 
 #alchemy .ui-button-icon-only .ui-button-text, #alchemy .ui-button-icons-only .ui-button-text {
@@ -1663,10 +1656,9 @@ button.ui-button::-moz-focus-inner {
 
 #alchemy .ui-tabs .ui-tabs-nav {
   padding: 4px 8px 0;
-  background: #e5e5e5 image-url('alchemy/shading.png') 0 -59px;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
+  background: transparent;
+  @include border-radius(0);
+  border-bottom: $default-border;
   margin: 0;
 }
 
@@ -1677,9 +1669,11 @@ button.ui-button::-moz-focus-inner {
   top: 1px;
   margin: 0 .2em 1px 0;
   border-bottom: 0 !important;
+  @include border-bottom-radius(0);
   padding: 0;
   white-space: nowrap;
   background-color: #e5e5e5;
+  font-weight: normal;
 }
 
 #alchemy .ui-tabs .ui-tabs-nav li a {
@@ -1692,11 +1686,10 @@ button.ui-button::-moz-focus-inner {
   margin-bottom: 0;
   padding-bottom: 1px;
   background: $light-gray;
-  height: 25px;
 }
 
 #alchemy .ui-tabs .ui-tabs-nav li.ui-tabs-selected a, #alchemy .ui-tabs .ui-tabs-nav li.ui-state-disabled a, #alchemy .ui-tabs .ui-tabs-nav li.ui-state-processing a {
-  cursor: text;
+  cursor: default;
 }
 
 #alchemy .ui-tabs .ui-tabs-nav li a, #alchemy .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a {
@@ -1722,6 +1715,11 @@ button.ui-button::-moz-focus-inner {
   padding: 0 !important;
 }
 
+#alchemy .ui-tabs .ui-tabs-nav .ui-tabs-paging-prev,
+#alchemy .ui-tabs .ui-tabs-nav .ui-tabs-paging-next {
+  height: 26px;
+}
+
 #alchemy .ui-tabs .ui-tabs-nav .ui-tabs-paging-prev a,
 #alchemy .ui-tabs .ui-tabs-nav .ui-tabs-paging-next a {
   display: block;

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

@@ -8,7 +8,7 @@
 .jcrop-vline, .jcrop-hline {
   font-size: 0px;
   position: absolute;
-  background: white image-url('alchemy/Jcrop.gif') top left repeat;
+  background: white url('Jcrop.gif') top left repeat;
 }
 
 .jcrop-vline {

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

@@ -27,10 +27,6 @@ div.login_signup_box {
   background-color: $medium-gray;
   @include rounded-corner;
   margin: 2em auto;
-
-  select {
-    width: 220px;
-  }
 }
 
 html.no-js {
@@ -42,7 +38,7 @@ html.no-js {
 #login_box {
   height: 310px;
   width: 394px;
-  margin-top: -230px;
+  margin-top: -200px;
   margin-left: -197px;
   position: absolute;
   top: 50%;

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

@@ -1,6 +1,6 @@
 /*
-*= require_self
-*/
+ *= require_self
+ */
 
 @import "alchemy/defaults";
 
@@ -30,7 +30,7 @@
   border-#{$side}-radius: $radius;
 }
 
-@mixin box-shadow {
+@mixin drop-shadow {
   $shadow: 0px 0px 4px $dark-gray;
   -webkit-box-shadow: $shadow;
   -moz-box-shadow: $shadow;
@@ -48,21 +48,22 @@
 #alchemy_menubar {
   position: fixed;
   top: 0;
-  left: -319px;
-  width: 312px;
+  left: -353px;
+  width: 346px;
   z-index: 10000;
   background: $light-gray;
   @include transition;
   @include bounce;
   @include bottom-right-rounded-border;
-  @include box-shadow;
+  @include drop-shadow;
   @include box-sizing;
   border-right: $default-border;
   border-bottom: $default-border;
-  line-height: 8 * $default-padding;
-  height: 8 * $default-padding;
+  height: 8 * $default-padding + 2px;
   padding: 4px 40px 4px 8px;
   overflow: hidden;
+  font: $default-font-style;
+  line-height: 8 * $default-padding;
 
   * {
     @include box-sizing;
@@ -79,40 +80,29 @@
     height: 24px;
     position: absolute;
     right: 10px;
-    top: 8px;
-    background: image-url('alchemy/icons.png') -240px 0;
+    top: 9px;
+    background: url('icons.png') -240px 0;
   }
 
   ul {
     padding: 0;
     margin: 0;
-    height: 32px;
+    height: auto;
 
     li {
-      height: 32px;
+      height: auto;
       margin: 0 $default-padding 0 0;
-      padding: 5px 0 0 0;
-      display: inline;
-      display: inline-block;
+      padding: 0;
+      @include inline-block;
       list-style-type: none;
 
       a {
-        @include button-styles;
-        display: block;
-        line-height: 16px;
-        text-align: center;
-        padding: 2px 4px;
-        width: 90px;
-        text-decoration: none;
-        outline: none;
-        white-space: nowrap;
+        @include default-button-style;
+        font-weight: normal;
+        line-height: 34px;
 
         &:hover {
-          @include button-hover-styles;
-        }
-
-        &:active {
-          outline: none;
+          text-decoration: none !important;
         }
       }
     }

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

@@ -10,7 +10,7 @@ div.pagination {
   margin-top: 4*$default-padding;
 
   a, span, em {
-    font-size: 12px;
+    font-size: $default-font-size;
     height: 25px;
     line-height: 25px;
     padding: $default-padding;
@@ -23,12 +23,12 @@ div.pagination {
   }
 
   .current {
-    @include button-styles;
     background: $button-hover-bg-color;
     color: $text-color;
-    border: 1px solid #888;
+    border: $default-border;
     text-shadow: 0px 1px 1px #fff;
     cursor: default;
+    @include rounded-corner;
   }
 
   .previous_page {
@@ -52,5 +52,4 @@ div.pagination {
 
 #assign_image_list div.pagination {
   margin-bottom: 8px;
-  text-align: center;
 }

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

@@ -16,7 +16,7 @@ div#sort_panel {
   }
 
   div.buttons {
-    margin: 0 0 8px 104px;
+    margin-left: 104px;
   }
 }
 
@@ -26,10 +26,28 @@ div#sort_panel {
   display: block;
   padding-left: 4px;
   text-decoration: none;
+
+  &.inactive {
+    color: #656565;
+  }
+
+  &.odd {
+    background-color: #fff;
+  }
 }
 
-.sitemap_pagename_link.inactive {
-  color: #656565;
+a.sitemap_pagename_link:hover {
+  text-decoration: underline;
+
+  &:after {
+    content: '';
+    width: 16px;
+    height: 16px;
+    float: left;
+    margin-right: 4px;
+    background: url('icons.png') -160px -168px;
+    margin-top: 4px;
+  }
 }
 
 .redirect_url {
@@ -47,28 +65,10 @@ div#sort_panel {
   overflow: hidden;
 }
 
-.sitemap_pagename_link.odd {
-  background-color: #fff;
-}
-
-a.sitemap_pagename_link:hover {
-  text-decoration: underline;
-}
-
 div#page_selector_container a.sitemap_pagename_link:hover {
   text-decoration: none;
 }
 
-a.sitemap_pagename_link:hover:after {
-  content: '';
-  width: 16px;
-  height: 16px;
-  float: left;
-  margin-right: 4px;
-  background: image-url('alchemy/icons.png') -160px -168px;
-  margin-top: 4px;
-}
-
 div#page_selector_container a.sitemap_pagename_link:hover:after {
   display: none;
 }
@@ -107,6 +107,31 @@ div.sitemap_right_tools {
   padding-left: 16px;
   float: right;
   width: 100px;
+
+  a {
+    float: left;
+    width: 21px;
+    height: 21px;
+    text-align: center;
+
+    .icon {
+      vertical-align: middle;
+    }
+  }
+
+  .icon.blank {
+    margin-left: 2px;
+    float: left;
+    margin-top: 3px;
+    margin-right: 3px;
+  }
+}
+
+.sitemap_sitetools {
+  padding: 0;
+  float: left;
+  width: 70px;
+  margin-left: 8px;
 }
 
 div#page_selector_container div.sitemap_right_tools {
@@ -121,7 +146,7 @@ ul#sitemap {
       margin-right: 52px;
 
       span.page_move {
-        display: inline-block;
+        @include inline-block;
         width: 74px;
         text-align: center;
       }
@@ -129,7 +154,7 @@ ul#sitemap {
   }
 
   a.page_folder {
-    background-image: image-url('alchemy/gui/toggle.png');
+    background-image: url('gui/toggle.png');
     background-repeat: no-repeat;
     height: 9px;
     width: 9px;
@@ -150,7 +175,6 @@ ul#sitemap {
   ul {
     margin: 0;
     padding: 0;
-    display: block;
   }
 
   li {
@@ -197,54 +221,55 @@ div.page_infos {
   width: 66px;
 }
 
-.page_status {
-  width: 16px;
-  height: 16px;
-  background-repeat: no-repeat;
-  float: left;
-  margin: 2px 2px 0 4px;
-}
-
 #sub_navigation span.page_status_and_name span.page_status {
   float: none;
-  display: inline-block;
+  @include inline-block;
   position: relative;
-  top: 1px;
+  top: -4px;
   margin-left: 2px;
 }
 
-span.page_status.restricted {
-  background: image-url('alchemy/icons.png') -258px -39px;
-}
+span.page_status {
+  width: 16px;
+  height: 16px;
+  background-image: url('icons.png');
+  background-repeat: no-repeat;
+  float: left;
+  margin: 2px 2px 0 4px;
 
-span.page_status.not_restricted {
-  background: image-url('alchemy/icons.png') -290px -39px;
-  @include opacity(30);
-}
+  &.restricted {
+    background:  -258px -39px;
+  }
 
-span.page_status.visible {
-  background: image-url('alchemy/icons.png') -128px -39px;
-}
+  &.not_restricted {
+    background-position: -290px -39px;
+    @include opacity(0.3);
+  }
 
-span.page_status.not_visible {
-  background: image-url('alchemy/icons.png') -160px -39px;
-  @include opacity(30);
-}
+  &.visible {
+    background-position: -128px -39px;
+  }
 
-span.page_status.public {
-  background: image-url('alchemy/icons.png') -192px -39px;
-}
+  &.not_visible {
+    background-position: -160px -39px;
+    @include opacity(0.3);
+  }
+
+  &.public {
+    background-position: -192px -39px;
+  }
 
-span.page_status.not_public {
-  background: image-url('alchemy/icons.png') -224px -39px;
-  @include opacity(30);
+  &.not_public {
+    background-position: -224px -39px;
+    @include opacity(0.3);
+  }
 }
 
 .site_status {
   float: left;
   width: 16px;
   height: 16px;
-  background: image-url('alchemy/icons.png') no-repeat 0 -40px;
+  background: url('icons.png') no-repeat 0 -40px;
 }
 
 .locked .site_status {
@@ -253,7 +278,7 @@ span.page_status.not_public {
 
 #sub_navigation span.page_status_and_name span.site_status {
   float: none;
-  display: inline-block;
+  @include inline-block;
   margin-right: 4px;
   margin-left: 0;
   margin-bottom: 0;
@@ -280,31 +305,6 @@ a.folder_link {
   outline: none;
 }
 
-.sitemap_sitetools {
-  padding: 0;
-  float: left;
-  width: 70px;
-  margin-left: 8px;
-}
-
-.sitemap_right_tools a {
-  float: left;
-  width: 21px;
-  height: 21px;
-}
-
-.sitemap_sitetools .icon.blank {
-  margin-left: 2px;
-  float: left;
-  margin-top: 3px;
-  margin-right: 3px;
-}
-
-.sitemap_right_tools span.icon {
-  margin-top: 3px;
-  margin-left: 2px;
-}
-
 #create_language_tree_form {
   width: 360px;