chr 0.4.25 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab43896353a14efbfd0765cd36bdd8cd8dda4e07
-  data.tar.gz: a62183f0ddfd2d792fcb47f84b003f42ca8ab1b5
+  metadata.gz: bb455fc66b783a1a423ab1715a752b68a86f9e44
+  data.tar.gz: 05b67db0d9fe628ca1d3e7b2670239c85cd8835e
 SHA512:
-  metadata.gz: 2472f94af0164117f0ed22c194c99355f1fbb5f2cd26ceb1245182e1f2e718aebf173e3e8dccf734b7ca833ccc7b391689a0657c384af264e3687430c1d33f3a
-  data.tar.gz: 4054f784f9b7ca15782b79784e9e750ba64916b33e572ac843350d8409f57ff313e55319d2c9516d04fab0c01c3efb6fea132441cf05b88a927c971753c46223
+  metadata.gz: e0824ec862e04485620c346265d528a3b4e7e6b23585fdbb5de8140cd5d75362f6353b528b016e26d76c7b6548531feb3e472723f524380c37b2e2b09ababc55
+  data.tar.gz: ad0bcb0b1171fc8e60a111c0d4a6835558f58312e900d17a19c04d5f708e93309d15e7ad65093f5af049b0fa9573b37855aa4233f25013b4297bf960eccaf7db

data/app/assets/javascripts/chr/item.coffee

