summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile.lock4
-rw-r--r--app/views/layouts/_content.html.haml4
-rw-r--r--lib/extensions/simple_form.rb2
-rw-r--r--lib/leap_web/version.rb2
4 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 8601b75..ca0cb63 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,13 @@
PATH
remote: engines/billing
specs:
- leap_web_billing (0.8.0)
+ leap_web_billing (0.8.1)
braintree
PATH
remote: engines/support
specs:
- leap_web_help (0.8.0)
+ leap_web_help (0.8.1)
PATH
remote: vendor/gems/certificate_authority
diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index 8e0bfbc..b72b7c1 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -10,10 +10,10 @@
- if @show_navigation && @user
.col-md-2
= render 'layouts/navigation'
- .col-md-10
+ .span10
= render 'layouts/messages'
= content
- else
- .col-md-12
+ .span12
= render 'layouts/messages'
= content
diff --git a/lib/extensions/simple_form.rb b/lib/extensions/simple_form.rb
index f255917..1e30e9f 100644
--- a/lib/extensions/simple_form.rb
+++ b/lib/extensions/simple_form.rb
@@ -2,7 +2,7 @@ module WrappedButton
def wrapped_button(*args, &block)
template.content_tag :div, :class => "form-actions" do
options = args.extract_options!
- options[:class] = ['btn-primary', options[:class]].compact
+ options[:class] = ['btn-primary', options[:class]].compact.flatten.join(' ')
args.unshift :loading
args << options
if cancel = options.delete(:cancel)
diff --git a/lib/leap_web/version.rb b/lib/leap_web/version.rb
index dc76dc6..6fc5531 100644
--- a/lib/leap_web/version.rb
+++ b/lib/leap_web/version.rb
@@ -1,3 +1,3 @@
module LeapWeb
- VERSION = "0.8.0" unless defined?(LeapWeb::VERSION)
+ VERSION = "0.8.1" unless defined?(LeapWeb::VERSION)
end