Convert span into col-md

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

41 files changed, 96 insertions, 96 deletions

diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index bd15ae72c86..1cbfc4ac1f8 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -4,7 +4,7 @@
   You can manage projects, users and other GitLab data from here.
 %hr
 .admin_dash.row
-  .span4
+  .col-md-4
     .light-well
       %h4 Projects
       .data
@@ -12,7 +12,7 @@
           %h1= Project.count
         %hr
         = link_to 'New Project', new_project_path, class: "btn btn-new"
-  .span4
+  .col-md-4
     .light-well
       %h4 Users
       .data
@@ -20,7 +20,7 @@
           %h1= User.count
         %hr
         = link_to 'New User', new_admin_user_path, class: "btn btn-new"
-  .span4
+  .col-md-4
     .light-well
       %h4 Groups
       .data
@@ -30,7 +30,7 @@
         = link_to 'New Group', new_admin_group_path, class: "btn btn-new"
 
 .row.prepend-top-10
-  .span4
+  .col-md-4
     %h4 Latest projects
     %hr
     - @projects.each do |project|
@@ -39,7 +39,7 @@
         %span.light.pull-right
           #{time_ago_with_tooltip(project.created_at)}
 
-  .span4
+  .col-md-4
     %h4 Latest users
     %hr
     - @users.each do |user|
@@ -49,7 +49,7 @@
         %span.light.pull-right
           #{time_ago_with_tooltip(user.created_at)}
 
-  .span4
+  .col-md-4
     %h4 Latest groups
     %hr
     - @groups.each do |group|
@@ -61,7 +61,7 @@
 
 %br
 .row
-  .span4
+  .col-md-4
     %h4 Stats
     %hr
     %p
@@ -92,7 +92,7 @@
       Milestones
       %span.light.pull-right
         = Milestone.count
-  .span4
+  .col-md-4
     %h4
       Features
     %hr
@@ -112,7 +112,7 @@
       OmniAuth
       %span.light.pull-right
         = boolean_to_icon Gitlab.config.omniauth.enabled
-  .span4
+  .col-md-4
     %h4 Components
     %hr
     %p
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 4d0522393dd..235588fe367 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -6,7 +6,7 @@
     Edit
 %hr
 .row
-  .span6
+  .col-md-6
     .ui-box
       .title
         Group info:
@@ -44,7 +44,7 @@
             %span.pull-right.light
               %span.monospace= project.path_with_namespace + ".git"
 
-  .span6
+  .col-md-6
     .ui-box
       .title
         Add user(s) to the group:
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index d2f827e083c..dad75678ddb 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,5 +1,5 @@
 .row
-  .span4
+  .col-md-4
     .admin-filter
       = form_tag admin_projects_path, method: :get, class: 'form-inline' do
         .control-group
@@ -37,7 +37,7 @@
         .form-actions
           = submit_tag "Search", class: "btn submit btn-primary"
           = link_to "Reset", admin_projects_path, class: "btn"
