lalala 4.0.0.dev.246 → 4.0.0.dev.249

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: bf1af9f05211fe2c365b13f1fb96f37524361105
4
- data.tar.gz: e6d0bfa79ae75e71dc936e8fdc0a26271e7076c8
3
+ metadata.gz: 9f33b33445dd34eda8de019fb0883039caf3c02a
4
+ data.tar.gz: 0d326d92d2a724c85b833d45990e3feb05966c57
5
5
  SHA512:
6
- metadata.gz: 3ab8a8effde66dc7c915c3d5caa1c9385ebda0f50ff3a4d06b4071ad47cbb1f004c714f9e2941c7d5dc8406853c866ec071ed7be62e139d0d7ea6b01364151f9
7
- data.tar.gz: 41ae0805aaacd22642f1777dcb6bdbbbceea619fa8c9f4d96c63d899bad7b8ff0d74624edfbe9141f7662e7232aef6bd9bc8952d2f7979e70974e4bbbb226a83
6
+ metadata.gz: 9649460231bd56a8df902547f1e45abd7d02e95336c79f468ae1606d3bac8d1ead38720fc2ff16aba880119d64d8bae78a14aa386f1419c822a604e9d3b873bf
7
+ data.tar.gz: 649ec533e839fea5d970fa013715db7c97767aae75f739ec678bb14def9a6d3b43581b2e6afa75ee7ab0011eec2c6139ceffc6b8ceaf46b2465804abc6d36f0f
@@ -7,11 +7,131 @@
7
7
  h3 {
8
8
  background-color: gray(220);
9
9
  color: $white;
10
+ font-size: 14px !important;
10
11
  font-weight: bold;
11
12
  padding: 10px;
13
+ margin: 0 !important;
12
14
  }
13
15
 
14
16
  .panel_contents {
15
17
  padding: 10px;
18
+
19
+ // LALALA specific styling
20
+ //
21
+ .lalala {
22
+ font-size: 13px;
23
+ line-height: 18px;
24
+
25
+ &.sidebar {
26
+
27
+ // intro message
28
+ &.message {
29
+ color: gray(180);
30
+ padding: 0 20px 10px 0;
31
+
32
+ strong {
33
+ font-weight: bold;
34
+ }
35
+ }
36
+
37
+ // person id-card
38
+ &.person {
39
+ text-align: center;
40
+
41
+ // optional img
42
+ .avatar {
43
+ @include border-radius(100px);
44
+ }
45
+
46
+ // name
47
+ h4 {
48
+ font-size: 16px;
49
+ font-weight: bold;
50
+ margin: 10px 0 0 0;
51
+ }
52
+
53
+ // detailed information
54
+ .details {
55
+ color: gray(180);
56
+ font-family: "Monaco";
57
+ font-size: 12px;
58
+ margin: 10px;
59
+ }
60
+
61
+ }
62
+
63
+ // listing, lists various elements (uls, divs, table, ...)
64
+ &.listing {
65
+ margin: 10px 0 0 0;
66
+
67
+ // plain div's
68
+ &.div {
69
+
70
+ .item {
71
+ border-bottom: 1px solid gray(220);
72
+ padding: 0 0 5px 0;
73
+ margin: 0 0 10px 0;
74
+ }
75
+
76
+ // last item has no border or margin
77
+ > :last-child {
78
+ border-bottom: none;
79
+ margin: 0;
80
+ }
81
+
82
+ }
83
+
84
+ // ul
85
+ &.ul {
86
+
87
+ .item {
88
+ border-bottom: 1px solid gray(220);
89
+ padding: 0 0 5px 0;
90
+ margin: 0 0 10px 0;
91
+ }
92
+
93
+ // last item has no border or margin
94
+ > :last-child {
95
+ border-bottom: none;
96
+ margin: 0;
97
+ }
98
+
99
+ }
100
+
101
+ // table
102
+ &.table {
103
+
104
+ table {
105
+ thead {
106
+ display: none;
107
+ }
108
+ tbody tr td {
109
+ padding: 7px 5px 6px 5px !important;
110
+ }
111
+ }
112
+
113
+ }
114
+
115
+ }
116
+
117
+ // element has a closing line
118
+ &.with-closing-line {
119
+ border-bottom: 1px solid gray(220);
120
+ }
121
+
122
+ .timeago {
123
+ color: $gray_lighter;
124
+ }
125
+
126
+ }
127
+
128
+ // default link style inside .panel_contents .lalala
129
+ a {
130
+ color: $blue;
131
+ text-decoration: none;
132
+ }
133
+
134
+ }
135
+
16
136
  }
17
137
  }
@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
33
33
  gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
34
34
  gem.add_runtime_dependency 'compass', '= 0.13.alpha.0'
