Commit bcfa62b6a6e0a7b30757a5ef351e1324d5a0cea3
Exists in
spb-stable
and in
2 other branches
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
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | width: 270px; | 8 | width: 270px; |
| 9 | 9 | ||
| 10 | .ui-datepicker-header { | 10 | .ui-datepicker-header { |
| 11 | - background: #EEE; | 11 | + background: #FFF; |
| 12 | border-color: #DDD; | 12 | border-color: #DDD; |
| 13 | } | 13 | } |
| 14 | 14 | ||
| @@ -19,20 +19,37 @@ | @@ -19,20 +19,37 @@ | ||
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | &.ui-autocomplete { | 21 | &.ui-autocomplete { |
| 22 | - @include border-radius(0px); | ||
| 23 | border-color: #DDD; | 22 | border-color: #DDD; |
| 24 | padding: 0; | 23 | padding: 0; |
| 24 | + margin-top: 2px; | ||
| 25 | + z-index: 1001; | ||
| 25 | 26 | ||
| 26 | .ui-menu-item a { | 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
| @@ -45,14 +45,6 @@ | @@ -45,14 +45,6 @@ | ||
| 45 | padding: 6px 10px; | 45 | padding: 6px 10px; |
| 46 | border: 1px solid #ccc; | 46 | border: 1px solid #ccc; |
| 47 | @include border-radius(4px); | 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 | .issues_content { | 50 | .issues_content { |
app/views/projects/merge_requests/_merge_request.html.haml
| @@ -11,13 +11,9 @@ | @@ -11,13 +11,9 @@ | ||
| 11 | - if merge_request.for_fork? | 11 | - if merge_request.for_fork? |
| 12 | %span.light | 12 | %span.light |
| 13 | #{merge_request.source_project_namespace}: | 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 | .merge-request-info | 17 | .merge-request-info |
| 22 | - if merge_request.author | 18 | - if merge_request.author |
| 23 | authored by #{link_to_member(merge_request.source_project, merge_request.author)} | 19 | authored by #{link_to_member(merge_request.source_project, merge_request.author)} |
app/views/projects/merge_requests/show/_state_widget.html.haml
| @@ -21,14 +21,6 @@ | @@ -21,14 +21,6 @@ | ||
| 21 | #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} | 21 | #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} |
| 22 | = render "projects/merge_requests/show/remove_source_branch" | 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 | - unless @commits.any? | 24 | - unless @commits.any? |
| 33 | %h4 Nothing to merge | 25 | %h4 Nothing to merge |
| 34 | %p | 26 | %p |
| @@ -38,3 +30,12 @@ | @@ -38,3 +30,12 @@ | ||
| 38 | %span.label-branch #{@merge_request.target_branch} | 30 | %span.label-branch #{@merge_request.target_branch} |
| 39 | %br | 31 | %br |
| 40 | Try to use different branches or push new code. | 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 | + |