lalala 4.1.0.dev.394 → 4.1.0.dev.397

Sign up to get free protection for your applications and to get access to all the features.
@@ -31,6 +31,7 @@
31
31
  @import "lalala/modules/dropdown-menu";
32
32
  @import "lalala/modules/index-footer";
33
33
  @import "lalala/modules/table-tools";
34
+ @import "lalala/modules/index-as-sortable";
34
35
  @import "lalala/modules/index-as-table";
35
36
  @import "lalala/modules/index-as-tree-table";
36
37
  @import "lalala/modules/editor";
@@ -0,0 +1,89 @@
1
+ body.active_admin .index.index_as_sortable {
2
+ .resource_selection_toggle_panel {
3
+ background-color: #1f73ff;
4
+ border-top-left-radius: 5px;
5
+ border-top-right-radius: 5px;
6
+ padding: 13px 15px 12px 15px;
7
+ }
8
+
9
+ #collection_selection_toggle_explaination {
10
+ display: none;
11
+ }
12
+
13
+ .resource_selection_cell {
14
+ width: 25px;
15
+ }
16
+
17
+ a.member_link {
18
+ opacity: 0;
19
+ transition: opacity 300ms;
20
+ display: inline-block;
21
+ height: 16px;
22
+ margin: 0 3px;
23
+ text-indent: -9999px;
24
+ width: 16px;
25
+ }
26
+
27
+ a.new_link {
28
+ background-image: url(/assets/lalala/icons/add.png);
29
+ background-repeat: no-repeat;
30
+ }
31
+
32
+ a.view_link {
33
+ background-image: url(/assets/lalala/icons/eye.png);
34
+ background-repeat: no-repeat;
35
+ }
36
+
37
+ a.edit_link {
38
+ background-image: url(/assets/lalala/icons/page_white_edit.png);
39
+ background-repeat: no-repeat;
40
+ }
41
+
42
+ a.delete_link {
43
+ background-image: url(/assets/lalala/icons/delete.png);
44
+ background-repeat: no-repeat;
45
+ }
46
+
47
+ ol {
48
+ border-radius: 5px;
49
+ border: 1px solid #e0e0e0;
50
+ margin: 0 0 1em 0;
51
+ overflow: hidden;
52
+
53
+ li {
54
+ &:last-child .item {
55
+ border-bottom: 0;
56
+ }
57
+
58
+ &:hover {
59
+ a.member_link {
60
+ opacity: 1;
61
+ }
62
+ }
63
+
64
+ .item {
65
+ border-top: 0;
66
+ box-sizing: border-box;
67
+ font-size: 14px;
68
+ line-height: 16px;
69
+ overflow: hidden;
70
+
71
+ &.odd {
72
+ background-color: #fafafa;
73
+ }
74
+
75
+ .cell.left {
76
+ font-size: 14px;
77
+ line-height: 16px;
78
+ float: left;
79
+ padding: 13px 15px 12px 15px;
80
+ }
81
+
82
+ .cell.right {
83
+ float: right;
84
+ padding: 13px 15px 12px 15px;
85
+ }
86
+ }
87
+ }
88
+ }
89
+ }
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.1.0"
3
- BUILD = "394"
3
+ BUILD = "397"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0.dev.394
4
+ version: 4.1.0.dev.397
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2015-06-09 00:00:00.000000000 Z
16
+ date: 2015-07-13 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: activeadmin
@@ -1293,11 +1293,13 @@ files:
1293
1293
  - app/assets/javascripts/browser/navigator.module.js
1294
1294
  - app/assets/javascripts/browser/screen.module.js
1295
1295
  - app/assets/javascripts/browser/window.module.js
1296
+ - app/assets/javascripts/jquery-ui/sortable.js
1296
1297
  - app/assets/javascripts/lalala/base.js
1297
1298
  - app/assets/javascripts/lalala/initializers/assets.module.js
1298
1299
  - app/assets/javascripts/lalala/initializers/chosen.module.js
1299
1300
  - app/assets/javascripts/lalala/lib/jquery-chosen.js
1300
1301
  - app/assets/javascripts/lalala/lib/jquery-markitup.js
1302
+ - app/assets/javascripts/lalala/lib/jquery-ui.js
1301
1303
  - app/assets/javascripts/lalala/lib/moment.js
1302
1304
  - app/assets/javascripts/lalala/lib/overlay.js
1303
1305
  - app/assets/javascripts/lalala/lib/pikaday.js
@@ -1344,6 +1346,7 @@ files:
1344
1346
  - app/assets/stylesheets/lalala/modules/_flashes.css.scss
1345
1347
  - app/assets/stylesheets/lalala/modules/_footer.css.scss
1346
1348
  - app/assets/stylesheets/lalala/modules/_header.css.scss
1349
+ - app/assets/stylesheets/lalala/modules/_index-as-sortable.css.scss
1347
1350
  - app/assets/stylesheets/lalala/modules/_index-as-table.css.scss
1348
1351
  - app/assets/stylesheets/lalala/modules/_index-as-tree-table.css.scss
1349
1352
  - app/assets/stylesheets/lalala/modules/_index-footer.css.scss