-  .span8
+  .col-md-8
     .ui-box
       .title
         Projects (#{@projects.total_count})
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 74c2d63c828..0a90655cd24 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -5,7 +5,7 @@
     Edit
 %hr
 .row
-  .span6
+  .col-md-6
     .ui-box
       .title
         Project info:
@@ -89,7 +89,7 @@
             .controls
               = f.submit 'Transfer', class: 'btn btn-primary'
 
-  .span6
+  .col-md-6
     - if @group
       .ui-box
         .title
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 9ccbcd868c0..6e3b7337ab3 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -47,7 +47,7 @@
     %fieldset
       %legend Access
       .row
-        .span8
+        .col-md-8
           .control-group
             = f.label :projects_limit
             .controls= f.number_field :projects_limit
@@ -60,7 +60,7 @@
             = f.label :admin do
               %strong.cred Administrator
             .controls= f.check_box :admin
-        .span4
+        .col-md-4
           - unless @user.new_record?
             .alert.alert-error
               - if @user.blocked?
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 5bc73d11f31..55b57b5ebd8 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -1,5 +1,5 @@
 .row
-  .span3
+  .col-md-3
     .admin-filter
       = form_tag admin_users_path, method: :get, class: 'form-inline' do
         = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'input-xpadding span2'
@@ -25,7 +25,7 @@
       %hr
       = link_to 'Reset', admin_users_path, class: "btn btn-cancel"
 
-  .span9
+  .col-md-9
     .ui-box
       .title
         Users (#{@users.total_count})
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index e79cdbb978b..71c12a18783 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -13,7 +13,7 @@
 %hr
 
 .row
-  .span6
+  .col-md-6
     .ui-box
       .title
         Account:
@@ -116,7 +116,7 @@
               %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
         = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
 
-  .span6
+  .col-md-6
     - if @user.users_groups.present?
       .ui-box
         .title Groups:
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index bda5b7c9147..19bd4e7bd54 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -7,7 +7,7 @@
 %hr
 
 .row
-  .span3
+  .col-md-3
     = render 'shared/filter', entity: 'issue'
-  .span9
+  .col-md-9
     = render 'shared/issues'
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 74d02336bb8..b487a4d6666 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -7,7 +7,7 @@
   List all merge requests from all project's you have access to.
 %hr
 .row
-  .span3
+  .col-md-3
     = render 'shared/filter', entity: 'merge_request'
-  .span9
+  .col-md-9
     = render 'shared/merge_requests'
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index c59d5aee0ac..33bd40743dc 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -25,7 +25,7 @@
   All projects you have access to are listed here. Public projects are not included here unless you are a member
 %hr
 .row
-  .span3
+  .col-md-3
     %ul.nav.nav-pills.nav-stacked
       = nav_tab :scope, nil do
         = link_to projects_dashboard_filter_path(scope: nil) do
@@ -81,7 +81,7 @@
                 %i.icon-tag
                 = label.name
 
-  .span9
+  .col-md-9
     %ul.bordered-list.my-projects.top-list
       - @projects.each do |project|
         %li.my-project-row
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index 2305eae1f71..b2198f76fb3 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -1,8 +1,8 @@
 - if @has_authorized_projects
   .dashboard
-    .activities.span8
+    .activities.col-md-8
       = render 'activities'
-    .side.span4
+    .side.col-md-4
       = render 'sidebar'
 
 - else
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 7a204d89cd1..4008624a641 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -1,5 +1,5 @@
 .row
-  .span2
+  .col-md-2
     %ul.nav.nav-pills.nav-stacked.nav-stacked-menu
       %li.active
         = link_to '#tab-edit', 'data-toggle' => 'tab' do
@@ -12,7 +12,7 @@
       %li
         = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab'
 
-  .span10
+  .col-md-10
     .tab-content
       .tab-pane.active#tab-edit
         .ui-box
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 482613f172d..e19a07250a4 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -9,7 +9,7 @@
 %hr
 
 .row
-  .span3
+  .col-md-3
     = render 'shared/filter', entity: 'issue'
-  .span9
+  .col-md-9
     = render 'shared/issues'
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index 8a9b03535bc..83ffa579fdc 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -8,7 +8,7 @@
   group. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
 %hr
 .row
-  .span3
+  .col-md-3
     = render 'shared/filter', entity: 'merge_request'
-  .span9
+  .col-md-9
     = render 'shared/merge_requests'
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index e613ed3eaa3..f4925b434d3 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,5 +1,5 @@
 .dashboard
-  .activities.span8
+  .activities.col-md-8
     = render "events/event_last_push", event: @last_push
     = link_to dashboard_path, class: 'btn btn-tiny' do
       ← To dashboard
@@ -12,7 +12,7 @@
     - else
       %p.nothing_here_message Project activity will be displayed here
     .loading.hide
-  .side.span4
+  .side.col-md-4
     - if @group.description.present?
       .description-block
         = @group.description
diff --git a/app/views/help/_api_layout.html.haml b/app/views/help/_api_layout.html.haml
index 502cc31a80c..c211b658410 100644
--- a/app/views/help/_api_layout.html.haml
+++ b/app/views/help/_api_layout.html.haml
@@ -1,5 +1,5 @@
 .row
-  .span3
+  .col-md-3
     .append-bottom-20
       = link_to help_path, class: 'btn btn-small' do
         %i.icon-angle-left
@@ -9,5 +9,5 @@
         %li{class: file == @category ? 'active' : nil}
           = link_to file.titleize, help_api_file_path(file)
 
-  .span9.pull-right
+  .col-md-9.pull-right
     = yield
diff --git a/app/views/help/_layout.html.haml b/app/views/help/_layout.html.haml
index 7928937c60a..fc0ac277a48 100644
--- a/app/views/help/_layout.html.haml
+++ b/app/views/help/_layout.html.haml
@@ -1,5 +1,5 @@
 .row
-  .span3{:"data-spy" => 'affix'}
+  .col-md-3{:"data-spy" => 'affix'}
     %h3.page-title Help
     %ul.nav.nav-pills.nav-stacked
       - links = {:"Workflow" => help_workflow_path, :"SSH Keys" => help_ssh_path, :"GitLab Markdown" => help_markdown_path, :"Permissions" => help_permissions_path, :"API" => help_api_path, :"Web Hooks" => help_web_hooks_path, :"Rake Tasks" => help_raketasks_path, :"System Hooks" => help_system_hooks_path, :"Public Access" => help_public_access_path, :"Security" => help_security_path}
@@ -7,5 +7,5 @@
         %li{class: current_page?(path) ? 'active' : nil}
           = link_to title, path
 
-  .span9.pull-right
+  .col-md-9.pull-right
     = yield
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 869f87df4db..1a5d1b35bda 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -11,7 +11,7 @@
     Read more about GitLab at #{link_to "gitlab.org", "http://gitlab.org/", target: "_blank"}.
 
 .row
-  .span4
+  .col-md-4
     .ui-box
       .title
         Quick help
@@ -35,7 +35,7 @@
           Browse our
           = link_to "issue tracker", "https://github.com/gitlabhq/gitlabhq/issues"
 
-  .span4
+  .col-md-4
     .ui-box
       .title
         User documentation
@@ -64,7 +64,7 @@
           %strong= link_to "Web Hooks", help_web_hooks_path
           %p Let GitLab notify you when new code has been pushed to your project.
 
-  .span4
+  .col-md-4
     .ui-box
       .title
         Admin documentation
diff --git a/app/views/layouts/project_settings.html.haml b/app/views/layouts/project_settings.html.haml
index 6a10d6cf9e1..a55f043f2cf 100644
--- a/app/views/layouts/project_settings.html.haml
+++ b/app/views/layouts/project_settings.html.haml
@@ -15,7 +15,7 @@
     .container
       .content
         .row
-          .span2
+          .col-md-2
             = render "projects/settings_nav"
-          .span10
+          .col-md-10
             = yield
diff --git a/app/views/profiles/keys/show.html.haml b/app/views/profiles/keys/show.html.haml
index a0a315a5b75..b6724a7cb5d 100644
--- a/app/views/profiles/keys/show.html.haml
+++ b/app/views/profiles/keys/show.html.haml
@@ -1,5 +1,5 @@
 .row
-  .span4
+  .col-md-4
     .ui-box
       .title
         SSH Key
@@ -11,7 +11,7 @@
           %span.light Created on:
           %strong= @key.created_at.stamp("Aug 21, 2011")
 
-  .span8
+  .col-md-8
     %p
       %span.light Fingerprint:
       %strong= @key.fingerprint
diff --git a/app/views/profiles/notifications/_settings.html.haml b/app/views/profiles/notifications/_settings.html.haml
index 5f62c8099d0..60fb405471e 100644
--- a/app/views/profiles/notifications/_settings.html.haml
+++ b/app/views/profiles/notifications/_settings.html.haml
@@ -1,6 +1,6 @@
 %li
   .row
-    .span4
+    .col-md-4
       %span
         = notification_icon(notification)
 
@@ -8,7 +8,7 @@
           = link_to membership.group.name, membership.group
         - else
           = link_to_project(membership.project)
-    .span7
+    .col-md-7
       = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
         = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type')
         = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id')
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index 8353b2f5f23..a25fe944b1b 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -18,11 +18,11 @@
     – You will receive all notifications from projects in which you participate
 
 .row
-  .span4
+  .col-md-4
     %h4
       = notification_icon(@notification)
       Global setting
-  .span7
+  .col-md-7
     = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
       = hidden_field_tag :notification_type, 'global'
 
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index ca3f8247223..6984deba6b8 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -15,7 +15,7 @@
         - @user.errors.full_messages.each do |msg|
           %li= msg
   .row
-    .span7
+    .col-md-7
       .control-group
         = f.label :name, class: "control-label"
         .controls
@@ -52,7 +52,7 @@
           = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
           %span.help-block Tell us about yourself in fewer than 250 characters.
 
-    .span5.pull-right
+    .col-md-5.pull-right
       .light-well
         = image_tag avatar_icon(@user.email, 160), alt: '', class: 'avatar s160'
 
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index acb85fa0fd9..880b53faf80 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -1,14 +1,14 @@
 - empty_repo = @project.empty_repo?
 .project-home-panel{:class => ("empty-project" if empty_repo)}
   .row
-    .span6
+    .col-md-6
       %h4.project-home-title
         = @project.name_with_namespace
         %span.visibility-level-label
           = visibility_level_icon(@project.visibility_level)
           = visibility_level_label(@project.visibility_level)
 
-    .span6
+    .col-md-6
       - unless empty_repo
         .project-home-dropdown
           = render "dropdown"
@@ -16,7 +16,7 @@
         = render "shared/clone_panel"
 
   .project-home-extra.clearfix.row
-    .project-home-desc.span8
+    .project-home-desc.col-md-8
       - if @project.description.present?
         = @project.description
       - if can?(current_user, :admin_project, @project)
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 45b9c6c8521..690df98a2ab 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -1,10 +1,10 @@
 = render "projects/commits/head"
 .row
-  .span3
+  .col-md-3
     = render "filter"
-  .span9
+  .col-md-9
     - unless @branches.empty?
       %ul.bordered-list.top-list
         - @branches.each do |branch|
           = render "projects/branches/branch", branch: branch
-      = paginate @branches, theme: 'gitlab'
\ No newline at end of file
+      = paginate @branches, theme: 'gitlab'
diff --git a/app/views/projects/branches/recent.html.haml b/app/views/projects/branches/recent.html.haml
index 25f416c78f2..37d7919121e 100644
--- a/app/views/projects/branches/recent.html.haml
+++ b/app/views/projects/branches/recent.html.haml
@@ -1,8 +1,8 @@
 = render "projects/commits/head"
 .row
-  .span3
+  .col-md-3
     = render "filter"
-  .span9
+  .col-md-9
     %ul.bordered-list.top-list
       - @branches.each do |branch|
-        = render "projects/branches/branch", branch: branch
\ No newline at end of file
+        = render "projects/branches/branch", branch: branch
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index b6404778073..e3411b62eb6 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -1,11 +1,11 @@
 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
   .row.commits-row
-    .span2
+    .col-md-2
       %h4
         %i.icon-calendar
         %span= day.stamp("28 Aug, 2010")
       %p= pluralize(commits.count, 'commit')
-    .span10
+    .col-md-10
       %ul.well-list
         = render commits, project: @project
   %hr.lists-separator
diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml
index 53d6e36c62c..fe847630e06 100644
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@@ -12,7 +12,7 @@
 %hr.clearfix
 
 .row
-  .span5.enabled-keys
+  .col-md-5.enabled-keys
     %h5
       %strong.cgreen Enabled deploy keys
       for this project
@@ -21,7 +21,7 @@
       - if @enabled_keys.blank?
         .light-well
           %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
-  .span5.available-keys
+  .col-md-5.available-keys
     %h5
       %strong Deploy keys
       from projects available to you
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 3694798a749..71a89af61a2 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,6 +1,6 @@
 = render "head"
 .row
-  .span3
+  .col-md-3
     = render 'shared/project_filter', project_entities_path: project_issues_path(@project)
-  .span9.issues-holder
+  .col-md-9.issues-holder
     = render "issues"
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 5f55208edbf..e8daaf23f85 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -25,7 +25,7 @@
         Edit
 
 .pull-right
-  .span3#votes= render 'votes/votes_block', votable: @issue
+  .col-md-3#votes= render 'votes/votes_block', votable: @issue
 
 .back-link
   = link_to project_issues_path(@project) do
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 3b94bbd690b..1e3a83a257e 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -7,7 +7,7 @@
 
   .merge-request-branches
     .row
-      .span5
+      .col-md-5
         .clearfix
           .pull-left
             = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project chosen span3', disabled: @merge_request.persisted? })
@@ -15,10 +15,10 @@
              
             = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span2'})
         .mr_source_commit.prepend-top-10
-      .span2
+      .col-md-2
         %h2.merge-request-angle.light
           %i.icon-long-arrow-right
-      .span5
+      .col-md-5
         .clearfix
           .pull-left
             - projects =  @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index e256ee2153c..d6d0cde85be 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -8,9 +8,9 @@
 
 
 .row
-  .span3
+  .col-md-3
     = render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project)
-  .span9
+  .col-md-9
     .ui-box
       .title
         .mr-filters
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 118c5b02462..09495ece59d 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -35,7 +35,7 @@
           Edit
 
 .pull-right
-  .span3#votes= render 'votes/votes_block', votable: @merge_request
+  .col-md-3#votes= render 'votes/votes_block', votable: @merge_request
 
 .back-link
   = link_to project_merge_requests_path(@project) do
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index b2fd1a9284d..ac99a0e3796 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -12,7 +12,7 @@
         - @milestone.errors.full_messages.each do |msg|
           %li= msg
   .row
-    .span6
+    .col-md-6
       .control-group
         = f.label :title, "Title", class: "control-label"
         .controls
@@ -23,7 +23,7 @@
         .controls
           = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
           %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
-    .span6
+    .col-md-6
       .control-group
         = f.label :due_date, "Due Date", class: "control-label"
         .controls= f.hidden_field :due_date
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index ddb46bcb5cb..cc71434af23 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -8,7 +8,7 @@
         New Milestone
 
   .row
-    .span3
+    .col-md-3
       %ul.nav.nav-pills.nav-stacked
         %li{class: ("active" if (params[:f] == "active" || !params[:f]))}
           = link_to project_milestones_path(@project, f: "active") do
@@ -19,7 +19,7 @@
         %li{class: ("active" if params[:f] == "all")}
           = link_to project_milestones_path(@project, f: "all") do
             All
-    .span9
+    .col-md-9
       .ui-box
         %ul.well-list
           = render @milestones
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 74a32832388..94c0abae5a3 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -72,22 +72,22 @@
 .tab-content
   .tab-pane.active#tab-issues
     .row
-      .span4
+      .col-md-4
         = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned)
