chr 0.4.25 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ab43896353a14efbfd0765cd36bdd8cd8dda4e07
4
- data.tar.gz: a62183f0ddfd2d792fcb47f84b003f42ca8ab1b5
3
+ metadata.gz: bb455fc66b783a1a423ab1715a752b68a86f9e44
4
+ data.tar.gz: 05b67db0d9fe628ca1d3e7b2670239c85cd8835e
5
5
  SHA512:
6
- metadata.gz: 2472f94af0164117f0ed22c194c99355f1fbb5f2cd26ceb1245182e1f2e718aebf173e3e8dccf734b7ca833ccc7b391689a0657c384af264e3687430c1d33f3a
7
- data.tar.gz: 4054f784f9b7ca15782b79784e9e750ba64916b33e572ac843350d8409f57ff313e55319d2c9516d04fab0c01c3efb6fea132441cf05b88a927c971753c46223
6
+ metadata.gz: e0824ec862e04485620c346265d528a3b4e7e6b23585fdbb5de8140cd5d75362f6353b528b016e26d76c7b6548531feb3e472723f524380c37b2e2b09ababc55
7
+ data.tar.gz: ad0bcb0b1171fc8e60a111c0d4a6835558f58312e900d17a19c04d5f708e93309d15e7ad65093f5af049b0fa9573b37855aa4233f25013b4297bf960eccaf7db
@@ -26,6 +26,11 @@ class @Item
26
26
  data-id='#{ @object._id }'
27
27
  data-path='#{ @path }'>
