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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8da46db8e307afe4c54379e709b33f76fd6fdb19
-  data.tar.gz: 79ef58a57f5a9fe9828aa6f917c1358bd3c7835d
+  metadata.gz: 0db94ab784c371f78c0b7d3ca314b731b1345ee2
+  data.tar.gz: b825d39affab7c8b58bd7ea3df71e363ffc33a3e
 SHA512:
-  metadata.gz: 4c107a035bade464b87f38d5c2deb6e6ec5b44808b414216e2e7cdf974fea5f346bbaf067d38040ded938efcc212ba6026a58ed1285adbfa7090f06066bb5937
-  data.tar.gz: 5822c71ef0b0c119def51691f97817d7f52ab52035180541a4eded8aa55987863a5355b9e6ab04936818c8c6a2fd3418051d5f72c8d8ed1ce62917defa3ee89f
+  metadata.gz: 064c416f9d16f0418ca74fedd11f2c172cdc8006b44ede0d424844c114995d2bf155dcbc98e87250cd9540109e309d6ad5f24126ee40e510f6234e2c95a3145d
+  data.tar.gz: bbbae2bff4d9043c0b6c7e6ac02d74f836173264776f7d0592c6c615ce672042867fbdeb9e251b93e0e9bbab0cd2f7e0af09cb17cf3d17ca5a047060868db1e5

data/app/assets/stylesheets/lalala/components/_buttons.css.scss

@@ -52,6 +52,11 @@
     padding-left: 29px;
   }
 
+  // TODO: gray button
+  &.gray {
+    background-color: gray(200);
+  }
+
   // green button
   &.green {
     background-color: $button_green;

data/app/assets/stylesheets/lalala/components/_forms.css.scss

@@ -108,7 +108,7 @@ select:focus {
 // groups
 .inputs,
 .actions {
-  @extend .inner;
+  // @extend .inner;
 
   ul, ol {
     list-style: none;

data/lalala-assets.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'lalala',               Lalala::BUILD_VERSION
   gem.add_runtime_dependency 'coffee-rails',         '= 3.2.2'
   gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
-  gem.add_runtime_dependency 'compass',              '= 0.13.alpha.0'
-  gem.add_runtime_dependency 'compass-rails',        '= 1.0.3'
-  gem.add_runtime_dependency 'sass',                 '= 3.2.16'
+  gem.add_runtime_dependency 'compass',              '= 1.0.0.alpha.19'
+  gem.add_runtime_dependency 'compass-rails',        '= 1.1.7'
+  gem.add_runtime_dependency 'sass',                 '= 3.3.4'
   gem.add_runtime_dependency 'sass-rails',           '= 3.2.6'
   gem.add_runtime_dependency 'sprockets-commonjs',   '= 0.0.5'
   gem.add_runtime_dependency 'uglifier',             '= 1.3.0'

data/lib/lalala/markdown/html_renderer.rb

@@ -57,7 +57,7 @@ class Lalala::Markdown::HtmlRenderer < Redcarpet::Render::HTML
     end
 
     options = (@options[:link_attributes] || {}).merge(title: title)
-    helpers.link_to(content, link, options)
+    helpers.link_to(content.html_safe, link, options)
   end
 
   def enhanced_autolink(scheme, link, link_type)

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "329"
+  BUILD   = "331"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.329
+  version: 4.0.0.dev.331
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin