10 files changed, 30 insertions, 30 deletions
diff --git a/app/views/common/_action_buttons.html.haml b/app/views/common/_action_buttons.html.haml
index 81ebf67..eb663c0 100644
--- a/app/views/common/_action_buttons.html.haml
+++ b/app/views/common/_action_buttons.html.haml
@@ -1,14 +1,14 @@
 .home-buttons
-  .row-fluid.second
-    .login.span4
+  .row.second
+    .login.col-md-4
       %span.link= btn icon('ok-sign') + t(:login), login_path
       %span.info= t(:login_info, default: "")
     - if APP_CONFIG[:allow_registration]
-      .signup.span4
+      .signup.col-md-4
         %span.link= btn icon('user') + t(:signup), signup_path
         %span.info= t(:signup_info, default: "")
     - else
-      .signup.span4
-    .help.span4
+      .signup.col-md-4
+    .help.col-md-4
       %span.link= btn icon('question-sign') + t(:get_help), new_ticket_path
       %span.info= t(:support_info, default: "")
diff --git a/app/views/common/_download_button.html.haml b/app/views/common/_download_button.html.haml
index 9c26860..1278230 100644
--- a/app/views/common/_download_button.html.haml
+++ b/app/views/common/_download_button.html.haml
@@ -1,8 +1,8 @@
 .home-buttons
-  .row-fluid.first
-    .span2
-    .download.span8
+  .row.first
+    .col-md-2
+    .download.col-md-8
       = btn client_download_url, type: [:large, :primary] do
         = big_icon('download')
         = t(:download_bitmask)
-    .span2
+    .col-md-2
diff --git a/app/views/common/_home_page_buttons.html.haml b/app/views/common/_home_page_buttons.html.haml
index fc6348e..cfe3734 100644
--- a/app/views/common/_home_page_buttons.html.haml
+++ b/app/views/common/_home_page_buttons.html.haml
@@ -1,6 +1,6 @@
 = render 'common/download_button'
 - if local_assigns[:divider]
-  .row-fluid
-    .span12
+  .row
+    .col-md-12
       = render local_assigns[:divider]
 = render 'common/action_buttons'
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index d96a1e0..67e4533 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,12 +1,12 @@
-.row-fluid
+.row
   %h1= t(:welcome, :provider => APP_CONFIG[:domain])
   .p=t(:welcome_message_html)
 
-.row-fluid
+.row
   = home_page_buttons
 
   - if Rails.env == 'development'
-    .row-fluid
+    .row
       %hr
       %p
         = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index d5c2fa3..21d2e12 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -8,12 +8,12 @@
   - content = yield
 
 - if @show_navigation
-  .span2
+  .col-md-2
     = render 'layouts/navigation'
-  .span10
+  .col-md-10
     = render 'layouts/messages'
     = content
 - else
-  .span12
+  .col-md-12
     = render 'layouts/messages'
     = content
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0aeda8b..e242a5f 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -15,13 +15,13 @@
       #main
         .container-fluid
           - if @show_navigation && !admin?
-            .row-fluid
+            .row
               %h1= t(:user_control_panel)
           - if logged_in?
-            .row-fluid
-              .span12
+            .row
+              .col-md-12
                 = render 'layouts/header'
-          .row-fluid
+          .row
             = render 'layouts/content'
       #push
         -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index bb7e4bd..942c485 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -1,5 +1,5 @@
-.span1
-.span9
+.col-md-1
+.col-md-9
   %h2=t :login
   .lead=t :login_info
   = render :partial => 'users/warnings'
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
index bc0b1af..1b257d9 100644
--- a/app/views/users/new.html.haml
+++ b/app/views/users/new.html.haml
@@ -8,8 +8,8 @@
 
 - form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
 
-.span1
-.span9
+.col-md-1
+.col-md-9
   %h2=t :signup
   .lead=t :signup_info
   = render :partial => 'warnings'
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index da8e467..3bdf952 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,6 +1,6 @@
 = render 'overview'
 .container-fluid
-  .row-fluid
+  .row
     %h4 To use bitmask services:
     = btn client_download_url, type: "primary" do
       %i.icon-arrow-down.icon-white
diff --git a/engines/support/app/views/tickets/_edit_form.html.haml b/engines/support/app/views/tickets/_edit_form.html.haml
index cd1dbe4..8d64256 100644
--- a/engines/support/app/views/tickets/_edit_form.html.haml
+++ b/engines/support/app/views/tickets/_edit_form.html.haml
@@ -34,12 +34,12 @@
 = simple_form_for @ticket do |f|
   = hidden_ticket_fields
   = f.input :subject, input_html: {:class => 'large full-width'}
-  .row-fluid
-    .span4
+  .row
+    .col-md-4
       = f.input :is_open, as: :select, collection: [:true, :false], include_blank: false
-    .span4
+    .col-md-4
       = f.input :email
-    .span4
+    .col-md-4
       = f.input :regarding_user, label: (Ticket.human_attribute_name(:regarding_user) + " " + regarding_user_link).html_safe
   = f.button :loading
   - if admin?