Download as
Browse Code »

Commit 40a8ae5e5f03c57a1743b7a8ac097481e930d242

Authored by Dmitriy Zaporozhets
2 parents e868de68 32ecb027
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'refactor_css' into 'master' 

Refactor Css
Showing 53 changed files with 218 additions and 241 deletions   Show diff stats
app/assets/stylesheets/application.scss
  Diff comments   View file @40a8ae5
... ... @@ -37,6 +37,7 @@
37 37 @import "generic/issue_box.scss";
38 38 @import "generic/files.scss";
39 39 @import "generic/lists.scss";
  40 +@import "generic/flash.scss";
40 41 @import "generic/forms.scss";
41 42 @import "generic/selects.scss";
42 43 @import "generic/highlight.scss";
... ...
app/assets/stylesheets/generic/blocks.scss
  Diff comments   View file @40a8ae5
... ... @@ -2,3 +2,18 @@
2 2 background: #f9f9f9;
3 3 padding: 15px;
4 4 }
  5 +
  6 +.centered-light-block {
  7 + text-align: center;
  8 + color: #888;
  9 + margin: 20px;
  10 +}
  11 +
  12 +.nothing-here-block {
  13 + text-align: center;
  14 + padding: 20px;
  15 + color: #666;
  16 + font-weight: normal;
  17 + font-size: 16px;
  18 + line-height: 36px;
  19 +}
... ...
app/assets/stylesheets/generic/buttons.scss
  Diff comments   View file @40a8ae5
... ... @@ -158,6 +158,14 @@
158 158 color: #468847;
159 159 }
160 160 }
  161 +
  162 + &.btn-grouped {
  163 + margin-right: 7px;
  164 + float: left;
  165 + &:last-child {
  166 + margin-right: 0px;
  167 + }
  168 + }
161 169 }
162 170  
163 171 .btn-block {
... ... @@ -169,16 +177,5 @@
169 177 }
170 178 }
171 179  
172   -.btn,
173   -.btn-group {
174   - &.grouped {
175   - margin-right: 7px;
176   - float: left;
177   - &:last-child {
178   - margin-right: 0px;
179   - }
180   - }
181   -}
182   -
183 180 .btn-group-small > .btn { @extend .btn.btn-small; }
184 181 .btn-group-tiny > .btn { @extend .btn.btn-tiny; }
... ...
app/assets/stylesheets/generic/common.scss
  Diff comments   View file @40a8ae5
