Download as
Browse Code »

Commit 39f4604653507e565c93a6fa8ef62bda421e78b2

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

refactor scss, refove unused classes

Showing 8 changed files with 59 additions and 182 deletions   Show diff stats
app/assets/javascripts/merge_requests.js.coffee
  Diff comments   View file @39f4604
... ... @@ -76,7 +76,6 @@ class MergeRequest
76 76 $('.ci_widget.ci-' + state).show()
77 77  
78 78 loadDiff: (event) ->
79   - $('.dashboard-loader').show()
80 79 $.ajax
81 80 type: 'GET'
82 81 url: this.$('.nav-tabs .diffs-tab a').attr('href')
... ...
app/assets/stylesheets/application.scss
  Diff comments   View file @39f4604
... ... @@ -36,6 +36,7 @@
36 36 @import "sections/admin.scss";
37 37 @import "sections/wiki.scss";
38 38 @import "sections/wall.scss";
  39 +@import "sections/dashboard.scss";
39 40  
40 41 @import "highlight/white.scss";
41 42 @import "highlight/dark.scss";
... ...
app/assets/stylesheets/common.scss
  Diff comments   View file @39f4604
... ... @@ -17,7 +17,6 @@ body {
17 17 margin: 0 0;
18 18 }
19 19  
20   -.visible_link,
21 20 .author_link {
22 21 color: $link_color;
23 22 }
... ... @@ -32,30 +31,12 @@ body {
32 31 padding-bottom: 0;
33 32 }
34 33  
35   -.info_link {
36   - margin-right: 5px;
37   - float: left;
38   -
39   - img {
40   - width: 20px;
41   - }
42   -}
43   -
44   -.download_repo_link {
45   - background: url("images.png") no-repeat 0 -48px;
46   - padding-left: 20px;
47   -}
48   -
49 34 table a code {
50 35 position: relative;
51 36 top: -2px;
52 37 margin-right: 3px;
53 38 }
54 39  
55   -.span12 hr{
56   - margin-top: 5px;
57   -}
58   -
59 40 .loading {
60 41 margin: 20px auto;
61 42 background: url(ajax_loader.gif) no-repeat center center;
... ... @@ -81,10 +62,6 @@ table a code {
81 62 }
82 63 }
83 64  
84   -.git_url_wrapper {
85   - margin-right:50px
86   -}
87   -
88 65 span.update-author {
89 66 display: block;
90 67 color: #999;
... ... @@ -96,20 +73,11 @@ span.update-author {
96 73 }
97 74 }
98 75  
99   -.dashboard-loader {
100   - float: left;
101   - margin: 10px;
102   - display: none;
103   -}
104 76 .user-mention {
105 77 color: #2FA0BB;
106 78 font-weight: bold;
107 79 }
108 80  
109   -.neib {
110   - margin-right: 10px;
111   -}
112   -
113 81 .label {
114 82 padding: 1px 4px;
115 83 font-size: 12px;
... ... @@ -170,27 +138,6 @@ input[type=text] {
170 138 }
171 139 }
172 140  
173   -.merge-request-form-holder {
174   - select {
175   - width: 300px;
176   - }
177   -}
178   -
179   -/** Issues **/
180   -#issue_assignee_id {
181   - width: 300px;
182   -}
183   -
184   -#new_issue_dialog textarea{
185   - height: 100px;
186   -}
187   -
188   -.project_list_url {
189   - width: 250px;
190   - background:#fff !important;
191   -}
192   -
193   -
194 141 .line_holder {
195 142 &:hover {
196 143 td {
... ... @@ -222,24 +169,6 @@ p.time {
222 169 margin: 30px 3px 3px 2px;
223 170 }
224 171  
225   -
226   -.styled_image {
227   - border: 2px solid #ddd;
228   -}
229   -
230   -
231   -
232   -/* Fix for readme code (stopped it from being yellow) */
233   -.readme {
234   - pre {
235   - background: white !important;
236   -
237   - code {
238   - background: none !important;
239   - }
240   - }
241   -}
242   -
243 172 .search-holder {
244 173 label, input {
245 174 height: 30px;
... ... @@ -333,25 +262,6 @@ li.note {
333 262 }
334 263  
335 264  
336   -
337   -/**
338   - * Admin area
339   - *
340   - */
341   -.admin_dash {
342   - .data {
343   - a {
344   - h1 {
345   - line-height: 48px;
346   - font-size: 48px;
347   - padding: 20px;
348   - text-align: center;
349   - font-weight: normal;
350   - }
351   - }
352   - }
353   -}
354   -
355 265 .rss-icon {
356 266 img {
357 267 width: 24px;
... ... @@ -364,18 +274,6 @@ li.note {
364 274 }
365 275  
366 276  
367   -
368   -/* CHZN reset few styles */
369   -.chzn-container-single .chzn-single {
370   - background: #FFF;
371   - border: 1px solid #bbb;
372   - box-shadow: none;
373   -}
374   -.chzn-container-active .chzn-single {
375   - background: #fff;
376   -}
377   -
378   -
379 277 .supp_diff_link,
380 278 .show-all-commits {
381 279 cursor: pointer;
... ... @@ -481,27 +379,6 @@ pre {
481 379 }
482 380 }
483 381  
484   -.float-link {
485   - float: left;
486   - margin-right: 15px;
487   - .s16 {
488   - margin-right: 5px;
489   - }
490   -}
491   -
492   -.dashboard-search-filter {
493   - padding:5px;
494   -
495   - .search-text-input {
496   - float:left;
497   - @extend .span2;
498   - }
499   - .btn {
500   - margin-left: 5px;
501   - float:left;
502   - }
503   -}
504   -
505 382 h1.http_status_code {
506 383 font-size: 56px;
507 384 line-height: 100px;
... ... @@ -532,18 +409,6 @@ img.emoji {
532 409 display: none;
533 410 }
534 411  
535   -.label-branch {
536   - @include border-radius(4px);
537   - padding: 2px 4px;
538   - border: none;
539   - font-size: 14px;
540   - background: #474D57;
541   - color: #fff;
542   - font-family: $monospace_font;
543   - text-shadow: 0 1px 1px #111;
544   - font-weight: normal;
545   -}
546   -
547 412 .chart {
548 413 overflow: hidden;
549 414 height: 220px;
... ...
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
  Diff comments   View file @39f4604
1   -/** AVATARS **/
2   -img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
3   -img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
4   -img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
5   -img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
6   -img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
  1 +.avatar {
  2 + float: left;
  3 + margin-right: 12px;
  4 + width: 40px;
  5 + border: 1px solid #ddd;
  6 + padding: 1px;
  7 +
  8 + &.avatar-inline {
  9 + float: none;
  10 + margin-left: 3px;
  11 +
  12 + &.s16 { margin-right: 2px; }
  13 + &.s24 { margin-right: 2px; }
  14 + }
  15 +
  16 + &.s16 { width: 16px; height: 16px; margin-right: 6px; }
  17 + &.s24 { width: 24px; height: 24px; margin-right: 8px; }
  18 + &.s32 { width: 32px; height: 32px; margin-right: 10px; }
  19 + &.s90 { width: 90px; height: 90px; margin-right: 15px; }
  20 +}
  21 +
  22 +
7 23 img.lil_av { padding-left: 4px; padding-right: 3px; }
8 24 img.small { width: 80px; }
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @39f4604
... ... @@ -10,11 +10,16 @@
10 10  
11 11 /** COMMON CLASSES **/
12 12 .left { float:left }
13   -.append-bottom-10 { margin-bottom:10px }
14   -.append-bottom-20 { margin-bottom:20px }
  13 +
15 14 .prepend-top-10 { margin-top:10px }
16 15 .prepend-top-20 { margin-top:20px }
17   -.prepend-left { margin-left:20px }
  16 +.prepend-left-10 { margin-left:10px }
  17 +.prepend-left-20 { margin-left:20px }
  18 +.append-right-10 { margin-right:10px }
  19 +.append-right-20 { margin-right:20px }
  20 +.append-bottom-10 { margin-bottom:10px }
  21 +.append-bottom-20 { margin-bottom:20px }
  22 +
18 23 .padded { padding:20px }
19 24 .ipadded { padding:20px!important }
20 25 .lborder { border-left:1px solid #eee }
... ... @@ -32,8 +37,6 @@
32 37 border-color: #DDD;
33 38 }
34 39  
35   -.well { padding: 15px; }
36   -
37 40 /** HELPERS **/
38 41 .nothing_here_message {
39 42 text-align: center;
... ...
app/assets/stylesheets/sections/admin.scss
  Diff comments   View file @39f4604
  1 +/**
  2 + * Admin area
  3 + *
  4 + */
  5 +.admin_dash {
  6 + .data {
  7 + a {
  8 + h1 {
  9 + line-height: 48px;
  10 + font-size: 48px;
  11 + padding: 20px;
  12 + text-align: center;
  13 + font-weight: normal;
  14 + }
  15 + }
  16 + }
  17 +}
  18 +
1 19 .admin-filter form {
2 20 label { width: 110px; }
3 21 .controls { margin-left: 130px; }
... ...
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @39f4604
1   -.projects {
2   - @extend .row;
3   - .activities {
4   - }
5   -
6   - .side {
7   - @extend .pull-right;
8   -
9   - .ui-box {
10   - margin: 3px;
11   - > .title {
12   - padding: 2px 15px;
13   - }
14   - .nav-projects-tabs li { padding: 0; }
15   - .well-list {
16   - li { padding: 15px; }
17   - .arrow {
18   - float: right;
19   - padding: 10px;
20   - margin: 0;
21   - }
22   - .last_activity {
23   - padding-top: 5px;
24   - display: block;
25   - span, strong {
26   - font-size: 12px;
27   - color: #666;
28   - }
29   - }
30   - }
31   - @extend .ui-box;
32   - }
33   - }
34   -}
35   -
36 1 .new_project,
37 2 .edit_project {
38 3 .project_name_holder {
... ...
app/assets/stylesheets/selects.scss
  Diff comments   View file @39f4604
  1 +/* CHZN reset few styles */
  2 +.chzn-container-single .chzn-single {
  3 + background: #FFF;
  4 + border: 1px solid #bbb;
  5 + box-shadow: none;
  6 +}
  7 +.chzn-container-active .chzn-single {
  8 + background: #fff;
  9 +}
  10 +
1 11 .ajax-users-select {
2 12 width: 400px;
3 13 }
... ...