Commit 9afc930b999048594e3f5a6a22097adcf2da50fe
1 parent
6404d697
Exists in
master
and in
4 other branches
Make ui-box-show more visible. Refactor some css classes
Showing
6 changed files
with
30 additions
and
27 deletions
Show diff stats
app/assets/stylesheets/common.scss
@@ -140,27 +140,6 @@ p.time { | @@ -140,27 +140,6 @@ p.time { | ||
140 | border-bottom: 2px solid #F90; | 140 | border-bottom: 2px solid #F90; |
141 | } | 141 | } |
142 | 142 | ||
143 | -.status_info { | ||
144 | - font-size: 14px; | ||
145 | - padding: 5px 15px; | ||
146 | - line-height: 26px; | ||
147 | - text-align: center; | ||
148 | - float: right; | ||
149 | - position: relative; | ||
150 | - top: -5px; | ||
151 | - @include border-radius(4px); | ||
152 | - | ||
153 | - &.success { | ||
154 | - background: #4A4; | ||
155 | - color: #FFF; | ||
156 | - } | ||
157 | - | ||
158 | - &.error { | ||
159 | - background: #DA4E49; | ||
160 | - color: #FFF; | ||
161 | - } | ||
162 | -} | ||
163 | - | ||
164 | .thin_area{ | 143 | .thin_area{ |
165 | height: 150px; | 144 | height: 150px; |
166 | } | 145 | } |
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -34,6 +34,8 @@ | @@ -34,6 +34,8 @@ | ||
34 | &.ui-box-show { | 34 | &.ui-box-show { |
35 | margin:20px 0; | 35 | margin:20px 0; |
36 | background: #FFF; | 36 | background: #FFF; |
37 | + box-shadow: inset 0 1px 0 #fff, 0 1px 5px #f1f1f1; | ||
38 | + @include linear-gradient(#fafafa, #f1f1f1); | ||
37 | 39 | ||
38 | .control-group { | 40 | .control-group { |
39 | margin-bottom: 0; | 41 | margin-bottom: 0; |
app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -87,3 +87,24 @@ pre.well-pre { | @@ -87,3 +87,24 @@ pre.well-pre { | ||
87 | font-weight: bold; | 87 | font-weight: bold; |
88 | @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); | 88 | @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); |
89 | } | 89 | } |
90 | + | ||
91 | +/** Big Labels **/ | ||
92 | +.state-label { | ||
93 | + font-size: 14px; | ||
94 | + padding: 5px 15px; | ||
95 | + text-align: center; | ||
96 | + float: right; | ||
97 | + position: relative; | ||
98 | + top: -5px; | ||
99 | + @include border-radius(4px); | ||
100 | + | ||
101 | + &.state-label-green { | ||
102 | + background: #4A4; | ||
103 | + color: #FFF; | ||
104 | + } | ||
105 | + | ||
106 | + &.state-label-red { | ||
107 | + background: #DA4E49; | ||
108 | + color: #FFF; | ||
109 | + } | ||
110 | +} |
app/views/projects/issues/show.html.haml
@@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
32 | .ui-box-head | 32 | .ui-box-head |
33 | %h4.box-title | 33 | %h4.box-title |
34 | - if @issue.closed? | 34 | - if @issue.closed? |
35 | - .error.status_info Closed | 35 | + .state-label.state-label-red Closed |
36 | = gfm escape_once(@issue.title) | 36 | = gfm escape_once(@issue.title) |
37 | 37 | ||
38 | .ui-box-body | 38 | .ui-box-body |
app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -3,11 +3,12 @@ | @@ -3,11 +3,12 @@ | ||
3 | %h4.box-title | 3 | %h4.box-title |
4 | = gfm escape_once(@merge_request.title) | 4 | = gfm escape_once(@merge_request.title) |
5 | - if @merge_request.merged? | 5 | - if @merge_request.merged? |
6 | - .success.status_info | 6 | + .state-label.state-label-green |
7 | %i.icon-ok | 7 | %i.icon-ok |
8 | Merged | 8 | Merged |
9 | - elsif @merge_request.closed? | 9 | - elsif @merge_request.closed? |
10 | - .error.status_info Closed | 10 | + .state-label.state-label-red |
11 | + Closed | ||
11 | 12 | ||
12 | .ui-box-body | 13 | .ui-box-body |
13 | %div | 14 | %div |
@@ -32,7 +33,7 @@ | @@ -32,7 +33,7 @@ | ||
32 | %span | 33 | %span |
33 | %i.icon-remove | 34 | %i.icon-remove |
34 | Closed by #{link_to_member(@project, @merge_request.closed_event.author)} | 35 | Closed by #{link_to_member(@project, @merge_request.closed_event.author)} |
35 | - %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. | 36 | + %span #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. |
36 | - if @merge_request.merged? | 37 | - if @merge_request.merged? |
37 | .ui-box-bottom.alert-success | 38 | .ui-box-bottom.alert-success |
38 | %span | 39 | %span |
app/views/projects/milestones/show.html.haml
@@ -26,9 +26,9 @@ | @@ -26,9 +26,9 @@ | ||
26 | .ui-box-head | 26 | .ui-box-head |
27 | %h4.box-title | 27 | %h4.box-title |
28 | - if @milestone.closed? | 28 | - if @milestone.closed? |
29 | - .error.status_info Closed | 29 | + .state-label.state-label-red Closed |
30 | - elsif @milestone.expired? | 30 | - elsif @milestone.expired? |
31 | - .error.status_info Expired | 31 | + .state-label.state-label-red Expired |
32 | 32 | ||
33 | = gfm escape_once(@milestone.title) | 33 | = gfm escape_once(@milestone.title) |
34 | 34 |