diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-30 23:55:15 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-30 23:55:15 +0200 |
commit | 1b1a408a717b6ad1ca3f15bf1b13b8251a5a33e4 (patch) | |
tree | 887868271938d860a4bb8e727262735f558ec7d8 /app/views/projects | |
parent | 447b46ca186d3b1fc14898bbd932485569d71c68 (diff) | |
download | gitlab-ce-1b1a408a717b6ad1ca3f15bf1b13b8251a5a33e4.tar.gz |
Convert span into col-md
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/_home_panel.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/branches/index.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/branches/recent.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/commits/_commits.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/deploy_keys/index.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/issues/index.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/issues/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/milestones/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/milestones/index.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/milestones/show.html.haml | 10 | ||||
-rw-r--r-- | app/views/projects/protected_branches/index.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/repositories/stats.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/show.html.haml | 4 |
16 files changed, 38 insertions, 38 deletions
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 |