CSS refactoring
This commit is contained in:
parent
d143680c64
commit
36e88b960a
9 changed files with 208 additions and 174 deletions
|
@ -1,5 +1,5 @@
|
|||
%li.wll.commit
|
||||
.right.span2
|
||||
%li.commit
|
||||
.browse_code_link_holder
|
||||
%p
|
||||
%strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "right"
|
||||
= link_to project_commit_path(@project, :id => commit.id) do
|
||||
|
@ -10,7 +10,7 @@
|
|||
= image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
|
||||
%span.row_title= truncate(commit.safe_message, :length => 50)
|
||||
|
||||
%span.right.cgray
|
||||
%span.committed_ago
|
||||
= time_ago_in_words(commit.committed_date)
|
||||
ago
|
||||
|
||||
|
|
|
@ -5,33 +5,30 @@
|
|||
- @merge_request.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
|
||||
|
||||
%h3.padded.cgray 1. Select Branches
|
||||
|
||||
.row
|
||||
.span6
|
||||
.ui-box
|
||||
.mr_branch_box
|
||||
%h5 From (Head Branch)
|
||||
.body
|
||||
.padded
|
||||
= f.label :source_branch, "From", :class => "control-label"
|
||||
.controls
|
||||
= f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
|
||||
%hr
|
||||
.mr_source_commit
|
||||
.clearfix
|
||||
.bottom_commit
|
||||
.mr_source_commit
|
||||
|
||||
.span6
|
||||
.ui-box
|
||||
.mr_branch_box
|
||||
%h5 To (Base Branch)
|
||||
.body
|
||||
.padded
|
||||
= f.label :target_branch, "To", :class => "control-label"
|
||||
.controls
|
||||
= f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
|
||||
%hr
|
||||
.mr_target_commit
|
||||
.clearfix
|
||||
.bottom_commit
|
||||
.mr_target_commit
|
||||
|
||||
%h3.padded.cgray 2. Fill info
|
||||
.clearfix
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue