Commit dac67ed6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use new ui-box classes

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 4345e922
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
Unarchive project Unarchive project
- else - else
Archive project Archive project
.ui-box-body .body
- if @project.archived? - if @project.archived?
%p %p
Unarchiving the project will mark its repository as active. Unarchiving the project will mark its repository as active.
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
- if can?(current_user, :remove_project, @project) - if can?(current_user, :remove_project, @project)
.ui-box.ui-box-danger .ui-box.ui-box-danger
.title Remove project .title Remove project
.ui-box-body .body
%p %p
Removing the project will delete its repository and all related resources including issues, merge requests etc. Removing the project will delete its repository and all related resources including issues, merge requests etc.
%br %br
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
- @issue.errors.full_messages.each do |msg| - @issue.errors.full_messages.each do |msg|
%span= msg %span= msg
%br %br
.ui-box.ui-box-show .issue-box
.ui-box-head .title
.control-group .control-group
= f.label :title do = f.label :title do
%strong= "Subject *" %strong= "Subject *"
.controls .controls
= f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true = f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true
.ui-box-body .context
.control-group .control-group
.issue_assignee.pull-left .issue_assignee.pull-left
= f.label :assignee_id do = f.label :assignee_id do
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
Milestone Milestone
.controls= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'}) .controls= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'})
.ui-box-bottom .description
.control-group .control-group
= f.label :label_list do = f.label :label_list do
%i.icon-tag %i.icon-tag
......
...@@ -37,17 +37,16 @@ ...@@ -37,17 +37,16 @@
%span.light Milestone %span.light Milestone
= @issue.milestone.title = @issue.milestone.title
.ui-box.ui-box-show .issue-box
.ui-box-head %h4.title
%h4.box-title
= gfm escape_once(@issue.title) = gfm escape_once(@issue.title)
.ui-box-body .context
%cite.cgray %cite.cgray
= render partial: 'issue_context', locals: { issue: @issue } = render partial: 'issue_context', locals: { issue: @issue }
- if @issue.description.present? - if @issue.description.present?
.ui-box-bottom .description
.wiki .wiki
= preserve do = preserve do
= markdown @issue.description = markdown @issue.description
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
:plain :plain
$("##{dom_id(@issue)}").fadeOut(); $("##{dom_id(@issue)}").fadeOut();
- elsif params[:issue_context] - elsif params[:issue_context]
$('.ui-box-body').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}"); $('.issue-box .context').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
$('.ui-box-body').effect('highlight'); $('.issue-box .context').effect('highlight');
$('.chosen').chosen(); $('.chosen').chosen();
$('.edit-issue.inline-update input[type="submit"]').hide(); $('.edit-issue.inline-update input[type="submit"]').hide();
- if @issue.milestone - if @issue.milestone
......
.ui-box.ui-box-show .issue-box
.ui-box-head %h4.title
%h4.box-title
= gfm escape_once(@merge_request.title) = gfm escape_once(@merge_request.title)
.ui-box-body .context
%div
%cite.cgray %cite.cgray
Created by #{link_to_member(@project, @merge_request.author)}. Created by #{link_to_member(@project, @merge_request.author)}.
- if @merge_request.assignee - if @merge_request.assignee
...@@ -17,25 +15,25 @@ ...@@ -17,25 +15,25 @@
- if @merge_request.description.present? - if @merge_request.description.present?
.ui-box-bottom .description
.wiki .wiki
= preserve do = preserve do
= markdown @merge_request.description = markdown @merge_request.description
- if @merge_request.closed? - if @merge_request.closed?
.ui-box-bottom.alert-error .description.alert-error
%span %span
%i.icon-remove %i.icon-remove
Closed by #{link_to_member(@project, @merge_request.closed_event.author)} Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)} ago. #{time_ago_with_tooltip(@merge_request.closed_event.created_at)} ago.
- if @merge_request.merged? - if @merge_request.merged?
.ui-box-bottom.alert-success .description.alert-success
%span %span
%i.icon-ok %i.icon-ok
Merged by #{link_to_member(@project, @merge_request.merge_event.author)} Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)} ago. #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} ago.
- if !@closes_issues.empty? && @merge_request.opened? - if !@closes_issues.empty? && @merge_request.opened?
.ui-box-bottom.alert-info .description.alert-info
%span %span
%i.icon-ok %i.icon-ok
Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'} Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
......
...@@ -28,13 +28,11 @@ ...@@ -28,13 +28,11 @@
&larr; To milestones list &larr; To milestones list
.ui-box.ui-box-show .issue-box
.ui-box-head %h4.title
%h4.box-title
= gfm escape_once(@milestone.title) = gfm escape_once(@milestone.title)
.ui-box-body .context
%p %p
Progress: Progress:
#{@milestone.closed_items_count} closed #{@milestone.closed_items_count} closed
...@@ -46,7 +44,7 @@ ...@@ -46,7 +44,7 @@
- if @milestone.description.present? - if @milestone.description.present?
.ui-box-bottom .description
= preserve do = preserve do
= markdown @milestone.description = markdown @milestone.description
......
...@@ -6,15 +6,14 @@ ...@@ -6,15 +6,14 @@
- @wiki.errors.full_messages.each do |msg| - @wiki.errors.full_messages.each do |msg|
%li= msg %li= msg
.ui-box.ui-box-show .issue-box
.ui-box-head %h3.title
%h3.page-title
.edit-wiki-header .edit-wiki-header
= @wiki.title.titleize = @wiki.title.titleize
= f.hidden_field :title, value: @wiki.title = f.hidden_field :title, value: @wiki.title
= f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium" = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
= f.label :format, class: "pull-right", style: "padding-right: 20px;" = f.label :format, class: "pull-right", style: "padding-right: 20px;"
.ui-box-body .context
.controls .controls
%span.cgray %span.cgray
Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
...@@ -22,11 +21,11 @@ ...@@ -22,11 +21,11 @@
%code [Link Title](page-slug) %code [Link Title](page-slug)
\. \.
.ui-box-bottom .description
.control-group .control-group
= f.label :content = f.label :content
.controls= f.text_area :content, class: 'span8 js-gfm-input', rows: 18 .controls= f.text_area :content, class: 'span8 js-gfm-input', rows: 18
.ui-box-bottom .description
.control-group .control-group
= f.label :commit_message = f.label :commit_message
.controls= f.text_field :message, class: 'span8', rows: 18 .controls= f.text_field :message, class: 'span8', rows: 18
......
- if @issues.any? - if @issues.any?
- @issues.group_by(&:project).each do |group| - @issues.group_by(&:project).each do |group|
.ui-box.small-box .ui-box.ui-box-small
- project = group[0] - project = group[0]
.title .title
= link_to_project project = link_to_project project
......
- if @merge_requests.any? - if @merge_requests.any?
- @merge_requests.group_by(&:target_project).each do |group| - @merge_requests.group_by(&:target_project).each do |group|
.ui-box.small-box .ui-box.ui-box-small
- project = group[0] - project = group[0]
.title .title
= link_to_project project = link_to_project project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment