alchemy_cms 4.0.6 → 4.1.0.beta

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

@@ -22,7 +22,7 @@ div#image_assign_filter_and_image_sizing {
   display: inline-block;
   border: 1px solid #c0c0c0;
   position: relative;
-  @extend %rounded-border;
+  border-radius: $default-border-radius;
   width: 170px;
 
   img {
@@ -108,7 +108,7 @@ div.assign_image_list_image {
   position: absolute;
   background-color: white;
   top: $default-padding;
-  padding: $default-padding/2;
+  padding: 2px 3px;
   z-index: 10;
   display: none;
 
@@ -131,10 +131,6 @@ div.assign_image_list_image {
 
   &.delete {
     right: $default-padding;
-
-    a {
-      background: image-url('alchemy/icons.png') no-repeat -63px -72px;
-    }
   }
 
   a {
@@ -195,10 +191,15 @@ div#filter_bar {
     top: auto;
     width: 200px;
     z-index: 1100;
+    transition: background-color 200ms;
 
     input {
       width: 200px;
-      background-color: #f8f8f8;
+      background-color: transparentize($white, 0.25);
+
+      &:focus {
+        background-color: $white;
+      }
     }
 
     label { display: none }
@@ -218,12 +219,12 @@ div#filter_bar {
     overflow-y: auto;
 
     li {
-      @include tag-base;
       display: block;
 
       &:first-child { margin-top: 0 }
 
       a {
+        @include tag-base;
         text-decoration: none;
         display: block;
       }
@@ -231,9 +232,11 @@ div#filter_bar {
       &:hover { background-color: $very-light-blue }
 
       &.active {
-        background-color: $dark-gray;
 
-        a, &:before { color: $light-gray }
+        a {
+          background-color: $dark-gray;
+          color: $light-gray
+        }
       }
     }
   }
@@ -299,7 +302,7 @@ div#filter_bar {
       display: block;
       line-height: 25px;
       text-decoration: none;
-      padding: 2px $default-padding;
+      padding: $default-padding 2*$default-padding;
     }
 
     .icon {
@@ -326,28 +329,21 @@ div#filter_bar {
 }
 
 .tag {
+  @include tag-base(
+    $margin: $default-margin/2 0,
+    $padding: $default-padding 2*$default-padding $default-padding
+  );
   display: inline-block;
   vertical-align: middle;
-  @extend %rounded-border;
-  padding: $default-padding 2*$default-padding $default-padding 4*$default-padding;
-  margin: $default-margin/2 0;
-  background-color: rgba($medium-gray, 0.85);
   color: $text-color;
-  overflow: hidden;
-  position: relative;
   pointer-events: none;
-  font-size: 10px;
-
-  &:before {
-    position: absolute;
-    left: $default-padding;
-    top: 2*$default-padding;
-    font-family: 'Alchemy Icons';
-    @extend .icon-tag:before;
-    line-height: 6px;
-  }
+  font-size: $small-font-size;
 }
 
 .tags .list .tag {
   padding: 0;
 }
+
+#all_files td.name a {
+  @include zoom-in;
+}

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

@@ -1,10 +1,11 @@
 html {
   box-sizing: border-box;
   height: 100%;
+  font-size: $base-font-size;
 
   &.turbolinks-progress-bar::before,
   .turbolinks-progress-bar {
-    background-color: #fff !important;
+    background-color: $blue !important;
     z-index: 400001;
   }
 }
@@ -37,7 +38,7 @@ body {
   padding: 0;
   color: $text-color;
   font: $default-font-style;
-  background-color: $light-gray;
+  background-color: $body-background-color;
   height: 100%;
   cursor: default;
 
@@ -97,7 +98,6 @@ a {
 
   &:focus {
     @extend %blue-focus-style;
-    color: black;
   }
 
   img {
@@ -140,7 +140,7 @@ kbd {
   padding: 0.25em 0.5em;
   vertical-align: top;
   margin-right: 1ex;
-  @extend %rounded-border;
+  border-radius: $default-border-radius;
 }
 
 .top-rounded-border {
@@ -167,372 +167,22 @@ kbd {
   user-select: none;
 }
 
-span.updated_at {
-  float: right;
-}
-
-a.drop_down_select img {
-  float: left;
-  position: relative;
-  top: 2px;
-  margin-right: 4px;
-}
-
-#language_select {
-  margin-bottom: 4px;
-}
-
-div.source_editor textarea {
-  width: 100%;
-  height: 358px;
-}
-
-div.edit_source_buttons {
-  height: 18px;
-  margin-top: 8px;
-  float: right;
-  clear: both;
-}
-
-div#page {
-  height: auto !important;
-  height: 100%;
-  min-height: 100%;
-  position: relative;
-/* needed for footer positioning*/
-}
-
-#archive_all .edit_images_bottom span {
-  width: 19px;
-  height: 19px;
-  float: left;
-  margin-right: 4px;
-}
-
-#archive_all .edit_images_bottom span a {
-  display: block;
-  height: 19px;
-  width: 19px;
-  background-repeat: no-repeat;
-  text-decoration: none;
-  background-position: left;
-}
-
-#archive_all .edit_images_bottom span a:hover {
-  background-position: right;
-}
-
-#back_to_site {
-  float: right;
-  margin-right: 8px;
-}
-
-div#new_page_from_clipboard {
-  @extend .hidden;
-}
-
-div#new_page_from_clipboard input.button {
-  float: right;
-}
-
-div#new_page_from_clipboard span {
-  float: left;
-  line-height: 25px;
-}
-
-div#page_status_options {
-  float: left;
-}
-
-div#page_editing_menu {
-  overflow: auto;
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-#page_sorting_panel p {
-  margin-top: 1em;
-}
-
 .handle {
   cursor: move;
 }
 
-.headline_text_editor {
-  overflow: auto;
-  width: 374px;
-}
-
-.short_content_text {
-  width: 374px;
-  background-color: white;
-  margin-bottom: 10px;
-  padding-bottom: 2px;
-  padding-top: 2px;
-  padding-left: 2px;
-  float: none;
-}
-
-.short_content_text a {
-  color: #000000;
-  text-decoration: none;
-  font-weight: bold;
-}
-
-.short_content_text a:hover {
-  color: #000000;
-  text-decoration: underline;
-}
-
-.picture_tool_assign_box {
-  float: right;
-  width: 105px;
-  overflow: auto;
-  padding: 1px;
-}
-
-/* @end */
-
-.short_picture {
-  float: left
-}
-
-.short_element {
-  margin-left: 20px;
-  float: left;
-}
-
-.short_element input {
-  width: 190px;
-  float: left;
-  font: 11px $default-font-face;
-}
-
-.dashed_border {
-  border: 1px dashed;
-}
-
-ul#all_files {
-  list-style-type: none;
-  display: block;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-}
-
-img.image_in_text {
-  position: relative;
-  top: 3px;
-}
-
-div.right_checkbox {
-  float: left;
-}
-
-div.all_rights {
-  float: left;
-  clear: both;
-  margin-top: 10px;
-}
-
-.date_select_without_time #date_date_4i {
-  @extend .hidden;
-}
-
-.date_select_without_time #date_date_5i {
-  @extend .hidden;
-}
-
 .with_padding {
   padding: 2*$default-padding;
 }
 
 .with_margin {
-  margin: 2*$default-padding;
-}
-
-div#images {
-  margin-top: 16px;
-  margin-bottom: 8px;
-  overflow: visible;
-}
-
-.foot_note, form .input .hint {
-  @include form-hint;
-}
-
-#all_files td.name a {
-  @include zoom-in;
-}
-
-#sitemap .placeholder {
-  background-color: $medium-gray;
-  margin-bottom: 0px;
-  margin-left: 22px;
-}
-
-#page_selector_scroll_container {
-  position: relative;
-  width: 100%;
-}
-
-#page_selector_container {
-  height: 230px;
-  background-color: $light-gray;
-  margin-bottom: 4px;
-  border: 1px inset #e8e8e8;
-  overflow: auto;
-  padding: 4px 0 0 4px;
-  @extend %rounded-border;
-}
-
-#alchemyConfirmation .alchemy_window_buttons {
-  display: block;
-  text-align: right;
-  margin-top: 8px;
-  padding-right: 8px;
-}
-
-#alchemyConfirmation_content div.alchemy_window_message {
-  padding: 2*$default-padding;
-}
-
-input.with_border {
-  margin: 0;
-  padding: 1px;
-  font-size: 12px;
-  border: 1px solid silver;
-}
-
-#image_edit div {
-  height: 25px;
-}
-
-#image_edit div span {
-  float: left;
-  padding: 0;
-  margin-right: 6px;
-  height: 17px;
-  line-height: 19px;
+  margin: 2*$default-margin;
 }
 
 a img {
   border-style: none;
 }
 
-#sitemap_external_links form {
-  margin-left: 5px;
-  margin-bottom: 4px;
-}
-
-input#link_to_text {
-  border-width: 1px;
-  font-size: 11px;
-  line-height: 11px;
-  width: 229px;
-}
-
-.link_window_tab_body {
-  background-color: $light-gray;
-  padding: 2*$default-padding;
-  margin: 0;
-}
-
-.bordertop_white {
-  border-top: 4px solid white;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  overflow: auto;
-  float: none;
-}
-
-#external_link_table .padding_right {
-  padding-right: 8px;
-}
-
-#external_link_table .external_address_input {
-  width: 195px;
-}
-
-table.window_form td.checkbox {
-  text-align: left;
-}
-
-select#url_protocol.medium {
-  margin: 0;
-}
-
-#clipboard_items {
-
-  ul {
-    list-style-type: none;
-    margin: 0 0 8px;
-    padding: 0;
-    height: 220px;
-    overflow-y: auto;
-    overflow-x: hidden;
-
-    li {
-      padding: 2*$default-padding;
-      border: $default-border;
-      background-color: white;
-      @extend %rounded-border;
-
-      &.elements {
-        background-color: $medium-gray;
-      }
-
-      .icon {
-        vertical-align: text-bottom;
-        margin-right: $default-padding;
-      }
-
-      .float_right .icon {
-        margin-right: 0;
-      }
-    }
-  }
-}
-
-#trash_items {
-  height: 310px;
-  overflow-x: hidden;
-  overflow-y: auto;
-  margin-bottom: 1em;
-}
-
-.mceEditor table {
-  border-spacing: 0 !important;
-}
-
-div.browse {
-  margin-bottom: 1em;
-}
-
-#alchemy_preview_window {
-  position: absolute;
-  left: $main-menu-width;
-  top: 75px;
-  width: auto;
-  height: auto;
-  border: 0 none;
-  background: #fff;
-  border-right: $default-border;
-  transition: 200ms ease-in-out;
-
-  .collapsed-menu & {
-    left: $collapsed-main-menu-width;
-  }
-}
-
-#error_trace {
-  border: $default-border;
-  width: 80%;
-  padding: $default-padding;
-  overflow: auto;
-  @extend %rounded-border;
-}
-
 .full_width {
   width: 100%;
 }