Download as
Browse Code »

Commit 1b1a408a717b6ad1ca3f15bf1b13b8251a5a33e4

Authored by Dmitriy Zaporozhets
1 parent 447b46ca
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Convert span into col-md 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 41 changed files with 96 additions and 96 deletions   Show diff stats
app/views/admin/dashboard/index.html.haml
  Diff comments   View file @1b1a408
... ... @@ -4,7 +4,7 @@
4 4 You can manage projects, users and other GitLab data from here.
5 5 %hr
6 6 .admin_dash.row
7   - .span4
  7 + .col-md-4
8 8 .light-well
9 9 %h4 Projects
10 10 .data
... ... @@ -12,7 +12,7 @@
12 12 %h1= Project.count
13 13 %hr
14 14 = link_to 'New Project', new_project_path, class: "btn btn-new"
15   - .span4
  15 + .col-md-4
16 16 .light-well
17 17 %h4 Users
18 18 .data
... ... @@ -20,7 +20,7 @@
20 20 %h1= User.count
21 21 %hr
22 22 = link_to 'New User', new_admin_user_path, class: "btn btn-new"
23   - .span4
  23 + .col-md-4
24 24 .light-well
25 25 %h4 Groups
26 26 .data
... ... @@ -30,7 +30,7 @@
30 30 = link_to 'New Group', new_admin_group_path, class: "btn btn-new"
31 31  
32 32 .row.prepend-top-10
33   - .span4
  33 + .col-md-4
34 34 %h4 Latest projects
35 35 %hr
36 36 - @projects.each do |project|
... ... @@ -39,7 +39,7 @@
39 39 %span.light.pull-right
40 40 #{time_ago_with_tooltip(project.created_at)}
41 41  
42   - .span4
  42 + .col-md-4
43 43 %h4 Latest users
44 44 %hr
45 45 - @users.each do |user|
... ... @@ -49,7 +49,7 @@
49 49 %span.light.pull-right
50 50 #{time_ago_with_tooltip(user.created_at)}
51 51  
52   - .span4
  52 + .col-md-4
53 53 %h4 Latest groups
54 54 %hr
55 55 - @groups.each do |group|
... ... @@ -61,7 +61,7 @@
61 61  
62 62 %br
63 63 .row
64   - .span4
  64 + .col-md-4
65 65 %h4 Stats
66 66 %hr
67 67 %p
... ... @@ -92,7 +92,7 @@
92 92 Milestones
93 93 %span.light.pull-right
94 94 = Milestone.count
95   - .span4
  95 + .col-md-4
96 96 %h4
97 97 Features
98 98 %hr
... ... @@ -112,7 +112,7 @@
112 112 OmniAuth
113 113 %span.light.pull-right
114 114 = boolean_to_icon Gitlab.config.omniauth.enabled
115   - .span4
  115 + .col-md-4
116 116 %h4 Components
117 117 %hr
118 118 %p
... ...
app/views/admin/groups/show.html.haml
  Diff comments   View file @1b1a408
... ... @@ -6,7 +6,7 @@
6 6 Edit
7 7 %hr
8 8 .row
9   - .span6
  9 + .col-md-6
10 10 .ui-box
11 11 .title
12 12 Group info:
... ... @@ -44,7 +44,7 @@
44 44 %span.pull-right.light
45 45 %span.monospace= project.path_with_namespace + ".git"
46 46  
47   - .span6
  47 + .col-md-6
48 48 .ui-box
49 49 .title
50 50 Add user(s) to the group:
... ...
app/views/admin/projects/index.html.haml
  Diff comments   View file @1b1a408
1 1 .row
2   - .span4
  2 + .col-md-4
3 3 .admin-filter
4 4 = form_tag admin_projects_path, method: :get, class: 'form-inline' do
5 5 .control-group
... ... @@ -37,7 +37,7 @@
37 37 .form-actions
38 38 = submit_tag "Search", class: "btn submit btn-primary"
39 39 = link_to "Reset", admin_projects_path, class: "btn"
40   - .span8
  40 + .col-md-8
41 41 .ui-box
42 42 .title
43 43 Projects (#{@projects.total_count})
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @1b1a408
... ... @@ -5,7 +5,7 @@
5 5 Edit
6 6 %hr
7 7 .row
8   - .span6
  8 + .col-md-6
9 9 .ui-box
10 10 .title
11 11 Project info:
... ... @@ -89,7 +89,7 @@
89 89 .controls
90 90 = f.submit 'Transfer', class: 'btn btn-primary'
91 91  
92   - .span6
  92 + .col-md-6
93 93 - if @group
94 94 .ui-box
95 95 .title
... ...
app/views/admin/users/_form.html.haml
  Diff comments   View file @1b1a408
... ... @@ -47,7 +47,7 @@
47 47 %fieldset
48 48 %legend Access
49 49 .row
50   - .span8
  50 + .col-md-8
51 51 .control-group
52 52 = f.label :projects_limit
53 53 .controls= f.number_field :projects_limit
... ... @@ -60,7 +60,7 @@
60 60 = f.label :admin do
61 61 %strong.cred Administrator
62 62 .controls= f.check_box :admin
63   - .span4
  63 + .col-md-4
64 64 - unless @user.new_record?
65 65 .alert.alert-error
66 66 - if @user.blocked?
... ...
app/views/admin/users/index.html.haml
  Diff comments   View file @1b1a408
1 1 .row
2   - .span3
  2 + .col-md-3
3 3 .admin-filter
4 4 = form_tag admin_users_path, method: :get, class: 'form-inline' do
5 5 = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'input-xpadding span2'
... ... @@ -25,7 +25,7 @@
25 25 %hr
26 26 = link_to 'Reset', admin_users_path, class: "btn btn-cancel"
27 27  
28   - .span9
  28 + .col-md-9
29 29 .ui-box
30 30 .title
31 31 Users (#{@users.total_count})
... ...
app/views/admin/users/show.html.haml
  Diff comments   View file @1b1a408
... ... @@ -13,7 +13,7 @@
13 13 %hr
14 14  
15 15 .row
16   - .span6
  16 + .col-md-6
17 17 .ui-box
18 18 .title
19 19 Account:
... ... @@ -116,7 +116,7 @@
116 116 %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
117 117 = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
118 118  
119   - .span6
  119 + .col-md-6
120 120 - if @user.users_groups.present?
121 121 .ui-box
122 122 .title Groups:
... ...
app/views/dashboard/issues.html.haml
  Diff comments   View file @1b1a408
... ... @@ -7,7 +7,7 @@
7 7 %hr
8 8  
9 9 .row
10   - .span3
  10 + .col-md-3
11 11 = render 'shared/filter', entity: 'issue'
12   - .span9
  12 + .col-md-9
13 13 = render 'shared/issues'
... ...
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @1b1a408
... ... @@ -7,7 +7,7 @@
7 7 List all merge requests from all project's you have access to.
8 8 %hr
9 9 .row
10   - .span3
  10 + .col-md-3
11 11 = render 'shared/filter', entity: 'merge_request'
12   - .span9
  12 + .col-md-9
13 13 = render 'shared/merge_requests'
... ...
app/views/dashboard/projects.html.haml
  Diff comments   View file @1b1a408
... ... @@ -25,7 +25,7 @@
25 25 All projects you have access to are listed here. Public projects are not included here unless you are a member
26 26 %hr
27 27 .row
28   - .span3
  28 + .col-md-3
29 29 %ul.nav.nav-pills.nav-stacked
30 30 = nav_tab :scope, nil do
31 31 = link_to projects_dashboard_filter_path(scope: nil) do
... ... @@ -81,7 +81,7 @@
81 81 %i.icon-tag
82 82 = label.name
83 83  
84   - .span9
  84 + .col-md-9
85 85 %ul.bordered-list.my-projects.top-list
86 86 - @projects.each do |project|
87 87 %li.my-project-row
... ...
app/views/dashboard/show.html.haml
  Diff comments   View file @1b1a408
1 1 - if @has_authorized_projects
2 2 .dashboard
3   - .activities.span8
  3 + .activities.col-md-8
4 4 = render 'activities'
5   - .side.span4
  5 + .side.col-md-4
6 6 = render 'sidebar'
7 7  
8 8 - else
... ...
app/views/groups/edit.html.haml
  Diff comments   View file @1b1a408
1 1 .row
2   - .span2
  2 + .col-md-2
3 3 %ul.nav.nav-pills.nav-stacked.nav-stacked-menu
4 4 %li.active
5 5 = link_to '#tab-edit', 'data-toggle' => 'tab' do
... ... @@ -12,7 +12,7 @@
12 12 %li
13 13 = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab'
14 14  
15   - .span10
  15 + .col-md-10
16 16 .tab-content
17 17 .tab-pane.active#tab-edit
18 18 .ui-box
... ...
app/views/groups/issues.html.haml
  Diff comments   View file @1b1a408
... ... @@ -9,7 +9,7 @@
9 9 %hr
10 10  
11 11 .row
12   - .span3
  12 + .col-md-3
13 13 = render 'shared/filter', entity: 'issue'
14   - .span9
  14 + .col-md-9
15 15 = render 'shared/issues'
... ...
app/views/groups/merge_requests.html.haml
  Diff comments   View file @1b1a408
... ... @@ -8,7 +8,7 @@
8 8 group. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
9 9 %hr
10 10 .row
11   - .span3
  11 + .col-md-3
12 12 = render 'shared/filter', entity: 'merge_request'
13   - .span9
  13 + .col-md-9
14 14 = render 'shared/merge_requests'
... ...
app/views/groups/show.html.haml
  Diff comments   View file @1b1a408
1 1 .dashboard
2   - .activities.span8
  2 + .activities.col-md-8
3 3 = render "events/event_last_push", event: @last_push
4 4 = link_to dashboard_path, class: 'btn btn-tiny' do
5 5 &larr; To dashboard
... ... @@ -12,7 +12,7 @@
12 12 - else
13 13 %p.nothing_here_message Project activity will be displayed here
14 14 .loading.hide
15   - .side.span4
  15 + .side.col-md-4
16 16 - if @group.description.present?
17 17 .description-block
18 18 = @group.description
... ...
app/views/help/_api_layout.html.haml
  Diff comments   View file @1b1a408
1 1 .row
2   - .span3
  2 + .col-md-3
3 3 .append-bottom-20
4 4 = link_to help_path, class: 'btn btn-small' do
5 5 %i.icon-angle-left
... ... @@ -9,5 +9,5 @@
9 9 %li{class: file == @category ? 'active' : nil}
10 10 = link_to file.titleize, help_api_file_path(file)
11 11  
12   - .span9.pull-right
  12 + .col-md-9.pull-right
13 13 = yield
... ...
app/views/help/_layout.html.haml
  Diff comments   View file @1b1a408
1 1 .row
2   - .span3{:"data-spy" => 'affix'}
  2 + .col-md-3{:"data-spy" => 'affix'}
3 3 %h3.page-title Help
4 4 %ul.nav.nav-pills.nav-stacked
5 5 - 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 @@
7 7 %li{class: current_page?(path) ? 'active' : nil}
8 8 = link_to title, path
9 9  
10   - .span9.pull-right
  10 + .col-md-9.pull-right
11 11 = yield
... ...
app/views/help/index.html.haml
  Diff comments   View file @1b1a408
... ... @@ -11,7 +11,7 @@
11 11 Read more about GitLab at #{link_to "gitlab.org", "http://gitlab.org/", target: "_blank"}.
12 12  
13 13 .row
14   - .span4
  14 + .col-md-4
15 15 .ui-box
16 16 .title
17 17 Quick help
... ... @@ -35,7 +35,7 @@
35 35 Browse our
36 36 = link_to "issue tracker", "https://github.com/gitlabhq/gitlabhq/issues"
37 37  
38   - .span4
  38 + .col-md-4
39 39 .ui-box
40 40 .title
41 41 User documentation
... ... @@ -64,7 +64,7 @@
64 64 %strong= link_to "Web Hooks", help_web_hooks_path
65 65 %p Let GitLab notify you when new code has been pushed to your project.
66 66  
67   - .span4
  67 + .col-md-4
68 68 .ui-box
69 69 .title
70 70 Admin documentation
... ...
app/views/layouts/project_settings.html.haml
  Diff comments   View file @1b1a408
... ... @@ -15,7 +15,7 @@
15 15 .container
16 16 .content
17 17 .row
18   - .span2
  18 + .col-md-2
19 19 = render "projects/settings_nav"
20   - .span10
  20 + .col-md-10
21 21 = yield
... ...
app/views/profiles/keys/show.html.haml
  Diff comments   View file @1b1a408
1 1 .row
2   - .span4
  2 + .col-md-4
3 3 .ui-box
4 4 .title
5 5 SSH Key
... ... @@ -11,7 +11,7 @@
11 11 %span.light Created on:
12 12 %strong= @key.created_at.stamp("Aug 21, 2011")
13 13  
14   - .span8
  14 + .col-md-8
15 15 %p
16 16 %span.light Fingerprint:
17 17 %strong= @key.fingerprint
... ...
app/views/profiles/notifications/_settings.html.haml
  Diff comments   View file @1b1a408
1 1 %li
2 2 .row
3   - .span4
  3 + .col-md-4
4 4 %span
5 5 = notification_icon(notification)
6 6  
... ... @@ -8,7 +8,7 @@
8 8 = link_to membership.group.name, membership.group
9 9 - else
10 10 = link_to_project(membership.project)
11   - .span7
  11 + .col-md-7
12 12 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
13 13 = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type')
14 14 = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id')
... ...
app/views/profiles/notifications/show.html.haml
  Diff comments   View file @1b1a408
... ... @@ -18,11 +18,11 @@
18 18 &ndash; You will receive all notifications from projects in which you participate
19 19  
20 20 .row
21   - .span4
  21 + .col-md-4
22 22 %h4
23 23 = notification_icon(@notification)
24 24 Global setting
25   - .span7
  25 + .col-md-7
26 26 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
27 27 = hidden_field_tag :notification_type, 'global'
28 28  
... ...
app/views/profiles/show.html.haml
  Diff comments   View file @1b1a408
... ... @@ -15,7 +15,7 @@
15 15 - @user.errors.full_messages.each do |msg|
16 16 %li= msg
17 17 .row
18   - .span7
  18 + .col-md-7
19 19 .control-group
20 20 = f.label :name, class: "control-label"
21 21 .controls
... ... @@ -52,7 +52,7 @@
52 52 = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
53 53 %span.help-block Tell us about yourself in fewer than 250 characters.
54 54  
55   - .span5.pull-right
  55 + .col-md-5.pull-right
56 56 .light-well
57 57 = image_tag avatar_icon(@user.email, 160), alt: '', class: 'avatar s160'
58 58  
... ...
app/views/projects/_home_panel.html.haml
  Diff comments   View file @1b1a408
1 1 - empty_repo = @project.empty_repo?
2 2 .project-home-panel{:class => ("empty-project" if empty_repo)}
3 3 .row
4   - .span6
  4 + .col-md-6
5 5 %h4.project-home-title
6 6 = @project.name_with_namespace
7 7 %span.visibility-level-label
8 8 = visibility_level_icon(@project.visibility_level)
9 9 = visibility_level_label(@project.visibility_level)
10 10  
11   - .span6
  11 + .col-md-6
12 12 - unless empty_repo
13 13 .project-home-dropdown
14 14 = render "dropdown"
... ... @@ -16,7 +16,7 @@
16 16 = render "shared/clone_panel"
17 17  
18 18 .project-home-extra.clearfix.row
19   - .project-home-desc.span8
  19 + .project-home-desc.col-md-8
20 20 - if @project.description.present?
21 21 = @project.description
22 22 - if can?(current_user, :admin_project, @project)
... ...
app/views/projects/branches/index.html.haml
  Diff comments   View file @1b1a408
1 1 = render "projects/commits/head"
2 2 .row
3   - .span3
  3 + .col-md-3
4 4 = render "filter"
5   - .span9
  5 + .col-md-9
6 6 - unless @branches.empty?
7 7 %ul.bordered-list.top-list
8 8 - @branches.each do |branch|
9 9 = render "projects/branches/branch", branch: branch
10   - = paginate @branches, theme: 'gitlab'
11 10 \ No newline at end of file
  11 + = paginate @branches, theme: 'gitlab'
... ...
app/views/projects/branches/recent.html.haml
  Diff comments   View file @1b1a408
1 1 = render "projects/commits/head"
2 2 .row
3   - .span3
  3 + .col-md-3
4 4 = render "filter"
5   - .span9
  5 + .col-md-9
6 6 %ul.bordered-list.top-list
7 7 - @branches.each do |branch|
8   - = render "projects/branches/branch", branch: branch
9 8 \ No newline at end of file
  9 + = render "projects/branches/branch", branch: branch
... ...
app/views/projects/commits/_commits.html.haml
  Diff comments   View file @1b1a408
1 1 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
2 2 .row.commits-row
3   - .span2
  3 + .col-md-2
4 4 %h4
5 5 %i.icon-calendar
6 6 %span= day.stamp("28 Aug, 2010")
7 7 %p= pluralize(commits.count, 'commit')
8   - .span10
  8 + .col-md-10
9 9 %ul.well-list
10 10 = render commits, project: @project
11 11 %hr.lists-separator
... ...
app/views/projects/deploy_keys/index.html.haml
  Diff comments   View file @1b1a408
... ... @@ -12,7 +12,7 @@
12 12 %hr.clearfix
13 13  
14 14 .row
15   - .span5.enabled-keys
  15 + .col-md-5.enabled-keys
16 16 %h5
17 17 %strong.cgreen Enabled deploy keys
18 18 for this project
... ... @@ -21,7 +21,7 @@
21 21 - if @enabled_keys.blank?
22 22 .light-well
23 23 %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
24   - .span5.available-keys
  24 + .col-md-5.available-keys
25 25 %h5
26 26 %strong Deploy keys
27 27 from projects available to you
... ...
app/views/projects/issues/index.html.haml
  Diff comments   View file @1b1a408
1 1 = render "head"
2 2 .row
3   - .span3
  3 + .col-md-3
4 4 = render 'shared/project_filter', project_entities_path: project_issues_path(@project)
5   - .span9.issues-holder
  5 + .col-md-9.issues-holder
6 6 = render "issues"
... ...
app/views/projects/issues/show.html.haml
  Diff comments   View file @1b1a408
... ... @@ -25,7 +25,7 @@
25 25 Edit
26 26  
27 27 .pull-right
28   - .span3#votes= render 'votes/votes_block', votable: @issue
  28 + .col-md-3#votes= render 'votes/votes_block', votable: @issue
29 29  
30 30 .back-link
31 31 = link_to project_issues_path(@project) do
... ...
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @1b1a408
... ... @@ -7,7 +7,7 @@
7 7  
8 8 .merge-request-branches
9 9 .row
10   - .span5
  10 + .col-md-5
11 11 .clearfix
12 12 .pull-left
13 13 = 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 @@
15 15 &nbsp;
16 16 = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span2'})
17 17 .mr_source_commit.prepend-top-10
18   - .span2
  18 + .col-md-2
19 19 %h2.merge-request-angle.light
20 20 %i.icon-long-arrow-right
21   - .span5
  21 + .col-md-5
22 22 .clearfix
23 23 .pull-left
24 24 - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
... ...
app/views/projects/merge_requests/index.html.haml
  Diff comments   View file @1b1a408
... ... @@ -8,9 +8,9 @@
8 8  
9 9  
10 10 .row
11   - .span3
  11 + .col-md-3
12 12 = render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project)
13   - .span9
  13 + .col-md-9
14 14 .ui-box
15 15 .title
16 16 .mr-filters
... ...
app/views/projects/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @1b1a408
... ... @@ -35,7 +35,7 @@
35 35 Edit
36 36  
37 37 .pull-right
38   - .span3#votes= render 'votes/votes_block', votable: @merge_request
  38 + .col-md-3#votes= render 'votes/votes_block', votable: @merge_request
39 39  
40 40 .back-link
41 41 = link_to project_merge_requests_path(@project) do
... ...
app/views/projects/milestones/_form.html.haml
  Diff comments   View file @1b1a408
... ... @@ -12,7 +12,7 @@
12 12 - @milestone.errors.full_messages.each do |msg|
13 13 %li= msg
14 14 .row
15   - .span6
  15 + .col-md-6
16 16 .control-group
17 17 = f.label :title, "Title", class: "control-label"
18 18 .controls
... ... @@ -23,7 +23,7 @@
23 23 .controls
24 24 = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
25 25 %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
26   - .span6
  26 + .col-md-6
27 27 .control-group
28 28 = f.label :due_date, "Due Date", class: "control-label"
29 29 .controls= f.hidden_field :due_date
... ...
app/views/projects/milestones/index.html.haml
  Diff comments   View file @1b1a408
... ... @@ -8,7 +8,7 @@
8 8 New Milestone
9 9  
10 10 .row
11   - .span3
  11 + .col-md-3
12 12 %ul.nav.nav-pills.nav-stacked
13 13 %li{class: ("active" if (params[:f] == "active" || !params[:f]))}
14 14 = link_to project_milestones_path(@project, f: "active") do
... ... @@ -19,7 +19,7 @@
19 19 %li{class: ("active" if params[:f] == "all")}
20 20 = link_to project_milestones_path(@project, f: "all") do
21 21 All
22   - .span9
  22 + .col-md-9
23 23 .ui-box
24 24 %ul.well-list
25 25 = render @milestones
... ...
app/views/projects/milestones/show.html.haml
  Diff comments   View file @1b1a408
... ... @@ -72,22 +72,22 @@
72 72 .tab-content
73 73 .tab-pane.active#tab-issues
74 74 .row
75   - .span4
  75 + .col-md-4
76 76 = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned)
77   - .span4
  77 + .col-md-4