-      .span4
+      .col-md-4
         = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned)
-      .span4
+      .col-md-4
         = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed)
 
   .tab-pane#tab-merge-requests
     .row
-      .span6
+      .col-md-6
         .ui-box
           .title Open
           %ul.well-list
             - @merge_requests.opened.each do |merge_request|
               = render 'merge_request', merge_request: merge_request
-      .span6
+      .col-md-6
         .ui-box
           .title Closed
           %ul.well-list
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index 3257ab9d41e..4ecd682113d 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -1,8 +1,8 @@
 = render "projects/commits/head"
 .row
-  .span3
+  .col-md-3
     = render "projects/branches/filter"
-  .span9
+  .col-md-9
     .alert.alert-info
       %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
       %p This ability allows:
@@ -21,7 +21,7 @@
 
         .entry.clearfix
           = f.label :name, "Branch"
-          .span3
+          .col-md-3
             = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "chosen span3"})
            
           = f.submit 'Protect', class: "btn-create btn"
diff --git a/app/views/projects/repositories/stats.html.haml b/app/views/projects/repositories/stats.html.haml
index 679b4211cde..fd353978572 100644
--- a/app/views/projects/repositories/stats.html.haml
+++ b/app/views/projects/repositories/stats.html.haml
@@ -1,6 +1,6 @@
 = render "projects/commits/head"
 .row
