alchemy_cms 2.2.4 → 2.3.rc5

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

@@ -1,35 +1,5 @@
 @import "alchemy/defaults";
 
-html {
-  height: 100%;
-}
-
-noscript {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 1000;
-  width: 100%;
-  text-align: center;
-  line-height: 1em;
-  border-bottom: 1px solid #c4c19c;
-  color: #726d23;
-  background-color: #f3f0c1;
-  h1, p {
-    margin: 16px 0;
-  }
-}
-
-body#alchemy {
-  margin: 0;
-  padding: 0;
-  color: $text-color;
-  font: $default-font-style;
-  background-color: $light-gray;
-  height: 100%;
-  cursor: default;
-}
-
 #top_menu {
   position: fixed;
   top: 0;
@@ -105,7 +75,7 @@ body#alchemy {
       border-style: none;
       height: 24px;
       width: 24px;
-      display: inline-block;
+      @include inline-block;
       margin-bottom: 4px;
       margin-top: 2px;
     }
@@ -181,12 +151,16 @@ div#user_info {
   line-height: 27px;
   font-size: 11px;
   right: 10px;
-  top: 0;
+  top: -3px;
+
+  .selectboxit-container {
+    margin-right: 2 * $default-margin;
+  }
 }
 
 #sub_navigation {
   height: 22px;
-  line-height: 23px;
+  line-height: 21px;
   padding-left: 5px;
   background: $light-blue;
   border-bottom: $default-border;
