lalala 4.0.0.dev.58 → 4.0.0.dev.59

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/lalala/modules/grid.module.js +2 -0
  3. data/app/assets/stylesheets/lalala/_base.css.scss +1 -1
  4. data/app/assets/stylesheets/lalala/modules/_grid.css.scss +75 -0
  5. data/lib/lalala/version.rb +1 -1
  6. metadata +2 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a04b952f37c9c2859e0ca26771bbe794255e5de9
4
- data.tar.gz: dbc62722fdd64ac1e4a077999f17822b376eabf5
3
+ metadata.gz: e155b5eaa44f5404e533fa1b34ed2c022c8cbfb3
4
+ data.tar.gz: 80ca6f3dcd83419994e83b77a4f64756c86bf54a
5
5
  SHA512:
6
- metadata.gz: ca4d4d24a2cdfd75c79a8911c8afd2cae5e803084918b793d38a3291b7654a200a538f587ccc7bcc73745a898694ea025d059cdc1c10bfe3df8eccead83a9fb4
7
- data.tar.gz: 0db37b96f5939a9aff21bff84b52d3312f46689c9c3d7cce8e6cf22caa2d69bcea3bd9863758f378564546d717789b955aab1596dad41bf82d870017abf2159e
6
+ metadata.gz: 88785acc4ae3cba0cfaadb7d3d4f07367fdeb56eee02bac3e01127d8b4d56e433284a9c83a3c3e7929e20f2acd2f9e9e4a60a8ba51b420ef436cc5b37931737a
7
+ data.tar.gz: 925eb61bfffb558d6e4f9ca9ab188313a4d2d182b3532da2babb4f21125a5fc0d3286a1fd8a3785913503f306b66b5d8a740aacc12e1cb2cd58d3aafa9d3fcba
data/app/assets/javascripts/lalala/modules/grid.module.js CHANGED
@@ -88,6 +88,8 @@ Grid = (function() {
88
88
  };
89
89
 
90
90
  G.prototype.row_overlay_click = function(e) {
91
+ e.preventDefault();
92
+
91
93
  // $(this).parent().toggleClass("selected");
92
94
  this.toggle_destroy( $(e.currentTarget).parent()[0] );
93
95
  };
data/app/assets/stylesheets/lalala/_base.css.scss CHANGED
@@ -27,7 +27,7 @@
27
27
  @import "lalala/modules/index-as-tree-table";
28
28
  @import "lalala/modules/editor";
29
29
  @import "lalala/modules/editor-cheatsheet";
30
- @import "lalala/modules/grids";
30
+ @import "lalala/modules/grid";
31
31
 
32
32
  @import "lalala/lib/jquery-ui";
33
33
  @import "lalala/lib/chosen";
data/app/assets/stylesheets/lalala/modules/_grid.css.scss ADDED
@@ -0,0 +1,75 @@
1
+ /*
2
+
3
+ GRIDS
4
+ --------
5
+
6
+ */
7
+
8
+ .mod-grid {
9
+ .images,
10
+ .input-fields {
11
+ overflow: hidden;
12
+ }
13
+
14
+ // [row]
15
+ li {
16
+ float: left;
17
+ margin: 0 11px 11px 0;
18
+ position: relative;
19
+
20
+ &, .image, .overlay {
21
+ height: 100px;
22
+ width: 100px;
23
+ }
24
+
25
+ &.move,
26
+ &.properties,
27
+ &.selected,
28
+ &.will-destroy { .overlay { display: block; }}
29
+ }
30
+
31
+ // [row]:types
32
+ li.move label { cursor: move; }
33
+ li.properties { cursor: pointer; }
34
+ li.selected .overlay { background: rgba($yellow, .5); }
35
+ li.will-destroy .overlay,
36
+ li.selected.will-destroy .overlay { background: rgba($red, .5); }
37
+
38
+ // image + overlay
39
+ li .image,
40
+ li .overlay {
41
+ left: 0;
42
+ position: absolute;
43
+ top: 0;
44
+ }
45
+
46
+ li .image {
47
+ z-index: 0;
48
+ }
49
+
50
+ li .overlay {
51
+ background: rgba(black, .5);
52
+ display: none;
53
+ z-index: 1;
54
+ }
55
+
56
+ // label
57
+ li label {
58
+ @include border-radius(2px);
59
+ background: #fff;
60
+ bottom: 6px;
61
+ color: #4f4f4f;
62
+ font-size: 9px;
63
+ height: 16px;
64
+ line-height: 16px;
65
+ left: 9px;
66
+ overflow: hidden;
67
+ padding: 2px 6px 1px;
68
+ position: absolute;
69
+ right: 9px;
70
+ text-overflow: ellipsis;
71
+ white-space: nowrap;
72
+ z-index: 2;
73
+ }
74
+
75
+ }
data/lib/lalala/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.0.0"
3
- BUILD = "58"
3
+ BUILD = "59"
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.0.0.dev.58
4
+ version: 4.0.0.dev.59
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -1395,6 +1395,7 @@ files:
1395
1395
  - app/assets/stylesheets/lalala/modules/_filter-form.css.scss
1396
1396
  - app/assets/stylesheets/lalala/modules/_flashes.css.scss
1397
1397
  - app/assets/stylesheets/lalala/modules/_footer.css.scss
1398
+ - app/assets/stylesheets/lalala/modules/_grid.css.scss
1398
1399
  - app/assets/stylesheets/lalala/modules/_grids.css.scss
1399
1400
  - app/assets/stylesheets/lalala/modules/_header.css.scss
1400
1401
  - app/assets/stylesheets/lalala/modules/_index-as-table.css.scss