28
28
  </a>"""
29
+
30
+ if @type == 'folder'
31
+ if !@config.showWithParent
32
+ @$el.addClass 'folder-nested'
33
+
29
34
  @render()
30
35
 
31
36
 
@@ -77,8 +82,8 @@ class @Item
77
82
  @_render_title()
78
83
  @_render_subtitle()
79
84
 
80
- if @type == 'folder'
81
- @$el.append $("<div class='icon-folder'>#{Icons.folder}</div>")
85
+ # if @type == 'folder'
86
+ @$el.append $("<div class='icon-folder'>#{Icons.folder}</div>")
82
87
 
83
88
  if @type == 'object'
84
89
  @_render_thumbnail()
@@ -39,8 +39,8 @@
39
39
  item_type = 'nested_object'
40
40
 
41
41
  if config.items || config.arrayStore
42
- item_type = 'folder'
43
42
  @module.addNestedList(slug, config, this)
43
+ item_type = 'folder'
44
44
 
45
45
  @_add_item("#{ @path }/#{ slug }", object, 0, config, item_type)
46
46
  @_config_items_count += 1
@@ -5,9 +5,9 @@ $desktop: "screen and (min-width:1024px)";
5
5
  /* Global ------------------------------------------------------------------ */
6
6
  *,
7
7
  *:before,
8
- *:after { box-sizing: border-box; }
9
- html { -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; }
10
- a { text-decoration: none; }
8
+ *:after { box-sizing: border-box; }
9
+ html { -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; }
10
+ a { text-decoration: none; }
11
11
  .spinner { @include spinner; }
12
12
 
13
13
  /* Menu -------------------------------------------------------------------- */
@@ -16,9 +16,9 @@ a { text-decoration: none; }
16
16
  }
17
17
 
18
18
  .menu a {
19
- display : block;
20
- position : relative;
21
- padding : 1em;
19
+ @include position(relative);
20
+ display: block;
21
+ padding: 1em;
22
22
  }
23
23
 
24
24
  .menu .fa {
@@ -77,27 +77,37 @@ a { text-decoration: none; }
77
77
 
78
78
  /* Item -------------------------------------------------------------------- */
79
79
  .item {
80
- display : block;
81
- position : relative;
82
- padding : 1em;
83
- }
80
+ @include position(relative);
81
+ display: block;
82
+ padding: 1em 2em 1em 1em;
84
83
 
85
- .item {
86
- .icon-folder,
87
84
  .icon-reorder {
88
85
  @include item-icon-base;
86
+ left: 0;
87
+ }
88
+
89
+ .icon-folder {
90
+ @include item-icon-base;
91
+ right: 0;
89
92
  }
90
93
  }
91
94
 
92
- .item.has-subtitle { padding : .6em 1em; }
93
- .item.has-thumbnail { padding-left : 4.1em; }
94
- .item.has-thumbnail .item-title { line-height : 2.15; }
95
- .item.has-thumbnail.has-subtitle { padding : 1em 1em .75em 4.1em; }
96
- .item.has-thumbnail.has-subtitle .item-title { line-height : 1.2; }
97
- .item.reorderable { padding-right : 2.5em; }
95
+
96
+ .item.has-subtitle { padding: 0.6em 2em 0.6em 1em; }
97
+ .item.has-thumbnail { padding-left: 4.1em; }
98
+ .item.has-thumbnail .item-title { line-height: 2.15; }
99
+ .item.has-thumbnail.has-subtitle { padding: 1em 2em .75em 4.1em; }
100
+ .item.has-thumbnail.has-subtitle .item-title { line-height : 1.2; }
101
+
102
+ .item.reorderable {
103
+ padding-left: 2em;
104
+ &:after {
105
+ left: 2em;
106
+ }
107
+ }
98
108
 
99
109
  .item-title { @include ellipsis; display: block; }
100
- .item-subtitle { @include ellipsis; font-size: .8em; line-height: 1.5; }
110
+ .item-subtitle { @include ellipsis; font-size: .8em; }
101
111
  .item-thumbnail { @include position(absolute, .5em 0 0 .5em); width: 3.1em; height: 3.1em; }
102
112
  .item-thumbnail img { width: 100%; border-radius: 1.55em; }
103
113
 
@@ -212,28 +222,29 @@ a { text-decoration: none; }
212
222
  .view .header .close { @include header-back-label; }
213
223
 
214
224
  .module .list:first-child .back { display: none; }
215
-
216
- .module-categories {
217
- .list:first-child { right: 0; left: initial; }
218
- .list.list-aside { right: 22em; left: 0; }
219
- .list.list-aside .back { visibility: hidden; }
220
- .view:not(.fullsize) { right: 22em; left: 0; }
221
- .view .header { border-right: 1px solid; }
222
- .list:first-child .icon-folder { visibility: hidden; }
223
- }
224
225
  }
225
226
 
226
227
  /* Desktop ----------------------------------------------------------------- */
227
228
  @media #{$desktop} {
228
- .sidebar { width: 10em; }
229
- .module { left: 10em; }
229
+ .sidebar { width: 10em; }
230
+ .module { left: 10em; }
230
231
 
231
- .view { left: 22em; }
232
- .view.fullsize { left: 0em; }
232
+ .view { left: 22em; }
233
+ .view.fullsize { left: 0em; }
233
234
 
234
- .list { width: 22em; }
235
+ .list { width: 22em; }
235
236
  .list.list-aside { left: 22em; right: 0; width: auto; }
236
- .list .header { border-right: 1px solid; }
237
+ .list .header { border-right: 1px solid; }
237
238
 
238
239
  .list.list-aside .back { @include header-back-label; }
240
+ .icon-folder { visibility: hidden; }
241
+ .folder-nested .icon-folder { visibility: visible; }
242
+
243
+ .module-categories {
244
+ .list:first-child { right: 0; left: initial; }
245
+ .list.list-aside { right: 22em; left: 0; }
246
+ .list.list-aside .back { visibility: hidden; }
247
+ .view:not(.fullsize) { right: 22em; left: 0; }
248
+ .view .header { border-right: 1px solid; }
249
+ }
239
250
  }
@@ -23,6 +23,15 @@
23
23
  overflow-y : scroll;
24
24
  }
25
25
 
26
+ @mixin header-back-icon {
27
+ @include header-icon-base;
28
+ left: 0;
29
+ i { display: inline; }
30
+ &:before {
31
+ display: none;
32
+ }
33
+ }
34
+
26
35
  @mixin header-back-label {
27
36
  @include position(absolute, 0 null null 1em);
28
37
  width: auto;
@@ -41,7 +50,7 @@
41
50
  }
42
51
 
43
52
  @mixin item-icon-base {
44
- @include position(absolute, 50% 0 null null);
53
+ @include position(absolute, 50% null null null);
45
54
  margin-top: -20px;
46
55
  line-height: 40px;
47
56
  width: 30px;
@@ -11,9 +11,10 @@ $bold: 700 !default;
11
11
  $extrabold: 800 !default;
12
12
  $black: 900 !default;
13
13
 
14
- $white-color: #fff;
14
+ $white-color: #fff !default;
15
15
 
16
16
  $base-font-color: #2e2e2e !default;
17
+ $secondary-font-color: rgba($base-font-color, .4) !default;
17
18
  $positive-color: #4a87ee !default;
18
19
  $assertive-color: #e32e2e !default;
19
20
  $border-color: #f1f1f1 !default;
@@ -23,7 +24,7 @@ $sidebar-bg-color: #414d65 !default;
23
24
  $sidebar-active-color: $white-color !default;
24
25
  $sidebar-active-bg-color: #29354f !default;
25
26
 
26
- $list-bg-color: #fbfbfd !default;
27
+ $bg-color: #fbfbfd !default;
27
28
 
28
29
  $formagic-base-color: $base-font-color;
29
30
  $formagic-positive-color: $positive-color;
@@ -36,6 +37,10 @@ html {
36
37
  color: $base-font-color;
37
38
  }
38
39
 
40
+ body {
41
+ background-color: $bg-color;
42
+ }
43
+
39
44
  a {
40
45
  color: $positive-color;
41
46
  }
@@ -45,6 +50,10 @@ a {
45
50
  padding: .75em 1em;
46
51
  }
47
52
 
53
+ .header {
54
+ background-color: $white-color;
55
+ }
56
+
48
57
  .header .title {
49
58
  font-size: .9em;
50
59
  }
@@ -54,13 +63,9 @@ a {
54
63
  font-weight : $semibold;
55
64
  }
56
65
 
57
- .header {
58
- background-color : rgba(255,255,255,.9);
59
- }
60
-
61
66
  .spinner {
62
- border-color : rgba($positive-color, 0.2);
63
- border-left-color : $positive-color;
67
+ border-color: rgba($positive-color, 0.2);
68
+ border-left-color: $positive-color;
64
69
  }
65
70
 
66
71
  .refresh {
@@ -72,11 +77,11 @@ a {
72
77
  }
73
78
 
74
79
  .item {
75
- color : $base-font-color;
76
- margin-top : -1px;
80
+ color: $base-font-color;
81
+ margin-top: -1px;
77
82
  &.active {
78
- background-color : $border-color;
79
- z-index : 1;
83
+ background-color: $border-color;
84
+ z-index: 1;
80
85
  }
81
86
 
82
87
  @include bottom-border($border-color);
@@ -84,23 +89,35 @@ a {
84
89
  }
85
90
 
86
91
  .item-subtitle {
87
- color : rgba($base-font-color, .4);
92
+ color: $secondary-font-color;
93
+ }
94
+
95
+ .view {
96
+ background-color: $bg-color;
97
+ }
98
+
99
+ .view .header {
100
+ box-shadow: 0 0 1px rgba(0,0,0,0.15);
101
+ }
102
+
103
+ .form {
104
+ max-width: 44em;
105
+ margin: 0 auto;
88
106
  }
89
107
 
90
108
  .view-delete {
91
- display : block;
92
- text-align : center;
93
- margin : 5em 0;
94
- line-height : 2.5em;
95
- color : $assertive-color;
96
- border : 1px solid $assertive-color;
97
- border-left : none;
98
- border-right : none;
109
+ display: block;
110
+ text-align: center;
111
+ margin: 5em 0;
112
+ line-height: 2.5em;
113
+ color: $assertive-color;
114
+ border-top: 1px solid $assertive-color;
115
+ border-bottom: 1px solid $assertive-color;
99
116
 
100
117
  &:hover,
101
118
  &:active {
102
- background-color : $assertive-color;
103
- color : $white-color;
119
+ background-color: $assertive-color;
120
+ color: $white-color;
104
121
  }
105
122
  }
106
123
 
@@ -179,9 +196,13 @@ a {
179
196
 
180
197
  /* Icons ------------------------------------------------------------------- */
181
198
  .list-search .search .icon,
182
- .icon-reorder,
183
- .icon-folder {
184
- color: lighten($base-font-color, 50%);
199
+ .item {
200
+ .icon-reorder, .icon-folder {
201
+ color: $secondary-font-color;
202
+ }
203
+ .icon-reorder:hover {
204
+ color: $positive-color;
205
+ }
185
206
  }
186
207
 
187
208
  .header .back,
@@ -214,34 +235,28 @@ a {
214
235
 
215
236
  .admin-devise_overrides-passwords,
216
237
  .admin-devise_overrides-sessions {
217
- background-color: $list-bg-color;
238
+ background-color: $bg-color;
218
239
  }
219
240
 
220
241
  .signin-modal {
221
- background : $white-color;
222
- max-width : 26em;
223
- border : 1px solid $border-color;
224
- margin : 5em auto 1em;
242
+ background: $white-color;
243
+ max-width: 26em;
244
+ margin: 5em auto 1em;
245
+ box-shadow: 0 0 1px rgba(0,0,0,0.15);
246
+ border: 1px solid $white-color;
225
247
 
226
248
  form {
227
249
  margin-left: .5em;
228
250
  }
229
251
  }
230
252
 
231
- .list {
232
- background-color : $list-bg-color;
233
- .header {
234
- background-color : $list-bg-color;
235
- }
236
- &.list-aside {
237
- background-color : $white-color;
253
+ .module-categories {
254
+ .list:first-child {
255
+ background-color: $bg-color;
238
256
  .header {
239
- background-color : $white-color;
257
+ background-color: $bg-color;
240
258
  }
241
259
  }
242
- }
243
-
244
- .module-categories {
245
260
  .view .header {
246
261
  border-color: $border-color;
247
262
  }
@@ -30,7 +30,7 @@ email client etc. It's responsive by default and designed to be data source inde
30
30
 
31
31
  s.add_dependency 'rails', Chr::RAILS_VERSION
32
32
  s.add_dependency 'coffee-rails', '>= 4.0'
33
- s.add_dependency 'formagic', '>= 0.2.8'
33
+ s.add_dependency 'formagic', '>= 0.3.4'
34
34
  s.add_dependency 'jquery-rails'
35
35
  s.add_dependency 'sass-rails'
36
36
  s.add_dependency 'bourbon'
@@ -1,5 +1,5 @@
1
1
  module Chr
2
2
  RAILS_VERSION = "~> 4.2.5"
3
3
  RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
4
- VERSION = "0.4.25"
4
+ VERSION = "0.5.0"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chr
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.25
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Kravets
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-11-27 00:00:00.000000000 Z
13
+ date: 2015-12-01 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -46,14 +46,14 @@ dependencies:
46
46
  requirements:
47
47
  - - ">="
48
48
  - !ruby/object:Gem::Version
49
- version: 0.2.8
49
+ version: 0.3.4
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - ">="
55
55
  - !ruby/object:Gem::Version
56
- version: 0.2.8
56
+ version: 0.3.4
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: jquery-rails
59
59
  requirement: !ruby/object:Gem::Requirement