Commit d9739b80 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ui-improvements' into 'master'

UI improvements

![Untitledalign-fix](https://dev.gitlab.org/uploads/gitlab/gitlabhq/5b059bab94/Untitledalign-fix.png)
parents 9d09d616 de55d7aa
......@@ -56,23 +56,22 @@
.state {
border-bottom: 1px solid #DDD;
padding: 10px 25px;
padding: 10px 15px;
}
.title {
font-size: 26px;
font-size: 28px;
font-weight: normal;
line-height: 1.5;
margin: 0;
color: #333;
padding-bottom: 0;
padding: 15px 25px;
padding: 10px 15px;
}
.context {
border: none;
border-top: 1px solid #eee;
padding: 15px 25px;
padding: 10px 15px;
// Reset text align for children
.text-right > * { text-align: left; }
......@@ -88,7 +87,7 @@
}
.description {
padding: 0 25px 15px 25px;
padding: 0 15px 10px 15px;
}
.title, .context, .description {
......
......@@ -118,3 +118,7 @@
.merge-request-show-labels .label {
padding: 6px 10px;
}
.mr-commits .commit {
padding: 10px 15px;
}
= form_for [@project, @issue], remote: true, html: {class: 'edit-issue inline-update'} do |f|
.row
.col-md-6
.col-sm-6
%strong.append-right-10
Assignee:
......@@ -11,7 +11,7 @@
- else
None
.col-md-6.text-right
.col-sm-6.text-right
%strong.append-right-10
Milestone:
- if can?(current_user, :modify_issue, @issue)
......
......@@ -3,7 +3,7 @@
.panel-heading
%i.icon-list
Commits (#{@commits.count})
.commits
.commits.mr-commits
- if @commits.count > 8
%ul.first-commits.well-list
- @commits.first(8).each do |commit|
......
= form_for [@project, @merge_request], remote: true, html: {class: 'edit-merge_request inline-update'} do |f|
.row
.col-md-6
.col-sm-6
%strong.append-right-10
Assignee:
......@@ -11,7 +11,7 @@
- else
None
.col-md-6.text-right
.col-sm-6.text-right
%strong.append-right-10
Milestone:
- if can?(current_user, :modify_merge_request, @merge_request)
......
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