-  .span6
+  .col-md-6
     %div#activity-chart.chart
     %hr
     %p
@@ -14,7 +14,7 @@
       %span= @stats.authors_count
 
 
-  .span6
+  .col-md-6
     %h4 Top 50 Committers:
     %ol.styled
       - @stats.authors[0...50].each do |author|
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index d2ced59f2c6..8eac4cb4e2d 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -1,12 +1,12 @@
 = render "home_panel"
 
 .row
-  .span9
+  .col-md-9
     = render "events/event_last_push", event: @last_push
     = render 'shared/event_filter'
     .content_list
     .loading.hide
-  .span3.project-side
+  .col-md-3.project-side
     .clearfix
       - if @project.archived?
         .alert
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index 51030f965a1..bf712b2c7e7 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -11,7 +11,7 @@
 %hr
 
 .row
-  .span3
+  .col-md-3
     %ul.nav.nav-pills.nav-stacked
       = nav_tab :scope, nil do
         = link_to user_snippets_path(@user) do
@@ -29,6 +29,6 @@
           %span.pull-right
             = @user.snippets.public.count
 
-  .span9.my-snippets
+  .col-md-9.my-snippets
     = render 'snippets'
 
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 53a0a9232a4..566bbdb9311 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,5 +1,5 @@
 .row
-  .span8
+  .col-md-8
     %h3.page-title
       = image_tag avatar_icon(@user.email, 90), class: "avatar s90", alt: ''
       = @user.name
@@ -16,6 +16,6 @@
     %hr
     %h4 User Activity:
     = render @events
-  .span4
+  .col-md-4
     = render 'profile', user: @user
     = render 'projects', user: @user