alchemy_cms 4.1.2 → 4.2.0.rc1

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

@@ -160,10 +160,14 @@ form {
 
   .control_group {
     width: $form-right-width;
-    padding-top: 0.6em;
+    padding-top: $default-margin;
     float: right;
   }
 
+  .check_boxes .control_group {
+    padding-top: 0.6em;
+  }
+
   .input .hint {
     @include form-hint;
     margin-left: $form-left-width;

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

@@ -82,24 +82,16 @@ div#overlay_text_box {
 }
 
 #main_content {
-  padding: 84px 8px 8px $main-menu-width + 10px;
+  padding-top: 84px;
+  padding-right: 8px;
+  padding-bottom: 8px;
+  padding-left: $collapsed-main-menu-width + 8px;
   z-index: 0;
   width: 100%;
   height: 100%;
-}
-
-#archive_all {
-  height: 100%;
-
-  &.with_tag_filter {
 
-    table {
-      padding-right: 242px;
-    }
-
-    > .info {
-      margin-right: 242px;
-    }
+  @media screen and (min-width: $large-screen-break-point) {
+    padding-left: $main-menu-width + 8px;
   }
 }
 

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

@@ -1,15 +1,17 @@
 #top_menu {
   position: fixed;
   top: 0;
-  margin-left: $main-menu-width;
-  padding-right: $main-menu-width;
+  margin-left: $collapsed-main-menu-width;
+  padding-right: $collapsed-main-menu-width;
   z-index: 20;
   width: 100%;
   @extend .disable-user-select;
 
-  .collapsed-menu & {
-    margin-left: $collapsed-main-menu-width;
-    padding-right: $collapsed-main-menu-width;
+  @media screen and (min-width: $large-screen-break-point) {
+    body:not(.collapsed-menu) & {
+      margin-left: $main-menu-width;
+      padding-right: $main-menu-width;
+    }
   }
 }
 
@@ -19,68 +21,27 @@
   position: fixed;
   top: 0;
   left: 0;
-  width: $main-menu-width;
+  width: $collapsed-main-menu-width;
   background-color: $main-menu-bg-color;
   @extend .disable-user-select;
 
-  .collapsed-menu & {
-    width: $collapsed-main-menu-width;
-
-    .main_navi_entry.has_sub_navigation label {
-      display: none;
-    }
-
-    label {
-      visibility: hidden;
-      opacity: 0;
-      background-color: $main-menu-active-bg-color;
-      transition: opacity $transition-duration $transition-easing;
-    }
-
-    .main_navi_entry:not(.has_sub_navigation),
-    #logout {
-
-      &:hover label {
-        visibility: visible;
-        opacity: 1;
-      }
-
-      label {
-        position: absolute;
-        top: 0;
-        left: $collapsed-main-menu-width - 1;
-        width: $main-menu-width + 1;
-        padding-left: 4*$default-padding;
-      }
+  @media screen and (min-width: $large-screen-break-point) {
+    body:not(.collapsed-menu) & {
+      width: $main-menu-width;
     }
   }
-
-  label {
-    vertical-align: middle;
-    padding-left: $default-padding;
-    cursor: pointer;
-    @include truncate($main-menu-entry-max-width);
-  }
-
-  img, .icon {
-    width: 24px;
-  }
-
-  img {
-    border-style: none;
-    height: 24px;
-    vertical-align: -0.6em;
-  }
-
-  .icon {
-    vertical-align: -0.15em;
-    color: inherit;
-  }
 }
 
 #main_navi {
+  max-height: 100vh;
   padding-top: 28px;
   padding-bottom: 80px;