@@ -26,6 +26,11 @@ class @Item
                   data-id='#{ @object._id }'
                   data-path='#{ @path }'>
                </a>"""
+
+    if @type == 'folder'
+      if !@config.showWithParent
+        @$el.addClass 'folder-nested'
+
     @render()
 
 
@@ -77,8 +82,8 @@ class @Item
     @_render_title()
     @_render_subtitle()
 
-    if @type == 'folder'
-      @$el.append $("<div class='icon-folder'>#{Icons.folder}</div>")
+    # if @type == 'folder'
+    @$el.append $("<div class='icon-folder'>#{Icons.folder}</div>")
 
     if @type == 'object'
       @_render_thumbnail()

data/app/assets/javascripts/chr/list_config.coffee

@@ -39,8 +39,8 @@
       item_type = 'nested_object'
 
       if config.items || config.arrayStore
-        item_type = 'folder'
         @module.addNestedList(slug, config, this)
+        item_type = 'folder'
 
       @_add_item("#{ @path }/#{ slug }", object, 0, config, item_type)
       @_config_items_count += 1

data/app/assets/stylesheets/chr/layout.scss

@@ -5,9 +5,9 @@ $desktop: "screen and (min-width:1024px)";
 /* Global ------------------------------------------------------------------ */
 *,
 *:before,
-*:after  { box-sizing: border-box; }
-html     {  -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; }
-a        { text-decoration: none; }
+*:after { box-sizing: border-box; }
+html {  -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; }
+a { text-decoration: none; }
 .spinner { @include spinner; }
 
 /* Menu -------------------------------------------------------------------- */
@@ -16,9 +16,9 @@ a        { text-decoration: none; }
 }
 
 .menu a {
-  display  : block;
-  position : relative;
-  padding  : 1em;
+  @include position(relative);
+  display: block;
+  padding: 1em;
 }
 
 .menu .fa {
@@ -77,27 +77,37 @@ a        { text-decoration: none; }
 
 /* Item -------------------------------------------------------------------- */
 .item {
-  display  : block;
-  position : relative;
-  padding  : 1em;
-}
+  @include position(relative);
+  display: block;
+  padding: 1em 2em 1em 1em;
 
-.item {
-  .icon-folder,
   .icon-reorder {
     @include item-icon-base;
+    left: 0;
+  }
+
+  .icon-folder {
+    @include item-icon-base;
+    right: 0;
   }
 }
 
-.item.has-subtitle                           { padding       : .6em 1em;            }
-.item.has-thumbnail                          { padding-left  : 4.1em;               }
-.item.has-thumbnail .item-title              { line-height   : 2.15;                }
-.item.has-thumbnail.has-subtitle             { padding       : 1em 1em .75em 4.1em; }
-.item.has-thumbnail.has-subtitle .item-title { line-height   : 1.2;                 }
-.item.reorderable                            { padding-right : 2.5em;               }
+
+.item.has-subtitle { padding: 0.6em 2em 0.6em 1em; }
+.item.has-thumbnail { padding-left: 4.1em; }
+.item.has-thumbnail .item-title { line-height: 2.15; }
+.item.has-thumbnail.has-subtitle { padding: 1em 2em .75em 4.1em; }
+.item.has-thumbnail.has-subtitle .item-title { line-height : 1.2; }
+
+.item.reorderable {
+  padding-left: 2em;
+  &:after {
+    left: 2em;
+  }
+}
 
 .item-title         { @include ellipsis; display: block; }
-.item-subtitle      { @include ellipsis; font-size: .8em; line-height: 1.5; }
+.item-subtitle      { @include ellipsis; font-size: .8em; }
 .item-thumbnail     { @include position(absolute, .5em 0 0 .5em); width: 3.1em; height: 3.1em; }
 .item-thumbnail img { width: 100%; border-radius: 1.55em; }
 
@@ -212,28 +222,29 @@ a        { text-decoration: none; }
   .view .header .close { @include header-back-label; }
 
   .module .list:first-child .back { display: none; }
-
-  .module-categories {
-    .list:first-child { right: 0; left: initial; }
-    .list.list-aside { right: 22em; left: 0; }
-    .list.list-aside .back { visibility: hidden; }
-    .view:not(.fullsize) { right: 22em; left: 0; }
-    .view .header { border-right: 1px solid; }
-    .list:first-child .icon-folder { visibility: hidden; }
-  }
 }
 
 /* Desktop ----------------------------------------------------------------- */
 @media #{$desktop} {
-  .sidebar         { width: 10em; }
-  .module          { left: 10em; }
+  .sidebar { width: 10em; }
+  .module { left: 10em; }
 
-  .view            { left: 22em; }
-  .view.fullsize   { left: 0em;  }
+  .view { left: 22em; }
+  .view.fullsize { left: 0em;  }
 
-  .list            { width: 22em; }
+  .list { width: 22em; }
   .list.list-aside { left: 22em; right: 0; width: auto; }
-  .list .header    { border-right: 1px solid; }
+  .list .header { border-right: 1px solid; }
 
   .list.list-aside .back { @include header-back-label; }
+  .icon-folder { visibility: hidden; }
+  .folder-nested .icon-folder { visibility: visible; }
+
+  .module-categories {
+    .list:first-child { right: 0; left: initial; }
+    .list.list-aside { right: 22em; left: 0; }
+    .list.list-aside .back { visibility: hidden; }
+    .view:not(.fullsize) { right: 22em; left: 0; }
+    .view .header { border-right: 1px solid; }
+  }
 }

data/app/assets/stylesheets/chr/mixins.scss

@@ -23,6 +23,15 @@
   overflow-y                 : scroll;
 }
 
+@mixin header-back-icon {
+  @include header-icon-base;
+  left: 0;
+  i { display: inline; }
+  &:before {
+    display: none;
+  }
+}
+
 @mixin header-back-label {
   @include position(absolute, 0 null null 1em);
   width: auto;
@@ -41,7 +50,7 @@
 }
 
 @mixin item-icon-base {
-  @include position(absolute, 50% 0 null null);
+  @include position(absolute, 50% null null null);
   margin-top: -20px;
   line-height: 40px;
   width: 30px;

data/app/assets/stylesheets/chr/themes/basic.scss

@@ -11,9 +11,10 @@ $bold: 700 !default;
 $extrabold: 800 !default;
 $black: 900 !default;
 
-$white-color: #fff;
+$white-color: #fff !default;
 
 $base-font-color: #2e2e2e !default;
+$secondary-font-color: rgba($base-font-color, .4) !default;
 $positive-color: #4a87ee !default;
 $assertive-color: #e32e2e !default;
 $border-color: #f1f1f1 !default;
@@ -23,7 +24,7 @@ $sidebar-bg-color: #414d65 !default;
 $sidebar-active-color: $white-color !default;
 $sidebar-active-bg-color: #29354f !default;
 
-$list-bg-color: #fbfbfd !default;
+$bg-color: #fbfbfd !default;
 
 $formagic-base-color: $base-font-color;
 $formagic-positive-color: $positive-color;
@@ -36,6 +37,10 @@ html {
   color: $base-font-color;
 }
 
+body {
+  background-color: $bg-color;
+}
+
 a {
   color: $positive-color;
 }
@@ -45,6 +50,10 @@ a {
   padding: .75em 1em;
 }
 
+.header {
+  background-color: $white-color;
+}
+
 .header .title {
   font-size: .9em;
 }
@@ -54,13 +63,9 @@ a {
   font-weight : $semibold;
 }
 
-.header {
-  background-color : rgba(255,255,255,.9);
-}
-
 .spinner {
-  border-color      : rgba($positive-color, 0.2);
-  border-left-color : $positive-color;
+  border-color: rgba($positive-color, 0.2);
+  border-left-color: $positive-color;
 }
 
 .refresh {
@@ -72,11 +77,11 @@ a {
 }
 
 .item {
-  color      : $base-font-color;
-  margin-top : -1px;
+  color: $base-font-color;
+  margin-top: -1px;
   &.active {
-    background-color : $border-color;
-    z-index          : 1;
+    background-color: $border-color;
+    z-index: 1;
   }
 
   @include bottom-border($border-color);
@@ -84,23 +89,35 @@ a {
 }
 
 .item-subtitle {
-  color : rgba($base-font-color, .4);
+  color: $secondary-font-color;
+}
+
+.view {
+  background-color: $bg-color;
+}
+
+.view .header {
+  box-shadow: 0 0 1px rgba(0,0,0,0.15);
+}
+
+.form {
+  max-width: 44em;
+  margin: 0 auto;
 }
 
 .view-delete {
-  display      : block;
-  text-align   : center;
-  margin       : 5em 0;
-  line-height  : 2.5em;
-  color        : $assertive-color;
-  border       : 1px solid $assertive-color;
-  border-left  : none;
-  border-right : none;
+  display: block;
+  text-align: center;
+  margin: 5em 0;
+  line-height: 2.5em;
+  color: $assertive-color;
+  border-top: 1px solid $assertive-color;
+  border-bottom: 1px solid $assertive-color;
 
   &:hover,
   &:active {
-    background-color : $assertive-color;
-    color            : $white-color;
+    background-color: $assertive-color;
+    color: $white-color;
   }
 }
 
@@ -179,9 +196,13 @@ a {
 
 /* Icons ------------------------------------------------------------------- */
 .list-search .search .icon,
-.icon-reorder,
-.icon-folder {
-  color: lighten($base-font-color, 50%);
+.item {
+  .icon-reorder, .icon-folder {
+    color: $secondary-font-color;
+  }
+  .icon-reorder:hover {
+    color: $positive-color;
+  }
 }
 
 .header .back,
@@ -214,34 +235,28 @@ a {
 
   .admin-devise_overrides-passwords,
   .admin-devise_overrides-sessions {
-    background-color: $list-bg-color;
+    background-color: $bg-color;
   }
 
   .signin-modal {
-    background : $white-color;
-    max-width  : 26em;
-    border     : 1px solid $border-color;
-    margin     : 5em auto 1em;
+    background: $white-color;
+    max-width: 26em;
+    margin: 5em auto 1em;
+    box-shadow: 0 0 1px rgba(0,0,0,0.15);
+    border: 1px solid $white-color;
 
     form {
       margin-left: .5em;
     }
   }
 
-  .list {
-    background-color : $list-bg-color;
-    .header {
-      background-color : $list-bg-color;
-    }
-    &.list-aside {
-      background-color : $white-color;
+  .module-categories {
+    .list:first-child {
+      background-color: $bg-color;
       .header {
-        background-color : $white-color;
+        background-color: $bg-color;
       }
     }
-  }
-
-  .module-categories {
     .view .header {
       border-color: $border-color;
     }

data/chr.gemspec

@@ -30,7 +30,7 @@ email client etc. It's responsive by default and designed to be data source inde
 
   s.add_dependency 'rails', Chr::RAILS_VERSION
   s.add_dependency 'coffee-rails', '>= 4.0'
-  s.add_dependency 'formagic', '>= 0.2.8'
+  s.add_dependency 'formagic', '>= 0.3.4'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'sass-rails'
   s.add_dependency 'bourbon'

data/lib/chr/version.rb

@@ -1,5 +1,5 @@
 module Chr
   RAILS_VERSION = "~> 4.2.5"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "0.4.25"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chr
 version: !ruby/object:Gem::Version
-  version: 0.4.25
+  version: 0.5.0
 platform: ruby
 authors:
 - Alexander Kravets
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement