Download as
Browse Code »

Commit 8826077471d667680ee0ed9f86a41c4b30429e5c

Authored by Dmitriy Zaporozhets
1 parent 85d5f606
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Refactor css lists. Use well-list class

Showing 32 changed files with 87 additions and 252 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @8826077
... ... @@ -281,33 +281,6 @@ p.time {
281 281 border: 2px solid #ddd;
282 282 }
283 283  
284   -.leftbar {
285   - h5, .title {
286   - padding: 5px 10px;
287   - }
288   -
289   - h4 {
290   - font-size: 14px;
291   - padding: 2px 10px;
292   - color: #666;
293   - border-bottom: 1px solid #f1f1f1;
294   - }
295   - a:last-child h4 { border: none; }
296   -
297   - a:hover {
298   - h4 {
299   - color: #111;
300   - background: $hover;
301   - border-color: #CCC;
302   - .ico.project {
303   - background-position:-209px -21px;
304   - }
305   - }
306   - }
307   - .bottom {
308   - padding: 10px;
309   - }
310   -}
311 284  
312 285  
313 286 /* Fix for readme code (stopped it from being yellow) */
... ... @@ -321,7 +294,6 @@ p.time {
321 294 }
322 295 }
323 296  
324   -
325 297 .highlight_word {
326 298 background: #EEDC94;
327 299 }
... ...
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @8826077
... ... @@ -152,19 +152,6 @@
152 152 }
153 153 }
154 154  
155   - li, .wll {
156   - padding: 10px;
157   - &:first-child {
158   - @include border-radius(4px 4px 0 0);
159   - border-top: none;
160   - }
161   -
162   - &:last-child {
163   - @include border-radius(0 0 4px 4px);
164   - border: none;
165   - }
166   - }
167   -
168 155 .ui-box-body {
169 156 padding: 10px;
170 157 }
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @8826077
... ... @@ -10,11 +10,6 @@
10 10 /** COMMON CLASSES **/
11 11 .left { float:left }
12 12 .right { float:right!important }
13   -.width-50p { width:50% }
14   -.width-49p { width:49% }
15   -.width-30p { width:30% }
16   -.width-65p { width:65% }
17   -.width-100p { width:100% }
18 13 .append-bottom-10 { margin-bottom:10px }
19 14 .append-bottom-20 { margin-bottom:20px }
20 15 .prepend-top-10 { margin-top:10px }
... ...
app/assets/stylesheets/gitlab_bootstrap/lists.scss
  Diff comments   View file @8826077
1   -/** LISTS **/
2   -
3   -ul {
4   - /**
5   - * List li block element #1
6   - *
7   - */
8   - .wll {
  1 +/**
  2 + * Well styled list
  3 + *
  4 + */
  5 +.well-list {
  6 + margin: 0;
  7 + list-style: none;
  8 + li {
9 9 background-color: #FFF;
10   - padding: 10px 5px;
  10 + padding: 10px;
11 11 min-height: 20px;
12 12 border-bottom: 1px solid #eee;
13 13 border-bottom: 1px solid rgba(0, 0, 0, 0.05);
14 14  
  15 + &.disabled {
  16 + color: #888;
  17 + }
  18 +
15 19 &.smoke { background-color: #f5f5f5; }
  20 +
16 21 &:hover {
17 22 background: $hover;
18 23 border-bottom: 1px solid #ADF;
19 24 }
20   - &:last-child { border:none }
  25 +
  26 + &:first-child {
  27 + @include border-radius(4px 4px 0 0);
  28 + border-top: none;
  29 + }
  30 +
  31 + &:last-child {
  32 + @include border-radius(0 0 4px 4px);
  33 + border: none;
  34 + }
  35 +
21 36 .author { color: #999; }
22 37  
23 38 p {
... ... @@ -29,6 +44,11 @@ ul {
29 44 top: 3px;
30 45 }
31 46 }
  47 +
  48 + .well-title {
  49 + font-size: 14px;
  50 + line-height: 18px;
  51 + }
32 52 }
33 53 }
34 54  
... ...
app/assets/stylesheets/jquery.ui.gitlab.css
  Diff comments   View file @8826077
1   -/*
2   - * jQuery UI CSS Framework 1.8.7
3   - *
4   - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
5   - * Dual licensed under the MIT or GPL Version 2 licenses.
6   - * http://jquery.org/license
7   - *
8   - * http://docs.jquery.com/UI/Theming/API
9   - */
10   -
11   -/* Layout helpers
12   -----------------------------------*/
13   -.ui-helper-hidden { display: none; }
14   -.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
15   -.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
16   -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
17   -.ui-helper-clearfix { display: inline-block; }
18   -/* required comment for clearfix to work in Opera \*/
19   -* html .ui-helper-clearfix { height:1%; }
20   -.ui-helper-clearfix { display:block; }
21   -/* end clearfix */
22   -.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
23   -
24   -
25 1 /* Interaction Cues
26 2 ----------------------------------*/
27 3 .ui-state-disabled { cursor: default !important; }
... ... @@ -141,26 +117,6 @@
141 117 .ui-widget-overlay { background: #262b33; opacity: .70;filter:Alpha(Opacity=70); }
142 118 .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #000000; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
143 119 /*
144   - * jQuery UI Resizable 1.8.7
145   - *
146   - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
147   - * Dual licensed under the MIT or GPL Version 2 licenses.
148   - * http://jquery.org/license
149   - *
150   - * http://docs.jquery.com/UI/Resizable#theming
151   - */
152   -.ui-resizable { position: relative;}
153   -.ui-resizable-handle { position: absolute; font-size: 0.1px; z-index: 999; display: block;}
154   -.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
155   -.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
156   -.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
157   -.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
158   -.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
159   -.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
160   -.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
161   -.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
162   -.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}
163   -/*
164 120 * jQuery UI Selectable 1.8.7
165 121 *
166 122 * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
... ... @@ -240,34 +196,7 @@
240 196 cursor: pointer;
241 197 font-weight: bold;
242 198 }
243   -/*
244   - * jQuery UI Slider 1.8.7
245   - *
246   - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
247   - * Dual licensed under the MIT or GPL Version 2 licenses.
248   - * http://jquery.org/license
249   - *
250   - * http://docs.jquery.com/UI/Slider#theming
251   - */
252   -.ui-slider { position: relative; text-align: left; background: #d7d7d7; z-index: 1; }
253   -.ui-slider { -moz-box-shadow: 0 1px 2px rgba(0,0,0,0.5) inset; -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.5) inset; box-shadow: 0 1px 2px rgba(0,0,0,0.5) inset; }
254   -.ui-slider .ui-slider-handle { background: url(slider_handles.png) 0px -23px no-repeat; position: absolute; z-index: 2; width: 23px; height: 23px; cursor: default; border: none; outline: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
255   -.ui-slider .ui-state-hover, .ui-slider .ui-state-active { background-position: 0 0; }
256   -.ui-slider .ui-slider-range { background: #a3cae0; position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
257   -.ui-slider .ui-slider-range { -moz-box-shadow: 0 1px 2px rgba(17,35,45,0.6) inset; -webkit-box-shadow: 0 1px 2px rgba(17,35,45,0.6) inset; box-shadow: 0 1px 2px rgba(17,35,45,0.6) inset; }
258 199  
259   -
260   -.ui-slider-horizontal { height: 5px; }
261   -.ui-slider-horizontal .ui-slider-handle { top: -8px; margin-left: -13px; }
262   -.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
263   -.ui-slider-horizontal .ui-slider-range-min { left: 0; }
264   -.ui-slider-horizontal .ui-slider-range-max { right: 0; }
265   -
266   -.ui-slider-vertical { width: 5px; height: 100px; }
267   -.ui-slider-vertical .ui-slider-handle { left: -8px; margin-left: 0; margin-bottom: -13px; }
268   -.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
269   -.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
270   -.ui-slider-vertical .ui-slider-range-max { top: 0; }
271 200 /*
272 201 * jQuery UI Datepicker 1.8.7
273 202 *
... ... @@ -326,45 +255,3 @@
326 255 .ui-datepicker table .ui-state-highlight { border-color: #ADE; }
327 256 .ui-datepicker-calendar .ui-state-default { background: transparent; border-color: #FFF; }
328 257 .ui-datepicker-calendar .ui-state-active { background: #D9EDF7; border-color: #ADE; color: #3A89A3; font-weight: bold; text-shadow: 0 1px 1px #fff; }
329   -
330   -/* with multiple calendars */
331   -.ui-datepicker.ui-datepicker-multi { width:auto; }
332   -.ui-datepicker-multi .ui-datepicker-group { float:left; }
333   -.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
334   -.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
335   -.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
336   -.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
337   -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
338   -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
339   -.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
340   -.ui-datepicker-row-break { clear:both; width:100%; }
341   -
342   -
343   -/* Extra Input Field Styling */
344   -.ui-form textarea, .ui-form input:not([type="submit"]):not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="file"]):not([type="range"]) {
345   - padding: 3px;
346   - -webkit-border-radius: 2px;
347   - -moz-border-radius: 2px;
348   - border-radius: 2px;
349   - border: 1px solid #cecece;
350   - outline: none;
351   - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1) inset, 0 1px 0 rgba(255,255,255,0.2);
352   - -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.1) inset, 0 1px 0 rgba(255,255,255,0.2);
353   - box-shadow: 0 1px 3px rgba(0,0,0,0.1) inset, 0 1px 0 rgba(255,255,255,0.2);
354   - -webkit-transition: all 250ms ease-in-out;
355   - -moz-transition: all 250ms ease-in-out;
356   - -o-transition: all 250ms ease-in-out;
357   - transition: all 250ms ease-in-out;
358   -}
359   -.ui-form textarea:hover, .ui-form input:not([type="submit"]):not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="file"]):not([type="range"]):hover {
360   - border: 1px solid #bdbdbd;
361   - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.2) inset, 0 1px 0 rgba(255,255,255,0.2);
362   - -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.2) inset, 0 1px 0 rgba(255,255,255,0.2);
363   - box-shadow: 0 1px 3px rgba(0,0,0,0.2) inset, 0 1px 0 rgba(255,255,255,0.2);
364   -}
365   -.ui-form textarea:focus, .ui-form input:not([type="submit"]):not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="file"]):not([type="range"]):focus {
366   - border: 1px solid #95bdd4;
367   - -webkit-box-shadow: 0 2px 3px rgba(161,202,226,0.5) inset, 0 1px 0 rgba(255,255,255,0.2);
368   - -moz-box-shadow: 0 2px 3px rgba(161,202,226,0.5) inset, 0 1px 0 rgba(255,255,255,0.2);
369   - box-shadow: 0 2px 3px rgba(161,202,226,0.5) inset, 0 1px 0 rgba(255,255,255,0.2);
370   -}
... ...
app/assets/stylesheets/sections/commits.scss
  Diff comments   View file @8826077