@@ -195,7 +169,7 @@ div#user_info {
   position: relative;
 
   a {
-    display: block;
+    @include inline-block;
 
     &:hover {
       text-decoration: none;
@@ -219,7 +193,7 @@ div#user_info {
     .page_language {
       float: none;
       position: relative;
-      display: inline-block;
+      @include inline-block;
       bottom: 2px;
       border: 1px solid #f0c8d1;
       background-color: #f0c8d1;
@@ -242,7 +216,7 @@ div#user_info {
   div.subnavi_tab {
     float: left;
     padding: 0px 8px;
-    height: 21px;
+    line-height: 19px;
     text-shadow: #fff 0 0px 4px;
     background: #d6e0e6;
     color: #444;
@@ -257,9 +231,9 @@ div#user_info {
 
       form {
         position: absolute;
-        right: 3px;
-        top: 3px;
-        line-height: 10px;
+        right: $default-padding;
+        top: $default-padding;
+        line-height: 1;
       }
     }
 

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

@@ -1,306 +1,295 @@
 @import "alchemy/defaults";
 
 .icon {
-  display: inline-block;
-  background: image-url('alchemy/icons.png') no-repeat;
+  @include inline-block;
+  background: url('icons.png') no-repeat;
   width: 16px;
   height: 16px;
-}
-
-.icon.zoom-out {
-  background-position: -416px -72px;
-}
 
-.icon.zoom-equal {
-  background-position: -448px -72px;
-}
+  &.add {
+    background-image: url('ui-icons_666666_256x240.png');
+    background-position: -16px -129px;
+  }
 
-.icon.delete-small {
-  background-position: -1px -72px;
-}
+  &.add_page {
+    background-position: -96px -40px;
+  }
 
-.icon_button.small {
-  .icon.delete-small {
-    background-position: -4px -76px;
+  &.archive {
+    background-position: -416px -136px;
   }
-}
 
-.icon.zoom-in {
-  background-position: -480px -72px;
-}
+  &.audio {
+    background-position: -192px -136px;
+  }
 
-.icon.user_add {
-  background-position: -96px -104px;
-}
+  &.blank {
+    background: transparent;
+  }
 
-.icon.language_add {
-  background-position: -47px -120px;
-}
+  &.clipboard {
+    background-position: -288px -104px;
 
-.icon.user {
-  background-position: 0 -104px;
-}
+    &.full {
+      background-position: -320px -104px;
+    }
+  }
 
-.icon.language {
-  background-position: 0 -120px;
-}
+  &.close {
+    background-position: -416px -40px;
 
-.icon.user.female {
-  background-position: -128px -104px;
-}
+    &.small {
+      background: url('ui-icons_666666_256x240.png') -84px -132px;
+      width: 8px;
+      height: 8px;
+    }
+  }
 
-.icon.user_edit {
-  background-position: -64px -104px;
-}
+  &.configure_page {
+    background-position: -320px -40px;
+  }
 
-.icon.language_edit {
-  background-position: -32px -120px;
-}
+  &.copy_page {
+    background-position: -544px -40px;
+  }
 
-.icon.user_edit.female {
-  background-position: -192px -104px;
-}
+  &.create {
+    background-position: -192px -168px;
+  }
 
-.icon.settings {
-  background-position: -320px -40px;
-}
+  &.crop {
+    background-position: -256px -72px;
+  }
 
-.icon.visit_page {
-  background-position: -31px -137px;
-}
+  &.delete_page {
+    background-position: -64px -40px;
+  }
 
-.icon.upload {
-  background-position: 0 -136px;
-}
+  &.delete-small {
+    background-position: -1px -72px;
+  }
 
-.icon.pdf {
-  background-position: -161px -136px;
-}
+  &.destroy {
+    background-position: -224px -168px;
+  }
 
-.icon.text {
-  background-position: -448px -136px;
-}
+  &.edit {
+    background-position: -160px -168px;
+  }
 
-.icon.archive {
-  background-position: -416px -136px;
-}
+  &.element_draft {
+    background-position: 1px -70px;
+  }
 
-.icon.audio {
-  background-position: -192px -136px;
-}
+  &.element_public {
+    background-position: -94px -166px;
+  }
 
-.icon.image {
-  background-position: -224px -136px;
-}
+  &.element_window {
+    background-position: -512px -72px;
+  }
 
-.icon.vcard {
-  background-position: -416px -104px;
-}
+  &.error {
+    background-position: -32px -168px;
+  }
 
-.icon.psd {
-  background-position: -128px -136px;
-}
+  &.excel {
+    background-position: -176px -72px;
+  }
 
-.icon.flash {
-  background-position: -256px -136px;
-}
+  &.false {
+    background-image: none;
+  }
 
-.icon.video {
-  background-position: -288px -136px;
-}
+  &.file {
+    background-position: 0 -40px;
+  }
 
-.icon.rtf {
-  background-position: -320px -136px;
-}
+  &.file_delete {
+    background-position: -64px -40px;
+  }
 
-.icon.word {
-  background-position: -384px -136px;
-}
+  &.file_download, &.download {
+    background-position: -480px -136px;
+  }
 
-.icon.excel {
-  background-position: -176px -72px;
-}
+  &.file_edit {
+    background-position: -32px -40px;
+  }
 
-.icon.file {
-  background-position: 0 -40px;
-}
+  &.flash {
+    background-position: -256px -136px;
+  }
 
-.icon.flush {
-  background-position: -352px -39px;
-}
+  &.flush {
+    background-position: -352px -39px;
+  }
 
-.icon.publish {
-  background-position: -64px -136px;
-}
+  &.image {
+    background-position: -224px -136px;
+  }
 
-.icon.info {
-  background-position: -64px -168px;
-}
+  &.info {
+    background-position: -64px -168px;
+  }
 
-.icon.close {
-  background-position: -416px -40px;
-}
+  &.language {
+    background-position: 0 -120px;
+  }
 
-.icon.sync {
-  background-position: -96px -136px;
-}
+  &.language_add {
+    background-position: -47px -120px;
+  }
 
-.icon.close.small {
-  background: image-url('alchemy/ui-icons_666666_256x240.png') -84px -132px;
-  width: 8px;
-  height: 8px;
-}
+  &.language_delete {
+    background-position: -16px -120px;
+  }
 
-.icon.online {
-  background-position: -224px -104px;
-}
+  &.language_edit {
+    background-position: -32px -120px;
+  }
 
-.icon.offline {
-  background-position: -255px -104px;
-}
+  &.link {
+    background-position: -320px -72px;
+  }
 
-.icon.tick, .icon.true {
-  background-position: -32px -72px;
-}
+  &.new_element {
+    background-position: -384px -40px;
+  }
 
-.icon.error {
-  background-position: -32px -168px;
-}
+  &.offline {
+    background-position: -255px -104px;
+  }
 
-.icon.false {
-  background-image: none;
-}
+  &.online {
+    background-position: -224px -104px;
+  }
 
-.icon.link, a.link {
-  background-position: -320px -72px;
-}
+  &.pdf {
+    background-position: -161px -136px;
+  }
 
-.icon.unlink {
-  background-position: -352px -72px;
-}
+  &.preview_window {
+    background-position: -448px -40px;
+  }
 
-.icon.swap_picture {
-  background-position: -288px -72px;
-}
+  &.psd {
+    background-position: -128px -136px;
+  }
 
-.icon.crop {
-  background-position: -256px -72px;
-}
+  &.publish {
+    background-position: -64px -136px;
+  }
 
-.icon.warning, .icon.warn {
-  background-position: 0 -168px;
-}
+  &.rtf {
+    background-position: -320px -136px;
+  }
 
-.icon.element_public {
-  background-position: -94px -166px;
-}
+  &.search {
+    background: url('ui-icons_666666_256x240.png') -160px -112px;
+  }
 
-.icon.element_draft {
-  background-position: 1px -70px;
-}
+  &.select_all {
+    background-position: -256px -168px;
+  }
 
-.icon.new_element {
-  background-position: -384px -40px;
-}
+  &.settings {
+    background-position: -320px -40px;
+  }
 
-.icon.element_window {
-  background-position: -512px -72px;
-}
+  &.sort {
+    background-position: -128px -168px;
+  }
 
-.icon.preview_window {
-  background-position: -448px -40px;
-}
+  &.swap_picture {
+    background-position: -288px -72px;
+  }
 
-.icon.clipboard {
-  background-position: -288px -104px;
-}
+  &.sync {
+    background-position: -96px -136px;
+  }
 
-.icon.clipboard.full {
-  background-position: -320px -104px;
-}
+  &.text {
+    background-position: -448px -136px;
+  }
 
-.icon.trash {
-  background-position: -352px -104px;
-}
+  &.tick, &.true {
+    background-position: -32px -72px;
+  }
 
-.icon.trash.full {
-  background-position: -384px -104px;
-}
+  &.trash {
+    background-position: -352px -104px;
 
-.icon.file_download {
-  background-position: -480px -136px;
-}
+    &.full {
+      background-position: -384px -104px;
+    }
+  }
 
-.icon.download {
-  background-position: -240px -72px;
-}
+  &.unlink {
+    background-position: -352px -72px;
+  }
 
-.icon.file_delete {
-  background-position: -64px -40px;
-}
+  &.upload {
+    background-position: 0 -136px;
+  }
 
-.icon.file_edit {
-  background-position: -32px -40px;
-}
+  &.user {
+    background-position: 0 -104px;
 
-.icon.edit {
-  background-position: -160px -168px;
-}
+    &.female {
+      background-position: -128px -104px;
+    }
+  }
 
-.icon.create {
-  background-position: -192px -168px;
-}
+  &.user_add {
+    background-position: -96px -104px;
+  }
 
-.icon.add_page {
-  background-position: -96px -40px;
-}
+  &.user_delete {
+    background-position: -32px -104px;
 
-.icon.copy_page {
-  background-position: -544px -40px;
-}
+    &.female {
+      background-position: -160px -104px;
+    }
+  }
 
-.icon.delete_page {
-  background-position: -64px -40px;
-}
+  &.user_edit {
+    background-position: -64px -104px;
 
-.icon.user_delete {
-  background-position: -32px -104px;
-}
+    &.female {
+      background-position: -192px -104px;
+    }
+  }
 
-.icon.language_delete {
-  background-position: -16px -120px;
-}
+  &.vcard {
+    background-position: -416px -104px;
+  }
 
-.icon.destroy {
-  background-position: -224px -168px;
-}
+  &.video {
+    background-position: -288px -136px;
+  }
 
-.icon.configure_page {
-  background-position: -320px -40px;
-}
+  &.visit_page {
+    background-position: -31px -137px;
+  }
 
-.icon.search {
-  background: image-url('alchemy/ui-icons_666666_256x240.png') -160px -112px;
-}
+  &.warning, &.warn {
+    background-position: 0 -168px;
+  }
 
-.icon.user_delete.female {
-  background-position: -160px -104px;
-}
+  &.word {
+    background-position: -384px -136px;
+  }
 
-.icon.remove {
-  background-position: no-repeat -64px;
-  width: 16px;
-  height: 16px;
-  display: inline-block;
-  position: relative;
-  top: 3px;
-  margin-right: 4px;
-}
+  &.zoom-equal {
+    background-position: -448px -72px;
+  }
 
-.icon.blank {
-  background: transparent;
-}
+  &.zoom-in {
+    background-position: -480px -72px;
+  }
 
-.icon.sort {
-  background-position: -128px -168px;
+  &.zoom-out {
+    background-position: -416px -72px;
+  }
 }