78 78 = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned)
79   - .span4
  79 + .col-md-4
80 80 = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed)
81 81  
82 82 .tab-pane#tab-merge-requests
83 83 .row
84   - .span6
  84 + .col-md-6
85 85 .ui-box
86 86 .title Open
87 87 %ul.well-list
88 88 - @merge_requests.opened.each do |merge_request|
89 89 = render 'merge_request', merge_request: merge_request
90   - .span6
  90 + .col-md-6
91 91 .ui-box
92 92 .title Closed
93 93 %ul.well-list
... ...
app/views/projects/protected_branches/index.html.haml
  Diff comments   View file @1b1a408
1 1 = render "projects/commits/head"
2 2 .row
3   - .span3
  3 + .col-md-3
4 4 = render "projects/branches/filter"
5   - .span9
  5 + .col-md-9
6 6 .alert.alert-info
7 7 %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
8 8 %p This ability allows:
... ... @@ -21,7 +21,7 @@
21 21  
22 22 .entry.clearfix
23 23 = f.label :name, "Branch"
24   - .span3
  24 + .col-md-3
25 25 = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "chosen span3"})
26 26 &nbsp;
27 27 = f.submit 'Protect', class: "btn-create btn"
... ...
app/views/projects/repositories/stats.html.haml
  Diff comments   View file @1b1a408
