7 files changed, 17 insertions, 10 deletions
diff --git a/app/assets/stylesheets/main/simple_form.css.scss b/app/assets/stylesheets/main/simple_form.css.scss
new file mode 100644
index 000000000..9282d89e0
--- /dev/null
+++ b/app/assets/stylesheets/main/simple_form.css.scss
@@ -0,0 +1,7 @@
+#workspace{
+
+    .submit{
+        @extend .col-md-offset-3;
+    }
+
+}
+\ No newline at end of file
diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb
index a03b1ee7e..8835c5773 100644
--- a/app/views/devise/invitations/edit.html.erb
+++ b/app/views/devise/invitations/edit.html.erb
@@ -9,7 +9,7 @@
         <%= form.input :password, :as => :password %>
         <%= form.input :password_confirmation, :as => :password %>
 
-        <div class="col-md-offset-2">
+        <div class="submit">
           <%= form.button :submit, :value => t("devise.invitations.edit.submit_button"), :class => "btn-info" %>
         </div>
       <% end %>
diff --git a/app/views/devise/invitations/new.html.erb b/app/views/devise/invitations/new.html.erb
index 2232020c9..5567463c8 100644
--- a/app/views/devise/invitations/new.html.erb
+++ b/app/views/devise/invitations/new.html.erb
@@ -9,7 +9,7 @@
             <%= form.input field %>
         <% end -%>
 
-        <div class="col-md-offset-2">
+        <div class="submit">
           <%= form.button :submit, :value => t("devise.invitations.new.submit_button"), :class => "btn-info" %>
         </div>  
       <% end %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index 7b408a149..e0cad44a2 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -8,7 +8,7 @@
       <%= f.input :password, :as => :password %>
       <%= f.input :password_confirmation, :as => :password %>
       
-      <div class="col-md-offset-2">
+      <div class="submit">
         <%= link_to t("cancel"), root_path, :class => "btn btn-default" %>    
         <%= f.button :submit, :value => t("devise.passwords.edit.commit"), :class => "btn-info" %>
       </div>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 865805319..8f5ec0f10 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -5,7 +5,7 @@
       <%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |form| %>
       <%= form.input :email, :as => :email, placeholder: 'user@domain.com'  %> 
 
-      <div class="col-md-offset-2">
+      <div class="submit">
         <%= link_to t("cancel"), root_path, :class => "btn btn-default" %>    
         <%= form.button :submit, :value => t("devise.passwords.new.commit"), :class => "btn-info" %>
       </div>
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index e2ad34eee..a128195d2 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -95,7 +95,7 @@ SimpleForm.setup do |config|
   # config.label_text = lambda { |label, required| "#{required} #{label}" }
 
   # You can define the class to use on all labels. Default is nil.
-  config.label_class = 'col-lg-2 control-label'
+  config.label_class = 'col-lg-3 control-label'
 
   # You can define the class to use on all forms. Default is simple_form.
   config.form_class = "simple_form form-horizontal"
@@ -132,7 +132,7 @@ SimpleForm.setup do |config|
   # config.default_input_size = 50
 
   # When false, do not use translations for labels.
-  # config.translate_labels = true
+  config.translate_labels = true
 
   # Automatically discover new inputs in Rails' autoload path.
   # config.inputs_discovery = false
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index c3dd5e348..552a2ff66 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -4,7 +4,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'col-lg-10' do |ba|
+    b.wrapper :tag => 'div', :class => 'col-lg-9' do |ba|
       ba.use :input
       ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
       ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
@@ -26,7 +26,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'col-lg-10' do |input|
+    b.wrapper :tag => 'div', :class => 'col-lg-9' do |input|
       input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
         prepend.use :input
       end
@@ -39,7 +39,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'col-lg-10' do |input|
+    b.wrapper :tag => 'div', :class => 'col-lg-9' do |input|
       input.wrapper :tag => 'div', :class => 'input-append' do |append|
         append.use :input
       end
@@ -54,5 +54,5 @@ SimpleForm.setup do |config|
   # buttons and other elements.
   config.default_wrapper = :bootstrap
   config.button_class = 'btn'
-  config.label_class = 'col-lg-2 control-label' 
+  config.label_class = 'col-lg-3 control-label' 
 end