35
35
  gem.add_runtime_dependency 'compass-rails', '= 1.0.3'
36
- gem.add_runtime_dependency 'sass', '= 3.2.12'
36
+ gem.add_runtime_dependency 'sass', '= 3.2.13'
37
37
  gem.add_runtime_dependency 'sass-rails', '= 3.2.6'
38
38
  gem.add_runtime_dependency 'sprockets-commonjs', '= 0.0.5'
39
39
  gem.add_runtime_dependency 'uglifier', '= 1.3.0'
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.0.0"
3
- BUILD = "246"
3
+ BUILD = "249"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
@@ -16,4 +16,81 @@ ActiveAdmin.register Article do
16
16
  f.actions
17
17
  end
18
18
 
19
+
20
+ sidebar "Related tags", :only => [:show] do
21
+
22
+ div :class => "lalala sidebar message", :id => "lalala_sidebar_message" do
23
+ "This is an intro block.... It is yours. It is the best <strong>intro block</strong> in the world. Click the link for a tag detail.".html_safe
24
+ end
25
+
26
+ div :class => "lalala sidebar message with-closing-line" do
27
+ "This is an intro block with a closing line.... It is yours. It is the best <strong>intro block</strong> in the world. Click the <a href='#'>link</a> for a tag detail.".html_safe
28
+ end
29
+
30
+ div :class => "lalala sidebar listing div" do
31
+
32
+ div :class => "item" do
33
+ span link_to("tag.title", "#")
34
+ div "2 days ago", { :class => "timeago", :title => "2 days ago" }
35
+ end
36
+
37
+ div :class => "item" do
38
+ div link_to("hoe laat zou het zijn", "#")
39
+ div "2 days ago", { :class => "timeago", :title => "2 days ago" }
40
+ end
41
+
42
+ div :class => "item" do
43
+ div link_to("maakt da nu eens mee seg, een te lange titel", "#")
44
+ div "2 days ago", { :class => "timeago", :title => "2 days ago" }
45
+ end
46
+
47
+ end
48
+
49
+ end
50
+
51
+ sidebar "User Information", :only => [:show] do
52
+ div :class => "lalala sidebar person" do
53
+
54
+ fallback_url = "#{root_url}assets/lalala/users/fallback.jpg"
55
+ gravatar_id = Digest::MD5.hexdigest("hanefaeffes@mrhenry.be")
56
+ default_url = "http://gravatar.com/avatar/#{gravatar_id}.png?s=100&d=" + CGI.escape(fallback_url)
57
+
58
+ img(:src => default_url, :class => "avatar")
59
+
60
+ h4 :class => "title" do
61
+ "Hans Spooren"
62
+ end
63
+
64
+ div :class => "details" do
65
+ "sex: m<br />e-mail: hans@mrhenry.be<br />address: kronenburgstraat 14, 2000 Antwerp".html_safe
66
+ end
67
+
68
+ div :class => "cta" do
69
+ link_to("view detailed info", "#")
70
+ end
71
+
72
+ end
73
+ end
74
+
75
+ sidebar "Help", :only => [:show] do
76
+ div :class => "lalala sidebar message", :id => "lalala_sidebar_message" do
77
+ "Test".html_safe
78
+ end
79
+
80
+ ul :class => "lalala sidebar listing ul" do
81
+
82
+ li :class => "item" do
83
+ span link_to("tag.title", "#")
84
+ div "2 days ago", { :class => "timeago", :title => "2 days ago" }
85
+ end
86
+
87
+ li :class => "item" do
88
+ span link_to("tag.title", "#")
89
+ div "2 days ago", { :class => "timeago", :title => "2 days ago" }
90
+ end
91
+
92
+ end
93
+
94
+ end
95
+
19
96
  end
@@ -17,4 +17,8 @@ class Article < ActiveRecord::Base
17
17
  # Bindings
18
18
  has_and_belongs_to_many :tags
19
19
 
20
+ def get_tags
21
+ self.tags
22
+ end
23
+
20
24
  end
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.246
4
+ version: 4.0.0.dev.249
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: 2013-12-16 00:00:00.000000000 Z
16
+ date: 2013-12-23 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: activeadmin
@@ -1296,6 +1296,7 @@ files:
1296
1296
  - app/assets/images/lalala/icons/zoom_out.png
1297
1297
  - app/assets/images/lalala/overlay-logo.png
1298
1298
  - app/assets/images/lalala/users/default.jpg
1299
+ - app/assets/images/lalala/users/fallback.jpg
1299
1300
  - app/assets/javascripts/browser/console.module.js
1300
1301
  - app/assets/javascripts/browser/document.module.js
1301
1302
  - app/assets/javascripts/browser/history.module.js