+
+  @media screen and (max-width: $medium-screen-break-point) {
+    overflow-x: hidden;
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+  }
 }
 
 .main_navi_entry {
@@ -94,14 +55,10 @@
   &:hover {
     background-color: $main-menu-active-bg-color;
 
-    &:not(.active),
-    .collapsed-menu & {
-
-      .sub_navigation {
-        visibility: visible;
-        opacity: 1;
-        background-color: $main-menu-active-bg-color;
-      }
+    .sub_navigation {
+      visibility: visible;
+      opacity: 1;
+      background-color: $main-menu-active-bg-color;
     }
   }
 
@@ -123,6 +80,64 @@
     }
   }
 
+  label {
+    position: absolute;
+    top: 0;
+    left: $collapsed-main-menu-width - 1;
+    width: auto;
+    padding-left: 4*$default-padding;
+    padding-right: 4*$default-padding;
+    visibility: hidden;
+    opacity: 0;
+    background-color: $main-menu-active-bg-color;
+    transition: opacity $transition-duration $transition-easing;
+    vertical-align: middle;
+    cursor: pointer;
+    @include truncate($collapsed-main-menu-entry-max-width, $wrap: nowrap);
+
+    @media screen and (min-width: $large-screen-break-point) {
+      body:not(.collapsed-menu) & {
+        position: static;
+        visibility: visible;
+        max-width: $main-menu-entry-max-width;
+        opacity: 1;
+        padding-left: $default-padding;
+        background-color: transparent;
+      }
+    }
+  }
+
+  &.has_sub_navigation label {
+    display: none;
+
+    @media screen and (min-width: $large-screen-break-point) {
+      body:not(.collapsed-menu) & {
+        display: inline-block;
+      }
+    }
+  }
+
+  &:hover label {
+    visibility: visible;
+    opacity: 1;
+  }
+
+  img, .icon {
+    display: inline-block;
+    width: 24px;
+  }
+
+  img {
+    border-style: none;
+    height: 24px;
+    vertical-align: -0.6em;
+  }
+
+  .icon {
+    vertical-align: -0.15em;
+    color: inherit;
+  }
+
   a {
     display: block;
     padding-left: 3 * $default-padding;
@@ -140,47 +155,17 @@
   }
 }
 