... ... @@ -229,8 +229,6 @@
229 229  
230 230 /** COMMIT ROW **/
231 231 .commit {
232   - @extend .wll;
233   -
234 232 .browse_code_link_holder {
235 233 @extend .span2;
236 234 float: right;
... ...
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @8826077
... ... @@ -76,7 +76,6 @@
76 76  
77 77 padding: 16px 5px;
78 78 &:last-child { border:none }
79   - .wll:hover { background:none }
80 79  
81 80 .event_commits {
82 81 margin-top: 5px;
... ...
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @8826077
... ... @@ -121,12 +121,3 @@ input.check_all_issues {
121 121 #update_status {
122 122 width: 100px;
123 123 }
124   -
125   -
126   -/**
127   - * Milestones list
128   - *
129   - */
130   -.milestone {
131   - @extend .wll;
132   -}
... ...
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @8826077
... ... @@ -8,7 +8,7 @@
8 8  
9 9 .groups_box,
10 10 .projects_box {
11   - h5 {
  11 + > h5 {
12 12 color: $style_color;
13 13 font-size: 16px;
14 14 text-shadow: 0 1px 1px #fff;
... ... @@ -16,37 +16,22 @@
16 16 line-height: 32px;
17 17 font-size: 14px;
18 18 }
19   - ul {
20   - li {
21   - padding: 0;
22   - a {
23   - display: block;
24   - .group_name {
25   - font-size: 14px;
26   - line-height: 18px;
27   - }
28   - .project_name {
29   - color: #4fa2bd;
30   - font-size: 14px;
31   - line-height: 18px;
32   - }
33   - .arrow {
34   - float: right;
35   - padding: 10px;
36   - margin: 0;
37   - }
38   - .last_activity {
39   - padding-top: 5px;
40   - display: block;
41   - span, strong {
42   - font-size: 12px;
43   - color: #666;
44   - }
45   - }
  19 + .nav-projects-tabs li { padding: 0; }
  20 + .well-list {
  21 + .arrow {
  22 + float: right;
  23 + padding: 10px;
  24 + margin: 0;
  25 + }
  26 + .last_activity {
  27 + padding-top: 5px;
  28 + display: block;
  29 + span, strong {
  30 + font-size: 12px;
  31 + color: #666;
46 32 }
47 33 }
48 34 }
49   - @extend .leftbar;
50 35 @extend .ui-box;
51 36 }
52 37 }
... ...
app/views/commits/_commits.html.haml
  Diff comments   View file @8826077
... ... @@ -3,4 +3,4 @@
3 3 %h5.small
4 4 %i.icon-calendar
5 5 = day.stamp("28 Aug, 2010")
6   - %ul.unstyled= render commits
  6 + %ul.well-list= render commits
... ...
app/views/compare/show.html.haml
  Diff comments   View file @8826077
... ... @@ -9,7 +9,7 @@
9 9 - if @commits.present?
10 10 %div.ui-box
11 11 %h5.small Commits (#{@commits.count})
12   - %ul.unstyled= render @commits
  12 + %ul.well-list= render @commits
13 13  
14 14 - unless @diffs.empty?
15 15 %h4 Diff
... ...
app/views/dashboard/_groups.html.haml
  Diff comments   View file @8826077
... ... @@ -8,11 +8,11 @@
8 8 = link_to new_admin_group_path, class: "btn very_small info" do
9 9 %i.icon-plus
10 10 New Group
11   - %ul.unstyled
  11 + %ul.well-list
12 12 - groups.each do |group|
13   - %li.wll
  13 + %li
14 14 = link_to group_path(id: group.path), class: dom_class(group) do
15   - %strong.group_name= truncate(group.name, length: 35)
  15 + %strong.well-title= truncate(group.name, length: 35)
16 16 %span.arrow
17 17 →
18 18 %span.last_activity
... ...
app/views/dashboard/_projects.html.haml
  Diff comments   View file @8826077
... ... @@ -16,14 +16,14 @@
16 16 = nav_tab :scope, 'joined' do
17 17 = link_to "Joined", dashboard_path(scope: 'joined')
18 18  
19   - %ul.unstyled
  19 + %ul.well-list
20 20 - projects.each do |project|
21   - %li.wll
  21 + %li
22 22 = link_to project_path(project), class: dom_class(project) do
23 23 - if project.namespace
24 24 = project.namespace.human_name
25 25 \/
26   - %strong.project_name
  26 + %strong.well-title
27 27 = truncate(project.name, length: 25)
28 28 %span.arrow
29 29 →
... ... @@ -31,6 +31,6 @@
31 31 %strong Last activity:
32 32 %span= project_last_activity(project)
33 33 - if projects.blank?
34   - %li.wll
  34 + %li
35 35 %h3.nothing_here_message There are no projects here.
36 36 .bottom= paginate projects, theme: "gitlab"
... ...
app/views/dashboard/issues.html.haml
  Diff comments   View file @8826077
... ... @@ -14,7 +14,7 @@
14 14 %div.ui-box
15 15 - @project = group[0]
16 16 %h5= link_to_project @project
17   - %ul.unstyled.issues_table
  17 + %ul.well-list.issues_table
18 18 - group[1].each do |issue|
19 19 = render(partial: 'issues/show', locals: {issue: issue})
20 20 %hr
... ...
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @8826077
... ... @@ -10,11 +10,12 @@
10 10 .span9
11 11 - if @merge_requests.any?
12 12 - @merge_requests.group_by(&:project).each do |group|
13   - %ul.unstyled.ui-box
  13 + .ui-box
14 14 - @project = group[0]
15 15 %h5= link_to_project @project
16   - - group[1].each do |merge_request|
17   - = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
  16 + %ul.well-list
  17 + - group[1].each do |merge_request|
  18 + = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
18 19 %hr
19 20 = paginate @merge_requests, theme: "gitlab"
20 21  
... ...
app/views/events/event/_push.html.haml
  Diff comments   View file @8826077
... ... @@ -12,7 +12,7 @@
12 12 - if event.push_with_commits?
13 13 - project = event.project
14 14 .event-body
15   - %ul.unstyled.event_commits
  15 + %ul.well-list.event_commits
16 16 - few_commits = event.commits[0...2]
17 17 - few_commits.each do |commit|
18 18 = render "events/commit", commit: commit, project: project
... ...
app/views/groups/_projects.html.haml
  Diff comments   View file @8826077
... ... @@ -8,13 +8,13 @@
8 8 = link_to new_project_path(namespace_id: @group.id), class: "btn very_small info" do
9 9 %i.icon-plus
10 10 New Project
11   - %ul.unstyled
  11 + %ul.well-list
12 12 - if projects.blank?
13 13 %p.nothing_here_message This groups has no projects yet
14 14 - projects.each do |project|
15   - %li.wll
  15 + %li
16 16 = link_to project_path(project), class: dom_class(project) do
17   - %strong.project_name= truncate(project.name, length: 25)
  17 + %strong.well-title= truncate(project.name, length: 25)
18 18 %span.arrow
19 19 →
20 20 %span.last_activity
... ...
app/views/groups/issues.html.haml
  Diff comments   View file @8826077
... ... @@ -10,7 +10,7 @@
10 10 %div.ui-box
11 11 - @project = group[0]
12 12 %h5= @project.name
13   - %ul.unstyled.issues_table
  13 + %ul.well-list.issues_table
14 14 - group[1].each do |issue|
15 15 = render(partial: 'issues/show', locals: {issue: issue})
16 16 %hr
... ...
app/views/groups/merge_requests.html.haml
  Diff comments   View file @8826077
... ... @@ -6,7 +6,7 @@
6 6 %br
7 7 - if @merge_requests.any?
8 8 - @merge_requests.group_by(&:project).each do |group|
9   - %ul.unstyled.ui-box
  9 + %ul.well-list.ui-box
10 10 - @project = group[0]
11 11 %h5= @project.name
12 12 - group[1].each do |merge_request|
... ...
app/views/groups/people.html.haml
  Diff comments   View file @8826077
... ... @@ -9,9 +9,9 @@
9 9 Team
10 10 %small
11 11 (#{@users.size})
12   - %ul.unstyled
  12 + %ul.well-list
13 13 - @users.each do |user|
14   - %li.wll
  14 + %li
15 15 = image_tag gravatar_icon(user.email, 16), class: "avatar s16"
16 16 %strong= user.name
17 17 %span.cgray= user.email
... ...
app/views/issues/_issues.html.haml
  Diff comments   View file @8826077
... ... @@ -6,7 +6,7 @@
6 6 .row
7 7 .span7= paginate @issues, remote: true, theme: "gitlab"
8 8 .span3.right
9   - %span.cgray.right
  9 + %span.cgray.right
10 10 %span.issue_counter #{@issues.total_count}
11 11 issues for this filter
12 12 - else
... ...
app/views/issues/_show.html.haml
  Diff comments   View file @8826077
1   -%li.wll{ id: dom_id(issue), class: issue_css_classes(issue), url: project_issue_path(issue.project, issue) }
  1 +%li{ id: dom_id(issue), class: issue_css_classes(issue), url: project_issue_path(issue.project, issue) }
2 2 - if controller.controller_name == 'issues'
3 3 .issue_check
4 4 = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
... ...
app/views/issues/index.html.haml
  Diff comments   View file @8826077
... ... @@ -55,7 +55,7 @@
55 55 = hidden_field_tag :f, params[:f]
56 56 .clearfix
57 57  
58   - %ul#issues-table.unstyled.issues_table
  58 + %ul#issues-table.well-list.issues_table
59 59 = render "issues"
60 60  
61 61 #new_issue_dialog
... ...
app/views/labels/_label.html.haml
  Diff comments   View file @8826077
1   -%li.wll
  1 +%li
2 2 %strong
3 3 %i.icon-tag
4 4 = label.name
... ...
app/views/labels/index.html.haml
  Diff comments   View file @8826077
... ... @@ -4,7 +4,7 @@
4 4 Labels
5 5 %br
6 6 %div.ui-box
7   - %ul.unstyled.labels-table
  7 + %ul.well-list.labels-table
8 8 - @labels.each do |label|
9 9 = render 'label', label: label
10 10  
... ...
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @8826077
1   -%li.wll{ class: mr_css_classes(merge_request) }
  1 +%li{ class: mr_css_classes(merge_request) }
2 2 .right
3 3 .left
4 4 - if merge_request.merged?
... ...
app/views/merge_requests/index.html.haml
  Diff comments   View file @8826077
... ... @@ -30,7 +30,7 @@
30 30 = hidden_field_tag :f, params[:f]
31 31 .clearfix
32 32  
33   - %ul.unstyled
  33 + %ul.well-list
34 34 = render @merge_requests
35 35 - if @merge_requests.blank?
36 36 %li
... ...
app/views/merge_requests/show/_commits.html.haml
  Diff comments   View file @8826077
... ... @@ -5,19 +5,19 @@
5 5 Commits (#{@commits.count})
6 6 .merge-request-commits
7 7 - if @commits.count > 8
8   - %ul.first_mr_commits.unstyled
  8 + %ul.first_mr_commits.well-list
9 9 - @commits.first(8).each do |commit|
10 10 = render "commits/commit", commit: commit
11 11 %li.bottom
12 12 8 of #{@commits.count} commits displayed.
13 13 %strong
14 14 %a.mr_show_all_commits Click here to show all
15   - %ul.all_mr_commits.hide.unstyled
  15 + %ul.all_mr_commits.hide.well-list
16 16 - @commits.each do |commit|
17 17 = render "commits/commit", commit: commit
18 18  
19 19 - else
20   - %ul.unstyled
  20 + %ul.well-list
21 21 - @commits.each do |commit|
22 22 = render "commits/commit", commit: commit
23 23  
... ...
app/views/milestones/index.html.haml
  Diff comments   View file @8826077
... ... @@ -18,7 +18,7 @@
18 18 = link_to project_milestones_path(@project, f: "all") do
19 19 All
20 20  
21   - %ul.unstyled
  21 + %ul.well-list
22 22 = render @milestones
23 23  
24 24 - if @milestones.present?
... ...
app/views/services/index.html.haml
  Diff comments   View file @8826077
... ... @@ -2,8 +2,8 @@
2 2 %h3.page_title Services
3 3 %br
4 4  
5   -%ul.unstyled.ui-box
6   - %li.wll
  5 +%ul.ui-box.well-list
  6 + %li
7 7 %h4.cgreen
8 8 = link_to edit_project_service_path(@project, :gitlab_ci) do
9 9 GitLab CI
... ... @@ -17,14 +17,14 @@
17 17 %small.cgray
18 18 %i.icon-off
19 19 Disabled
20   - %li.wll
21   - %h4.cgray
  20 + %li.disabled
  21 + %h4
22 22 Jenkins CI
23 23 %small An extendable open source continuous integration server
24 24 .right
25 25 %small Not implemented yet
26   - %li.wll
27   - %h4.cgray
  26 + %li.disabled
  27 + %h4
28 28 Campfire
29 29 %small Web-based group chat tool
30 30 .right
... ...
app/views/team_members/_show.html.haml
  Diff comments   View file @8826077
1 1 - user = member.user
2 2 - allow_admin = can? current_user, :admin_project, @project
3   -%li.wll{id: dom_id(member), class: "team_member_row user_#{user.id}"}
  3 +%li{id: dom_id(member), class: "team_member_row user_#{user.id}"}
4 4 .row
5 5 .span6
6 6 = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
... ...
app/views/team_members/_team.html.haml
  Diff comments   View file @8826077
1 1 - grouper_project_members(@project).each do |access, members|
2   - %fieldset
3   - %legend
  2 + .ui-box
  3 + %h5
4 4 = Project.access_options.key(access).pluralize
5 5 %small= members.size
6   - %ul.unstyled
  6 + %ul.well-list
7 7 - members.sort_by(&:user_name).each do |up|
8 8 = render(partial: 'team_members/show', locals: {member: up})
9 9  
... ...