Commit 1a97db413b03881f0ce4307811181776e3d6e408
1 parent
e02aec66
Exists in
spb-stable
and in
2 other branches
Simplify issue-box style
Showing
4 changed files
with
23 additions
and
38 deletions
Show diff stats
app/assets/stylesheets/generic/issue_box.scss
| ... | ... | @@ -17,52 +17,36 @@ |
| 17 | 17 | &.issue-box-closed { |
| 18 | 18 | border-color: $border_danger; |
| 19 | 19 | .state { |
| 20 | - background-color: $bg_light_danger; | |
| 20 | + background-color: $bg_danger; | |
| 21 | + color: #FFF; | |
| 21 | 22 | border-color: $border_danger; |
| 22 | - color: $color_danger; | |
| 23 | - .state-label { | |
| 24 | - background-color: $bg_danger; | |
| 25 | - color: #FFF; | |
| 26 | - } | |
| 27 | 23 | } |
| 28 | 24 | } |
| 29 | 25 | |
| 30 | 26 | &.issue-box-merged { |
| 31 | 27 | border-color: $border_primary; |
| 32 | 28 | .state { |
| 33 | - background-color: $bg_light_primary; | |
| 29 | + background-color: $bg_primary; | |
| 30 | + color: #FFF; | |
| 34 | 31 | border-color: $border_primary; |
| 35 | - color: $color_primary; | |
| 36 | - .state-label { | |
| 37 | - background-color: $bg_primary; | |
| 38 | - color: #FFF; | |
| 39 | - } | |
| 40 | 32 | } |
| 41 | 33 | } |
| 42 | 34 | |
| 43 | 35 | &.issue-box-open { |
| 44 | 36 | border-color: $border_success; |
| 45 | 37 | .state { |
| 46 | - background-color: $bg_light_success; | |
| 47 | 38 | border-color: $border_success; |
| 48 | - color: $color_success; | |
| 49 | - .state-label { | |
| 50 | - background-color: $bg_success; | |
| 51 | - color: #FFF; | |
| 52 | - } | |
| 39 | + background-color: $bg_success; | |
| 40 | + color: #FFF; | |
| 53 | 41 | } |
| 54 | 42 | } |
| 55 | 43 | |
| 56 | 44 | &.issue-box-expired { |
| 57 | 45 | border-color: #cea61b; |
| 58 | 46 | .state { |
| 59 | - background-color: #fcf8e3; | |
| 60 | 47 | border-color: #faebcc; |
| 61 | - color: #8a6d3b; | |
| 62 | - .state-label { | |
| 63 | - background: #cea61b; | |
| 64 | - color: #FFF; | |
| 65 | - } | |
| 48 | + background: #cea61b; | |
| 49 | + color: #FFF; | |
| 66 | 50 | } |
| 67 | 51 | } |
| 68 | 52 | |
| ... | ... | @@ -72,7 +56,7 @@ |
| 72 | 56 | |
| 73 | 57 | .state { |
| 74 | 58 | border-bottom: 1px solid #DDD; |
| 75 | - line-height: 32px; | |
| 59 | + padding: 10px 25px; | |
| 76 | 60 | } |
| 77 | 61 | |
| 78 | 62 | .title { |
| ... | ... | @@ -115,14 +99,15 @@ |
| 115 | 99 | |
| 116 | 100 | .state-label { |
| 117 | 101 | font-size: 14px; |
| 118 | - padding: 1px 25px; | |
| 119 | - text-align: center; | |
| 120 | - text-shadow: none; | |
| 121 | - display: inline-block; | |
| 122 | - line-height: 34px; | |
| 102 | + float: left; | |
| 103 | + font-weight: bold; | |
| 123 | 104 | } |
| 124 | 105 | |
| 125 | 106 | .creator { |
| 126 | - padding: 2px 15px; | |
| 107 | + float: right; | |
| 108 | + a { | |
| 109 | + color: #FFF; | |
| 110 | + text-decoration: underline; | |
| 111 | + } | |
| 127 | 112 | } |
| 128 | 113 | } | ... | ... |
app/views/projects/issues/show.html.haml
| ... | ... | @@ -32,13 +32,13 @@ |
| 32 | 32 | |
| 33 | 33 | .issue-box{ class: issue_box_class(@issue) } |
| 34 | 34 | .state.clearfix |
| 35 | - .state-label.col-sm-2.col-xs-12 | |
| 35 | + .state-label | |
| 36 | 36 | - if @issue.closed? |
| 37 | 37 | Closed |
| 38 | 38 | - else |
| 39 | 39 | Open |
| 40 | 40 | |
| 41 | - %span.creator.col-sm-9.col-xs-12 | |
| 41 | + .creator | |
| 42 | 42 | Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)} |
| 43 | 43 | |
| 44 | 44 | %h4.title |
| ... | ... | @@ -73,4 +73,4 @@ |
| 73 | 73 | = label.name |
| 74 | 74 | |
| 75 | 75 | |
| 76 | -.voting_notes#notes= render "projects/notes/notes_with_form" | |
| 77 | 76 | \ No newline at end of file |
| 77 | +.voting_notes#notes= render "projects/notes/notes_with_form" | ... | ... |
app/views/projects/merge_requests/show/_mr_box.html.haml
| 1 | 1 | .issue-box{ class: issue_box_class(@merge_request) } |
| 2 | 2 | .state.clearfix |
| 3 | - %span.state-label.col-sm-2.col-xs-12 | |
| 3 | + .state-label | |
| 4 | 4 | - if @merge_request.merged? |
| 5 | 5 | Merged |
| 6 | 6 | - elsif @merge_request.closed? |
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | - else |
| 9 | 9 | Open |
| 10 | 10 | |
| 11 | - %span.creator.col-sm-9.col-xs-12 | |
| 11 | + .creator | |
| 12 | 12 | Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)} |
| 13 | 13 | |
| 14 | 14 | %h4.title | ... | ... |
app/views/projects/milestones/show.html.haml
| ... | ... | @@ -22,14 +22,14 @@ |
| 22 | 22 | |
| 23 | 23 | .issue-box{ class: issue_box_class(@milestone) } |
| 24 | 24 | .state.clearfix |
| 25 | - .state-label.col-sm-2.col-xs-12 | |
| 25 | + .state-label | |
| 26 | 26 | - if @milestone.closed? |
| 27 | 27 | Closed |
| 28 | 28 | - elsif @milestone.expired? |
| 29 | 29 | Expired |
| 30 | 30 | - else |
| 31 | 31 | Open |
| 32 | - %span.creator.col-sm-9.col-xs-12 | |
| 32 | + .creator | |
| 33 | 33 | = @milestone.expires_at |
| 34 | 34 | |
| 35 | 35 | %h4.title | ... | ... |