Download as
Browse Code »

Commit bcfa62b6a6e0a7b30757a5ef351e1324d5a0cea3

Authored by Dmitriy Zaporozhets
2 parents 02ae038c 97eb2240
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'ui-fixes' into 'master' 

Ui fixes

* Fix merge request widget UI
* Improve jquery UI
* truncate long branch names on MR index
Showing 4 changed files with 40 additions and 34 deletions   Show diff stats
app/assets/stylesheets/generic/jquery.scss
  Diff comments   View file @bcfa62b
... ... @@ -8,7 +8,7 @@
8 8 width: 270px;
9 9  
10 10 .ui-datepicker-header {
11   - background: #EEE;
  11 + background: #FFF;
12 12 border-color: #DDD;
13 13 }
14 14  
... ... @@ -19,20 +19,37 @@
19 19 }
20 20  
21 21 &.ui-autocomplete {
22   - @include border-radius(0px);
23 22 border-color: #DDD;
24 23 padding: 0;
  24 + margin-top: 2px;
  25 + z-index: 1001;
25 26  
26 27 .ui-menu-item a {
27   - color: #777;
28   -
29   - &:hover {
30   - background: $hover;
31   - border-color: $primary_color;
32   - @include border-radius(0px);
33   - color: #333;
34   - }
  28 + padding: 4px 10px;
35 29 }
36 30 }
37   -}
38 31  
  32 + .ui-state-default {
  33 + border: 1px solid #FFF;
  34 + background: #FFF;
  35 + color: #777;
  36 + }
  37 +
  38 + .ui-state-highlight {
  39 + border: 1px solid #EEE;
  40 + background: #EEE;
  41 + }
  42 +
  43 + .ui-state-active {
  44 + border: 1px solid $bg_style_color;
  45 + background: $bg_style_color;
  46 + color: #FFF;
  47 + }
  48 +
  49 + .ui-state-hover,
  50 + .ui-state-focus {
  51 + border: 1px solid $hover;
  52 + background: $hover;
  53 + color: #333;
  54 + }
  55 +}
... ...
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @bcfa62b
... ... @@ -45,14 +45,6 @@
45 45 padding: 6px 10px;
46 46 border: 1px solid #ccc;
47 47 @include border-radius(4px);
48   -
49   -
50   - input.check_all_issues {
51   - padding: 0;
52   - margin: 0;
53   - position: relative;
54   - top: 3px;
55   - }
56 48 }
57 49  
58 50 .issues_content {
... ...
app/views/projects/merge_requests/_merge_request.html.haml
  Diff comments   View file @bcfa62b
... ... @@ -11,13 +11,9 @@
11 11 - if merge_request.for_fork?
12 12 %span.light
13 13 #{merge_request.source_project_namespace}:
14   - = merge_request.source_branch
15   - %i.icon-angle-right.light
16   - = merge_request.target_branch
17   - - else
18   - = merge_request.source_branch
19   - %i.icon-angle-right.light
20   - = merge_request.target_branch
  14 + = truncate merge_request.source_branch, length: 25
  15 + %i.icon-angle-right.light
  16 + = merge_request.target_branch
21 17 .merge-request-info
22 18 - if merge_request.author
23 19 authored by #{link_to_member(merge_request.source_project, merge_request.author)}
... ...
app/views/projects/merge_requests/show/_state_widget.html.haml
  Diff comments   View file @bcfa62b
... ... @@ -21,14 +21,6 @@
21 21 #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
22 22 = render "projects/merge_requests/show/remove_source_branch"
23 23  
24   - - if !@closes_issues.empty? && @merge_request.open?
25   - .alert.alert-info.alert-info
26   - %span
27   - %i.icon-ok
28   - Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
29   - = succeed '.' do
30   - != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence)
31   -
32 24 - unless @commits.any?
33 25 %h4 Nothing to merge
34 26 %p
... ... @@ -38,3 +30,12 @@
38 30 %span.label-branch #{@merge_request.target_branch}
39 31 %br
40 32 Try to use different branches or push new code.
  33 +
  34 + - if !@closes_issues.empty? && @merge_request.open?
  35 + .panel-footer
  36 + %span
  37 + %i.icon-ok
  38 + Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
  39 + = succeed '.' do
  40 + != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence)
  41 +
... ...