1 1 = render "projects/commits/head"
2 2 .row
3   - .span6
  3 + .col-md-6
4 4 %div#activity-chart.chart
5 5 %hr
6 6 %p
... ... @@ -14,7 +14,7 @@
14 14 %span= @stats.authors_count
15 15  
16 16  
17   - .span6
  17 + .col-md-6
18 18 %h4 Top 50 Committers:
19 19 %ol.styled
20 20 - @stats.authors[0...50].each do |author|
... ...
app/views/projects/show.html.haml
  Diff comments   View file @1b1a408
1 1 = render "home_panel"
2 2  
3 3 .row
4   - .span9
  4 + .col-md-9
5 5 = render "events/event_last_push", event: @last_push
6 6 = render 'shared/event_filter'
7 7 .content_list
8 8 .loading.hide
9   - .span3.project-side
  9 + .col-md-3.project-side
10 10 .clearfix
11 11 - if @project.archived?
12 12 .alert
... ...
app/views/snippets/current_user_index.html.haml
  Diff comments   View file @1b1a408
... ... @@ -11,7 +11,7 @@
11 11 %hr
12 12  
13 13 .row
14   - .span3
  14 + .col-md-3
15 15 %ul.nav.nav-pills.nav-stacked
16 16 = nav_tab :scope, nil do
17 17 = link_to user_snippets_path(@user) do
... ... @@ -29,6 +29,6 @@
29 29 %span.pull-right
30 30 = @user.snippets.public.count
31 31  
32   - .span9.my-snippets
  32 + .col-md-9.my-snippets
33 33 = render 'snippets'
34 34  
... ...
app/views/users/show.html.haml
  Diff comments   View file @1b1a408
1 1 .row
2   - .span8
  2 + .col-md-8
3 3 %h3.page-title
4 4 = image_tag avatar_icon(@user.email, 90), class: "avatar s90", alt: ''
5 5 = @user.name
... ... @@ -16,6 +16,6 @@
16 16 %hr
17 17 %h4 User Activity:
18 18 = render @events
19   - .span4
  19 + .col-md-4
20 20 = render 'profile', user: @user
21 21 = render 'projects', user: @user
... ...