diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-17 18:35:28 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-17 18:35:28 +0300 |
| commit | fd033671933fcc0f472480d98c907aefde357416 (patch) | |
| tree | eb771a11459ac69329c467349c3b780c8f649331 /app | |
| parent | b98f414a1b8dbadbccceac3a544c15bb456a952b (diff) | |
| download | gitlab-ce-fd033671933fcc0f472480d98c907aefde357416.tar.gz | |
Update font-awesome. Use proper class for merge request form
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 24efdf5f78d..083c330b1cd 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -115,6 +115,6 @@ margin-top: 45px; } -.merge-request-info { +.merge-request-form-info { padding: 15px 0; } diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index 9327f4689ae..86c442142bf 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -30,7 +30,7 @@ %h3.page-title %i.icon-paper-clip Details - .merge-request-info + .merge-request-form-info .clearfix = f.label :title do %strong= "Title *" |