-body:not(.collapsed-menu) {
-
-  .subnavi_tab a {
-    padding-top: 1px;
-  }
-
-  .main_navi_entry.active {
-
-    .sub_navigation {
-      position: static;
-      visibility: visible;
-      opacity: 1;
-      width: auto;
-    }
-
-    .subnavi_tab {
-      line-height: 24px;
-
-      a {
-        padding: 8px 4px 8px 44px;
-      }
-    }
-  }
-}
-
 .sub_navigation {
   position: absolute;
-  width: $main-menu-width;
-  left: $main-menu-width;
+  width: auto;
+  left: $collapsed-main-menu-width;
   top: 0;
   visibility: hidden;
   opacity: 0;
   transition: opacity $transition-duration $transition-easing;
-
-  .collapsed-menu & {
-    left: $collapsed-main-menu-width;
-  }
 }
 
 .subnavi_tab {
-
   &:first-of-type {
     border-left: 1px solid $main-menu-active-bg-color;
     margin-left: -1px;
@@ -188,9 +173,10 @@ body:not(.collapsed-menu) {
 
   a {
     padding-left: 4*$default-padding;
+    padding-right: 4*$default-padding;
     background-color: transparent;
     transition: background-color $transition-duration $transition-easing;
-    @include truncate($main-menu-width, $display: block);
+    @include truncate($main-menu-width, $display: block, $wrap: nowrap);
   }
 
   &.active a, a:hover {
@@ -198,6 +184,31 @@ body:not(.collapsed-menu) {
   }
 }
 
+@media screen and (min-width: $large-screen-break-point) {
+  body:not(.collapsed-menu) {
+    .sub_navigation {
+      left: $main-menu-width;
+    }
+
+    .main_navi_entry.active {
+      .sub_navigation {
+        position: static;
+        visibility: visible;
+        opacity: 1;
+        width: auto;
+      }
+
+      .subnavi_tab {
+        line-height: 24px;
+
+        a {
+          padding: 8px 4px 8px 44px;
+        }
+      }
+    }
+  }
+}
+
 .locked_page {
   position: relative;
   float: left;

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

@@ -4,39 +4,20 @@
   height: 29px;
 }
 
-.search_field,
-.js_filter_field_box {
+.search_field {
   .fa-search {
     position: absolute;
     left: 8px;
     top: 9px;
   }
-}
-
-.js_filter_field_box {
-  position: absolute;
-  right: 4px;
-  top: 8px;
-
-  .js_filter_field {
-    width: 220px;
-    text-align: left;
-    border-radius: $default-border-radius;
-    padding: 3px 24px 3px 28px;
-    height: 29px;
-    margin: 0;
-  }
 
   label {
-    font-size: $small-font-size;
     display: block;
-    text-align: center;
-    padding-top: 3px;
+    height: inherit;
   }
 }
 
-.search_field_clear,
-.js_filter_field_clear {
+.search_field_clear {
   display: none;
   position: absolute;
   top: 7px;
@@ -50,8 +31,7 @@
 #toolbar,
 #overlay_toolbar {
 
-  .search_form,
-  .js_filter_field_box {
+  .search_form {
     position: absolute;
     top: 0;
     right: 0;
@@ -63,7 +43,7 @@
   }
 
   .search_input_field {
-    width: 150px;
+    width: 0;
     height: inherit;
     border: none;
     background-color: transparentize($form-field-background-color, 0.25);
@@ -77,6 +57,10 @@
     box-shadow: none;
     -webkit-appearance: none;
 
+    @media screen and (min-width: $medium-screen-break-point) {
+      width: 150px;
+    }
+
     &:focus {
       width: 250px;
       background-color: $form-field-background-color;
@@ -88,13 +72,11 @@
     }
   }
 
-  .search_field .icon,
-  .js_filter_field_box .icon {
+  .search_field .icon {
     top: 18px;
   }
 
-  .search_field_clear,
-  .js_filter_field_clear {
+  .search_field_clear {
     top: 16px;
   }
 }

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

@@ -186,26 +186,3 @@ td#user_roles {
     min-width: 40%;
   }
 }
-
-.resources-table-wrapper {
-  padding-top: 50px;
-
-  table {
-    padding-bottom: 60px;
-  }
-}
-
-.resources-header {
-  position: fixed;
-  width: 100%;
-  top: $top-menu-height;
-  left: $main-menu-width + 9px;
-  z-index: 2;
-  margin: 0 -8px;
-  padding: 8px 16px;
-  background-color: $light-gray;
-
-  > h2, > h3 {
-    margin-bottom: 0;
-  }
-}

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

@@ -23,7 +23,6 @@
     transition: background-color $transition-duration;
 
     input {
-      width: 200px;
       background-color: transparentize($white, 0.25);
 
       &:focus {
@@ -34,14 +33,10 @@
     label { display: none }
   }
 
-  .js_filter_field_clear {
-    right: 4px;
-  }
-
   ul {
     list-style-type: none;
     padding: 0;
-    margin: 40px 0 4px 0;
+    margin: 44px 0 4px 0;
     height: 100%;
     width: 200px;
     overflow-x: hidden;
@@ -112,8 +107,9 @@
 }
 
 #tags_tag_list {
-  text-align: left;
-  padding-top: 5px;
+  .js_filter_field_box {
+    margin-top: 0;
+  }
 
   ul.tags {
     max-height: 10em;
@@ -146,25 +142,6 @@
       }
     }
   }
-
-  .js_filter_field_box {
-    position: relative;
-    top: 0;
-    right: 0;
-    margin: 0;
-
-    .js_filter_field {
-      width: 100%;
-    }
-
-    label {
-      display: none
-    }
-  }
-
-  .js_filter_field_clear {
-    right: 4px;
-  }
 }
 
 .tag_list, .autocomplete_tag_list {