lalala 4.0.0.dev.329 → 4.0.0.dev.331

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/lalala/components/_buttons.css.scss +5 -0
  3. data/app/assets/stylesheets/lalala/components/_forms.css.scss +1 -1
  4. data/lalala-assets.gemspec +3 -3
  5. data/lib/lalala/markdown/html_renderer.rb +1 -1
  6. data/lib/lalala/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8da46db8e307afe4c54379e709b33f76fd6fdb19
4
- data.tar.gz: 79ef58a57f5a9fe9828aa6f917c1358bd3c7835d
3
+ metadata.gz: 0db94ab784c371f78c0b7d3ca314b731b1345ee2
4
+ data.tar.gz: b825d39affab7c8b58bd7ea3df71e363ffc33a3e
5
5
  SHA512:
6
- metadata.gz: 4c107a035bade464b87f38d5c2deb6e6ec5b44808b414216e2e7cdf974fea5f346bbaf067d38040ded938efcc212ba6026a58ed1285adbfa7090f06066bb5937
7
- data.tar.gz: 5822c71ef0b0c119def51691f97817d7f52ab52035180541a4eded8aa55987863a5355b9e6ab04936818c8c6a2fd3418051d5f72c8d8ed1ce62917defa3ee89f
6
+ metadata.gz: 064c416f9d16f0418ca74fedd11f2c172cdc8006b44ede0d424844c114995d2bf155dcbc98e87250cd9540109e309d6ad5f24126ee40e510f6234e2c95a3145d
7
+ data.tar.gz: bbbae2bff4d9043c0b6c7e6ac02d74f836173264776f7d0592c6c615ce672042867fbdeb9e251b93e0e9bbab0cd2f7e0af09cb17cf3d17ca5a047060868db1e5
data/app/assets/stylesheets/lalala/components/_buttons.css.scss CHANGED
@@ -52,6 +52,11 @@
52
52
  padding-left: 29px;
53
53
  }
54
54
 
55
+ // TODO: gray button
56
+ &.gray {
57
+ background-color: gray(200);
58
+ }
59
+
55
60
  // green button
56
61
  &.green {
57
62
  background-color: $button_green;
data/app/assets/stylesheets/lalala/components/_forms.css.scss CHANGED
@@ -108,7 +108,7 @@ select:focus {
108
108
  // groups
109
109
  .inputs,
110
110
  .actions {
111
- @extend .inner;
111
+ // @extend .inner;
112
112
 
113
113
  ul, ol {
114
114
  list-style: none;
data/lalala-assets.gemspec CHANGED
@@ -31,9 +31,9 @@ Gem::Specification.new do |gem|
31
31
  gem.add_runtime_dependency 'lalala', Lalala::BUILD_VERSION
32
32
  gem.add_runtime_dependency 'coffee-rails', '= 3.2.2'
33
33
  gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
34
- gem.add_runtime_dependency 'compass', '= 0.13.alpha.0'
35
- gem.add_runtime_dependency 'compass-rails', '= 1.0.3'
36
- gem.add_runtime_dependency 'sass', '= 3.2.16'
34
+ gem.add_runtime_dependency 'compass', '= 1.0.0.alpha.19'
35
+ gem.add_runtime_dependency 'compass-rails', '= 1.1.7'
36
+ gem.add_runtime_dependency 'sass', '= 3.3.4'
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'
data/lib/lalala/markdown/html_renderer.rb CHANGED
@@ -57,7 +57,7 @@ class Lalala::Markdown::HtmlRenderer < Redcarpet::Render::HTML
57
57
  end
58
58
 
59
59
  options = (@options[:link_attributes] || {}).merge(title: title)
60
- helpers.link_to(content, link, options)
60
+ helpers.link_to(content.html_safe, link, options)
61
61
  end
62
62
 
63
63
  def enhanced_autolink(scheme, link, link_type)
data/lib/lalala/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.0.0"
3
- BUILD = "329"
3
+ BUILD = "331"
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.329
4
+ version: 4.0.0.dev.331
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: 2014-03-18 00:00:00.000000000 Z
16
+ date: 2014-04-02 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: activeadmin