... ... @@ -11,8 +11,6 @@
11 11 .bgred { background: #F2DEDE!important }
12 12  
13 13 /** COMMON CLASSES **/
14   -.left { float:left }
15   -
16 14 .prepend-top-10 { margin-top:10px }
17 15 .prepend-top-20 { margin-top:20px }
18 16 .prepend-left-10 { margin-left:10px }
... ... @@ -24,32 +22,9 @@
24 22 .append-bottom-20 { margin-bottom:20px }
25 23 .inline { display: inline-block }
26 24  
27   -.padded { padding:20px }
28   -.ipadded { padding:20px!important }
29   -.lborder { border-left:1px solid #eee }
30   -.underlined_link { text-decoration: underline; }
  25 +.underlined-link { text-decoration: underline; }
31 26 .hint { font-style: italic; color: #999; }
32 27 .light { color: #888 }
33   -.tiny { font-weight: normal }
34   -.vtop { vertical-align: top !important; }
35   -
36   -
37   -/** ALERT MESSAGES **/
38   -.alert.alert-disabled {
39   - background: #EEE;
40   - color: #777;
41   - border-color: #DDD;
42   -}
43   -
44   -/** HELPERS **/
45   -.nothing_here_message {
46   - text-align: center;
47   - padding: 20px;
48   - color: #666;
49   - font-weight: normal;
50   - font-size: 16px;
51   - line-height: 36px;
52   -}
53 28  
54 29 .slead {
55 30 color: #666;
... ... @@ -59,53 +34,23 @@
59 34 line-height: 24px;
60 35 }
61 36  
62   -
63 37 .tab-content {
64 38 overflow: visible;
65 39 }
66 40  
67   -@media (max-width: 1200px) {
68   - .only-wide {
69   - display: none;
70   - }
71   -}
72   -
73   -pre.well-pre {
74   - border: 1px solid #EEE;
75   - background: #f9f9f9;
76   - border-radius: 0;
77   - color: #555;
78   -}
79   -
80   -.input-append .btn.active, .input-prepend .btn.active {
81   - background: #CCC;
82   - border-color: #BBB;
83   - text-shadow: 0 1px 1px #fff;
84   - font-weight: bold;
85   - @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
86   -}
87   -
88   -/** Big Labels **/
89   -.state-label {
90   - font-size: 14px;
91   - padding: 9px 25px;
92   - text-align: center;
93   - text-shadow: none;
94   - margin-right: 20px;
95   -
96   - &.state-label-blue {
97   - background: #31708f;
98   - color: #FFF;
99   - }
100   -
101   - &.state-label-green {
102   - background: #4A4;
103   - color: #FFF;
  41 +pre {
  42 + &.clean {
  43 + background: none;
  44 + border: none;
  45 + margin: 0;
  46 + padding: 0;
104 47 }
105 48  
106   - &.state-label-red {
107   - background: #DA4E49;
108   - color: #FFF;
  49 + &.well-pre {
  50 + border: 1px solid #EEE;
  51 + background: #f9f9f9;
  52 + border-radius: 0;
  53 + color: #555;
109 54 }
110 55 }
111 56  
... ... @@ -135,31 +80,6 @@ pre.well-pre {
135 80 }
136 81  
137 82 /** FLASH message **/
138   -.flash-container {
139   - display: none;
140   - cursor: pointer;
141   - margin: 0;
142   - text-align: center;
143   - color: #fff;
144   - font-size: 14px;
145   - position: fixed;
146   - bottom: 0;
147   - width: 100%;
148   - opacity: 0.8;
149   - z-index: 100;
150   -
151   - .flash-notice {
152   - background: #49C;
153   - padding: 10px;
154   - text-shadow: 0 1px 1px #178;
155   - }
156   -
157   - .flash-alert {
158   - background: #C67;
159   - text-shadow: 0 1px 1px #945;
160   - padding: 10px;
161   - }
162   -}
163 83 .author_link {
164 84 color: $link_color;
165 85 }
... ... @@ -279,22 +199,6 @@ li.note {
279 199 cursor: pointer;
280 200 }
281 201  
282   -.merge-request,
283   -.issue {
284   - &.today{
285   - background: #EFE;
286   - border-color: #CEC;
287   - }
288   - &.closed {
289   - background: #F5f5f5;
290   - border-color: #E5E5E5;
291   - }
292   - &.merged {
293   - background: #F5f5f5;
294   - border-color: #E5E5E5;
295   - }
296   -}
297   -
298 202 .git_error_tips {
299 203 @extend .col-md-6;
300 204 text-align: left;
... ... @@ -358,15 +262,6 @@ li.note {
358 262 }
359 263 }
360 264  
361   -pre {
362   - &.clean {
363   - background: none;
364   - border: none;
365   - margin: 0;
366   - padding: 0;
367   - }
368   -}
369   -
370 265 .milestone {
371 266 &.milestone-closed {
372 267 background: #eee;
... ... @@ -450,40 +345,6 @@ table {
450 345 margin-bottom: 20px;
451 346 }
452 347  
453   -.ajax-users-select {
454   - width: 400px;
455   -
456   - &.input-large {
457   - width: 210px;
458   - }
459   -
460   - &.input-clamp {
461   - max-width: 100%;
462   - }
463   -}
464   -
465   -.user-result {
466   - .user-image {
467   - float: left;
468   - }
469   - .user-name {
470   - }
471   - .user-username {
472   - color: #999;
473   - }
474   -}
475   -
476   -.namespace-result {
477   - .namespace-kind {
478   - color: #AAA;
479   - font-weight: normal;
480   - }
481   - .namespace-path {
482   - margin-left: 10px;
483   - font-weight: bolder;
484   - }
485   -}
486   -
487 348 .btn-sign-in {
488 349 margin-top: 7px;
489 350 text-shadow: none;
... ...
app/assets/stylesheets/generic/flash.scss 0 → 100644
  Diff comments   View file @40a8ae5
... ... @@ -0,0 +1,25 @@
  1 +.flash-container {
  2 + display: none;
  3 + cursor: pointer;
  4 + margin: 0;
  5 + text-align: center;
  6 + color: #fff;
  7 + font-size: 14px;
  8 + position: fixed;
  9 + bottom: 0;
  10 + width: 100%;
  11 + opacity: 0.8;
  12 + z-index: 100;
  13 +
  14 + .flash-notice {
  15 + background: #49C;
  16 + padding: 10px;
  17 + text-shadow: 0 1px 1px #178;
  18 + }
  19 +
  20 + .flash-alert {
  21 + background: #C67;
  22 + text-shadow: 0 1px 1px #945;
  23 + padding: 10px;
  24 + }
  25 +}
... ...
app/assets/stylesheets/generic/issue_box.scss
  Diff comments   View file @40a8ae5
... ... @@ -48,4 +48,27 @@
48 48 margin: 0;
49 49 }
50 50 }
  51 +
  52 + .state-label {
  53 + font-size: 14px;
  54 + padding: 9px 25px;
  55 + text-align: center;
  56 + text-shadow: none;
  57 + margin-right: 20px;
  58 +
  59 + &.state-label-blue {
  60 + background: #31708f;
  61 + color: #FFF;
  62 + }
  63 +
  64 + &.state-label-green {
  65 + background: #4A4;
  66 + color: #FFF;
  67 + }
  68 +
  69 + &.state-label-red {
  70 + background: #DA4E49;
  71 + color: #FFF;
  72 + }
  73 + }
51 74 }
... ...
app/assets/stylesheets/generic/selects.scss
  Diff comments   View file @40a8ae5
... ... @@ -87,3 +87,37 @@ select {
87 87 padding-top: 4px;
88 88 }
89 89 }
  90 +
  91 +.ajax-users-select {
  92 + width: 400px;
  93 +
  94 + &.input-large {
  95 + width: 210px;
  96 + }
  97 +
  98 + &.input-clamp {
  99 + max-width: 100%;
  100 + }
  101 +}
  102 +
  103 +.user-result {
  104 + .user-image {
  105 + float: left;
  106 + }
  107 + .user-name {
  108 + }
  109 + .user-username {
  110 + color: #999;
  111 + }
  112 +}
  113 +
  114 +.namespace-result {
  115 + .namespace-kind {
  116 + color: #AAA;
  117 + font-weight: normal;
  118 + }
  119 + .namespace-path {
  120 + margin-left: 10px;
  121 + font-weight: bolder;
  122 + }
  123 +}
... ...
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @40a8ae5
... ... @@ -125,3 +125,21 @@
125 125 form.edit-issue {
126 126 margin: 0;
127 127 }
  128 +
  129 +.merge-request,
  130 +.issue {
  131 + &.today {
  132 + background: #EFE;
  133 + border-color: #CEC;
  134 + }
  135 +
  136 + &.closed {
  137 + background: #F5f5f5;
  138 + border-color: #E5E5E5;
  139 + }
  140 +
  141 + &.merged {
  142 + background: #F5f5f5;
  143 + border-color: #E5E5E5;
  144 + }
  145 +}
... ...
app/views/admin/projects/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -53,5 +53,5 @@
53 53 = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
54 54 = link_to 'Destroy', [project], data: { confirm: remove_project_message(project) }, method: :delete, class: "btn btn-small btn-remove"
55 55 - if @projects.blank?
56   - %p.nothing_here_message 0 projects matches
  56 + .nothing-here-block 0 projects matches
57 57 = paginate @projects, theme: "gitlab"
... ...
app/views/admin/users/show.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -7,7 +7,7 @@
7 7 %span.cred (Admin)
8 8  
9 9 .pull-right
10   - = link_to edit_admin_user_path(@user), class: "btn grouped" do
  10 + = link_to edit_admin_user_path(@user), class: "btn btn-grouped" do
11 11 %i.icon-edit
12 12 Edit
13 13 %hr
... ...
app/views/dashboard/_activities.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -4,6 +4,6 @@
4 4 - if @events.any?
5 5 .content_list
6 6 - else
7   - %p.nothing_here_message Projects activity will be displayed here
  7 + .nothing-here-block Projects activity will be displayed here
8 8  
9 9 = spinner
... ...
app/views/dashboard/_groups.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -17,4 +17,4 @@
17 17 %i.icon-angle-right
18 18 - if groups.blank?
19 19 %li
20   - %h3.nothing_here_message You have no groups yet.
  20 + .nothing-here-block You have no groups yet.
... ...
app/views/dashboard/_projects.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -14,7 +14,7 @@
14 14  
15 15 - if projects.blank?
16 16 %li
17   - %h3.nothing_here_message There are no projects here.
  17 + .nothing-here-block There are no projects here.
18 18 - if @projects_count > @projects_limit
19 19 %li.bottom
20 20 %span.light
... ...
app/views/dashboard/projects.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -67,7 +67,7 @@
67 67  
68 68 - if @projects.blank?
69 69 %li
70   - %h3.nothing_here_message There are no projects here.
  70 + .nothing-here-block There are no projects here.
71 71 .bottom
72 72 = paginate @projects, theme: "gitlab"
73 73  
... ...
app/views/groups/_filter.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -21,7 +21,7 @@
21 21 = project.name_with_namespace
22 22 %small.pull-right= entities_per_project(project, entity)
23 23 - if @projects.blank?
24   - %p.nothing_here_message This group has no projects yet
  24 + .nothing-here-block This group has no projects yet
25 25  
26 26 %fieldset
27 27 %hr
... ...
app/views/groups/_projects.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -8,7 +8,7 @@
8 8 New project
9 9 %ul.well-list
10 10 - if projects.blank?
11   - %p.nothing_here_message This groups has no projects yet
  11 + .nothing-here-block This groups has no projects yet
12 12 - projects.each do |project|
13 13 %li.project-row
14 14 = link_to project_path(project), class: dom_class(project) do
... ...
app/views/groups/edit.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -80,7 +80,7 @@
80 80 = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
81 81 = link_to 'Remove', project, data: { confirm: remove_project_message(project)}, method: :delete, class: "btn btn-small btn-remove"
82 82 - if @group.projects.blank?
83   - %p.nothing_here_message This group has no projects yet
  83 + .nothing-here-block This group has no projects yet
84 84  
85 85 .tab-pane#tab-remove
86 86 .ui-box.ui-box-danger
... ...
app/views/groups/show.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -10,7 +10,7 @@
10 10 - if @events.any?
11 11 .content_list
12 12 - else
13   - %p.nothing_here_message Project activity will be displayed here
  13 + .nothing-here-block Project activity will be displayed here
14 14 = spinner
15 15 .side.col-md-4
16 16 .light-well.append-bottom-20
... ...
app/views/profiles/groups/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -18,12 +18,12 @@
18 18 %li
19 19 .pull-right
20 20 - if can?(current_user, :manage_group, group)
21   - = link_to edit_group_path(group), class: "btn-small btn grouped" do
  21 + = link_to edit_group_path(group), class: "btn-small btn btn-grouped" do
22 22 %i.icon-cogs
23 23 Settings
24 24  
25 25 - if can?(current_user, :destroy, user_group)
26   - = link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn grouped", title: 'Remove user from group' do
  26 + = link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn btn-grouped", title: 'Remove user from group' do
27 27 %i.icon-signout
28 28 Leave
29 29  
... ...
app/views/profiles/keys/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -17,6 +17,6 @@
17 17 = render @keys
18 18 - if @keys.blank?
19 19 %li
20   - %h3.nothing_here_message There are no SSH keys with access to your account.
  20 + .nothing-here-block There are no SSH keys with access to your account.
21 21  
22 22  
... ...
app/views/projects/blob/_text.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -10,4 +10,4 @@
10 10 - unless blob.empty?
11 11 = render 'shared/file_hljs', blob: blob
12 12 - else
13   - %p.nothing_here_message Empty file
  13 + .nothing-here-block Empty file
... ...
app/views/projects/branches/_branch.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -12,12 +12,12 @@
12 12 - if can?(current_user, :download_code, @project)
13 13 = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'grouped btn-group-small'
14 14 - if branch.name != @repository.root_ref
15   - = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn grouped btn-small', method: :post, title: "Compare" do
  15 + = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-small', method: :post, title: "Compare" do
16 16 %i.icon-copy
17 17 Compare
18 18  
19 19 - if can?(current_user, :admin_project, @project) && branch.name != @repository.root_ref
20   - = link_to project_branch_path(@project, branch.name), class: 'btn grouped btn-small remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
  20 + = link_to project_branch_path(@project, branch.name), class: 'btn btn-grouped btn-small remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
21 21 %i.icon-trash
22 22  
23 23 - if commit
... ...
app/views/projects/commit/_commit_box.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -12,7 +12,7 @@
12 12 %ul.dropdown-menu
13 13 %li= link_to "Email Patches", project_commit_path(@project, @commit, format: :patch)
14 14 %li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff)
15   - = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
  15 + = link_to project_tree_path(@project, @commit), class: "btn btn-primary btn-grouped" do
16 16 %span Browse Code »
17 17 %div
18 18  
... ...
app/views/projects/commits/_diffs.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -8,18 +8,18 @@
8 8 - if current_controller?(:commit) or current_controller?(:merge_requests)
9 9 Please, download the diff as
10 10 - if current_controller?(:commit)
11   - = link_to "plain diff", project_commit_path(@project, @commit, format: :diff), class: "underlined_link"
  11 + = link_to "plain diff", project_commit_path(@project, @commit, format: :diff), class: "underlined-link"
12 12 or
13   - = link_to "email patch", project_commit_path(@project, @commit, format: :patch), class: "underlined_link"
  13 + = link_to "email patch", project_commit_path(@project, @commit, format: :patch), class: "underlined-link"
14 14 - else
15   - = link_to "plain diff", project_merge_request_path(@project, @merge_request, format: :diff), class: "underlined_link"
  15 + = link_to "plain diff", project_merge_request_path(@project, @merge_request, format: :diff), class: "underlined-link"
16 16 or
17   - = link_to "email patch", project_merge_request_path(@project, @merge_request, format: :patch), class: "underlined_link"
  17 + = link_to "email patch", project_merge_request_path(@project, @merge_request, format: :patch), class: "underlined-link"
18 18 instead.
19 19 - unless @force_suppress_diff
20 20 %p
21 21 If you still want to see the diff
22   - = link_to "click this link", url_for(force_show_diff: true), class: "underlined_link"
  22 + = link_to "click this link", url_for(force_show_diff: true), class: "underlined-link"
23 23  
24 24 %p.commit-stat-summary
25 25 Showing
... ... @@ -82,4 +82,4 @@
82 82 - old_file = project.repository.blob_at(@commit.parent_id, diff.old_path) if @commit.parent_id
83 83 = render "projects/commits/image", diff: diff, old_file: old_file, file: file, index: i
84 84 - else
85   - %p.nothing_here_message No preview for this file type
  85 + .nothing-here-block No preview for this file type
... ...
app/views/projects/deploy_keys/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -20,7 +20,7 @@
20 20 = render @enabled_keys
21 21 - if @enabled_keys.blank?
22 22 .light-well
23   - %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
  23 + .nothing-here-block Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
24 24 .col-md-6.available-keys
25 25 %h5
26 26 %strong Deploy keys
... ... @@ -29,4 +29,4 @@
29 29 = render @available_keys
30 30 - if @available_keys.blank?
31 31 .light-well
32   - %p.nothing_here_message Deploy keys from projects you have access to will be displayed here
  32 + .nothing-here-block Deploy keys from projects you have access to will be displayed here
... ...
app/views/projects/edit.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -93,10 +93,11 @@
93 93  
94 94  
95 95  
96   - %center.light.prepend-top-20.padded
  96 + .centered-light-block
97 97 %h3
98 98 %i.icon-warning-sign
99 99 Dangerous settings
  100 +
100 101 %p Project settings below may result in data loss!
101 102 = link_to '#', class: 'btn js-toggle-visibility-link' do
102 103 Show it to me
... ... @@ -132,7 +133,7 @@
132 133 data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
133 134 method: :post, class: "btn btn-remove"
134 135 - else
135   - %p.nothing_here_message Only the project owner can archive a project
  136 + .nothing-here-block Only the project owner can archive a project
136 137  
137 138 - if can?(current_user, :change_namespace, @project)
138 139 .ui-box.ui-box-danger
... ... @@ -153,7 +154,7 @@
153 154 .form-actions
154 155 = f.submit 'Transfer', class: "btn btn-remove"
155 156 - else
156   - %p.nothing_here_message Only the project owner can transfer a project
  157 + .nothing-here-block Only the project owner can transfer a project
157 158  
158 159 .ui-box.ui-box-danger
159 160 .title Rename repository
... ... @@ -185,7 +186,7 @@
185 186  
186 187 = link_to 'Remove project', @project, data: { confirm: remove_project_message(@project) }, method: :delete, class: "btn btn-remove"
187 188 - else
188   - %p.nothing_here_message Only project owner can remove a project
  189 + .nothing-here-block Only project owner can remove a project
189 190  
190 191 .save-project-loader.hide
191 192 %center
... ...
app/views/projects/hooks/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -51,8 +51,8 @@
51 51 - @hooks.each do |hook|
52 52 %li
53 53 .pull-right
54   - = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
55   - = link_to 'Remove', project_hook_path(@project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-small grouped"
  54 + = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small btn-grouped"
  55 + = link_to 'Remove', project_hook_path(@project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-small btn-grouped"
56 56 .clearfix
57 57 %span.monospace= hook.url
58 58 %p
... ...
app/views/projects/issues/_issue.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -38,10 +38,10 @@
38 38 .issue-actions
39 39 - if can? current_user, :modify_issue, issue
40 40 - if issue.closed?
41   - = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-small grouped reopen_issue", remote: true
  41 + = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-small btn-grouped reopen_issue", remote: true
42 42 - else
43   - = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small grouped close_issue", remote: true
44   - = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link grouped" do
  43 + = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small btn-grouped close_issue", remote: true
  44 + = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link btn-grouped" do
45 45 %i.icon-edit
46 46 Edit
47 47  
... ...
app/views/projects/issues/_issues.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -66,7 +66,7 @@
66 66 = render @issues
67 67 - if @issues.blank?
68 68 %li
69   - %h4.nothing_here_message No issues to show
  69 + .nothing-here-block No issues to show
70 70  
71 71 - if @issues.present?
72 72 .pull-right
... ...
app/views/projects/issues/show.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -3,16 +3,16 @@
3 3  
4 4 %span.pull-right
5 5 - if can?(current_user, :write_issue, @project)
6   - = link_to new_project_issue_path(@project), class: "btn grouped", title: "New Issue", id: "new_issue_link" do
  6 + = link_to new_project_issue_path(@project), class: "btn btn-grouped", title: "New Issue", id: "new_issue_link" do
7 7 %i.icon-plus
8 8 New Issue
9 9 - if can?(current_user, :modify_issue, @issue)
10 10 - if @issue.closed?
11   - = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn grouped btn-reopen"
  11 + = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-grouped btn-reopen"
12 12 - else
13   - = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close Issue"
  13 + = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue"
14 14  
15   - = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
  15 + = link_to edit_project_issue_path(@project, @issue), class: "btn btn-grouped" do
16 16 %i.icon-edit
17 17 Edit
18 18  
... ... @@ -55,9 +55,9 @@
55 55 - content_for :note_actions do
56 56 - if can?(current_user, :modify_issue, @issue)
57 57 - if @issue.closed?
58   - = link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn grouped btn-reopen"
  58 + = link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-grouped btn-reopen"
59 59 - else
60   - = link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close Issue"
  60 + = link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue"
61 61  
62 62 .participants
63 63 %cite.cgray #{@issue.participants.count} participants
... ...
app/views/projects/labels/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -7,4 +7,4 @@
7 7  
8 8 - else
9 9 .light-well
10   - %h3.nothing_here_message Add first label to your issues or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels
  10 + .nothing-here-block Add first label to your issues or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels
... ...
app/views/projects/merge_requests/_show.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -25,7 +25,7 @@
25 25 - content_for :note_actions do
26 26 - if can?(current_user, :modify_merge_request, @merge_request)
27 27 - unless @merge_request.closed?
28   - = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
  28 + = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request"
29 29  
30 30  
31 31 .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
... ...
app/views/projects/merge_requests/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -65,7 +65,7 @@
65 65 = render @merge_requests
66 66 - if @merge_requests.blank?
67 67 %li
68   - %h4.nothing_here_message No merge requests to show
  68 + .nothing-here-block No merge requests to show
69 69 - if @merge_requests.present?
70 70 .pull-right
71 71 %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
... ...
app/views/projects/merge_requests/show/_commits.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -29,7 +29,7 @@
29 29 = render "projects/commits/commit", commit: commit, project: @merge_request.source_project
30 30  
31 31 - else
32   - %h4.nothing_here_message
  32 + .nothing-here-block
33 33 Nothing to merge from
34 34 %span.label-branch #{@merge_request.source_branch}
35 35 to
... ...
app/views/projects/merge_requests/show/_diffs.html.haml
  Diff comments   View file @40a8ae5
1 1 - if @merge_request_diff.collected?
2 2 = render "projects/commits/diffs", diffs: @merge_request.diffs, project: @merge_request.source_project
3 3 - elsif @merge_request_diff.empty?
4   - %h4.nothing_here_message Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
  4 + .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
5 5 - else
6 6 .bs-callout.bs-callout-warning
7 7 %h4
... ...
app/views/projects/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -13,9 +13,9 @@
13 13 %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
14 14 %li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff)
15 15  
16   - = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: { state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
  16 + = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request"
17 17  
18   - = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped", id:"edit_merge_request" do
  18 + = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn btn-grouped", id:"edit_merge_request" do
19 19 %i.icon-edit
20 20 Edit
21 21  
... ...
app/views/projects/milestones/_milestone.html.haml
  Diff comments   View file @40a8ae5
1 1 %li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone) }
2 2 .pull-right
3 3 - if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
4   - = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
  4 + = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link btn-grouped" do
5 5 %i.icon-edit
6 6 Edit
7 7 = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-remove"
... ...
app/views/projects/milestones/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -26,6 +26,6 @@
26 26  
27 27 - if @milestones.blank?
28 28 %li
29   - %h3.nothing_here_message No milestones to show
  29 + .nothing-here-block No milestones to show
30 30  
31 31 = paginate @milestones, theme: "gitlab"
... ...
app/views/projects/milestones/show.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -3,21 +3,15 @@
3 3 Milestone ##{@milestone.iid}
4 4 %small
5 5 = @milestone.expires_at
6   - - if @milestone.closed?
7   - %span.state-label.state-label-red Closed
8   - - elsif @milestone.expired?
9   - %span.state-label.state-label-red Expired
10   - - else
11   - %span.state-label.state-label-green Open
12 6 .pull-right
13 7 - if can?(current_user, :admin_milestone, @project)
14   - = link_to edit_project_milestone_path(@project, @milestone), class: "btn grouped" do
  8 + = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do
15 9 %i.icon-edit
16 10 Edit
17 11 - if @milestone.active?
18   - = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-remove grouped"
  12 + = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-remove btn-grouped"
19 13 - else
20   - = link_to 'Reopen Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn grouped"
  14 + = link_to 'Reopen Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped"
21 15  
22 16 - if @milestone.issues.any? && @milestone.can_be_closed?
23 17 .alert.alert-success
... ... @@ -29,6 +23,14 @@
29 23  
30 24  
31 25 .issue-box
  26 + .state
  27 + - if @milestone.closed?
  28 + %span.state-label.state-label-red Closed
  29 + - elsif @milestone.expired?
  30 + %span.state-label.state-label-red Expired
  31 + - else
  32 + %span.state-label.state-label-green Open
  33 +
32 34 %h4.title
33 35 = gfm escape_once(@milestone.title)
34 36  
... ... @@ -63,10 +65,10 @@
63 65 %span.badge= @users.count
64 66  
65 67 .pull-right
66   - = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
  68 + = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small btn-grouped", title: "New Issue" do
67 69 %i.icon-plus
68 70 New Issue
69   - = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link grouped"
  71 + = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link btn-grouped"
70 72  
71 73 .tab-content
72 74 .tab-pane.active#tab-issues
... ...
app/views/projects/notes/_form.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -22,7 +22,7 @@
22 22  
23 23 .note-form-actions
24 24 .buttons
25   - = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
  25 + = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
26 26 = yield(:note_actions)
27 27  
28 28 %a.btn.grouped.js-close-discussion-note-form Cancel
... ...
app/views/projects/protected_branches/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -9,7 +9,7 @@
9 9 %ul
10 10 %li keep stable branches secured
11 11 %li forced code review before merge to protected branches
12   - %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined_link"}
  12 + %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined-link"}
13 13  
14 14 - if can? current_user, :admin_project, @project
15 15 = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f|
... ...
app/views/projects/snippets/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -12,4 +12,4 @@
12 12 = render partial: "projects/snippets/snippet", collection: @snippets
13 13 - if @snippets.empty?
14 14 %li
15   - %h3.nothing_here_message Nothing here.
  15 + .nothing-here-block Nothing here.
... ...
app/views/projects/tags/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -18,7 +18,7 @@
18 18 = paginate @tags, theme: 'gitlab'
19 19  
20 20 - else
21   - %h3.nothing_here_message
  21 + .nothing-here-block
22 22 Repository has no tags yet.
23 23 %br
24 24 %small
... ...
app/views/projects/team_members/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -3,9 +3,9 @@
3 3  
4 4 - if can? current_user, :admin_team_member, @project
5 5 %span.pull-right
6   - = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New project member" do
  6 + = link_to new_project_team_member_path(@project), class: "btn btn-new btn-grouped", title: "New project member" do
7 7 New project member
8   - = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import members from another project" do
  8 + = link_to import_project_team_members_path(@project), class: "btn btn-grouped", title: "Import members from another project" do
9 9 Import members
10 10  
11 11 %p.light
... ...
app/views/projects/walls/show.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -9,7 +9,7 @@
9 9 = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
10 10 .note-form-actions
11 11 .buttons
12   - = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
  12 + = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
13 13  
14 14 .note-form-option
15 15 %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
... ...
app/views/projects/wikis/_main_links.html.haml
  Diff comments   View file @40a8ae5
1 1 %span.pull-right
2 2 - if (@wiki && @wiki.persisted?)
3   - = link_to history_project_wiki_path(@project, @wiki), class: "btn grouped" do
  3 + = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-grouped" do
4 4 Page History
5 5 - if can?(current_user, :write_wiki, @project)
6   - = link_to edit_project_wiki_path(@project, @wiki), class: "btn grouped" do
  6 + = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-grouped" do
7 7 %i.icon-edit
8 8 Edit
... ...
app/views/public/projects/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -63,6 +63,6 @@
63 63 %i.icon-warning-sign
64 64 Empty repository
65 65 - unless @projects.present?
66   - %h3.nothing_here_message No public projects
  66 + .nothing-here-block No public projects
67 67  
68 68 = paginate @projects, theme: "gitlab"
... ...
app/views/shared/_issues.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -11,5 +11,5 @@
11 11 = render 'projects/issues/issue', issue: issue
12 12 = paginate @issues, theme: "gitlab"
13 13 - else
14   - %p.nothing_here_message No issues to show
  14 + .nothing-here-block No issues to show
15 15  
... ...
app/views/shared/_merge_requests.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -11,4 +11,4 @@
11 11 = paginate @merge_requests, theme: "gitlab"
12 12  
13 13 - else
14   - %h3.nothing_here_message No merge requests to show
  14 + .nothing-here-block No merge requests to show
... ...
app/views/snippets/_blob_content.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -11,4 +11,4 @@
11 11 = render 'shared/file_hljs', blob: @snippet
12 12 - else
13 13 .file-content.code
14   - %p.nothing_here_message Empty file
  14 + .nothing-here-block Empty file
... ...
app/views/snippets/_snippets.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -2,6 +2,6 @@
2 2 = render partial: 'snippet', collection: @snippets
3 3 - if @snippets.empty?
4 4 %li
5   - %h3.nothing_here_message Nothing here.
  5 + .nothing-here-block Nothing here.
6 6  
7 7 = paginate @snippets, theme: 'gitlab'
... ...
app/views/snippets/current_user_index.html.haml
  Diff comments   View file @40a8ae5
1 1 %h3.page-title
2 2 My Snippets
3 3 .pull-right
4   - = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
  4 + = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
5 5 Add new snippet
6   - = link_to snippets_path, class: "btn grouped" do
  6 + = link_to snippets_path, class: "btn btn-grouped" do
7 7 Discover snippets
8 8  
9 9 %p.light
... ...
app/views/snippets/index.html.haml
  Diff comments   View file @40a8ae5
... ... @@ -2,9 +2,9 @@
2 2 Public snippets
3 3  
4 4 .pull-right
5   - = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
  5 + = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
6 6 Add new snippet
7   - = link_to user_snippets_path(current_user), class: "btn grouped" do
  7 + = link_to user_snippets_path(current_user), class: "btn btn-grouped" do
8 8 My snippets
9 9  
10 10 %p.light
... ...