Download as
Browse Code »

Commit ef088725341b2f202b7d33561d12efdf91b7f354

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

css refactor

Showing 7 changed files with 135 additions and 196 deletions   Show diff stats
app/assets/stylesheets/commits.css.scss 0 → 100644
  Diff comments   View file @ef08872
... ... @@ -0,0 +1,40 @@
  1 +/** Commit diff view **/
  2 +.diff_file {
  3 + border:1px solid #CCC;
  4 + margin-bottom:1em;
  5 +
  6 + .diff_file_header {
  7 + padding:5px 5px;
  8 + border-bottom:1px solid #CCC;
  9 + background: #eee;
  10 + }
  11 + .diff_file_content {
  12 + overflow:auto;
  13 + overflow-y:hidden;
  14 + background:#fff;
  15 + color:#333;
  16 + font-size: 12px;
  17 + font-family: 'Courier New', 'andale mono','lucida console',monospace;
  18 + }
  19 + .diff_file_content_image {
  20 + background:#eee;
  21 + text-align:center;
  22 + img {
  23 + padding:100px;
  24 + max-width:300px;
  25 + }
  26 + }
  27 +}
  28 +
  29 +.diff_file_content{
  30 + .old_line, .new_line {
  31 + background:#ECECEC;
  32 + color:#777;
  33 + width:30px;
  34 + float:left;
  35 + padding: 0px 5px;
  36 + border-right: 1px solid #ccc;
  37 + }
  38 +}
  39 +
  40 +
... ...
app/assets/stylesheets/dashboard.css.scss
View file @60f4576
... ... @@ -1,3 +0,0 @@
1   -// Place all the styles related to the Dashboard controller here.
2   -// They will automatically be included in application.css.
3   -// You can use Sass (SCSS) here: http://sass-lang.com/
app/assets/stylesheets/issues.css.scss
  Diff comments   View file @ef08872
1   -// Place all the styles related to the Issues controller here.
2   -// They will automatically be included in application.css.
3   -// You can use Sass (SCSS) here: http://sass-lang.com/
  1 +.issue-number {
  2 + float: left;
  3 + border-radius: 5px;
  4 + text-shadow: none;
  5 + background: rgba(0, 0, 0, 0.12);
  6 + text-align: center;
  7 + padding: 14px 8px;
  8 + width: 40px;
  9 + margin-right: 10px;
  10 + color: #444;
  11 +}
  12 +
  13 +#issues-table-holder .issue:hover .action-links { display:block; }
  14 +
  15 +.issues_filter {
  16 + margin-top:10px;
  17 + .left {
  18 + margin-right:15px;
  19 + }
  20 +}
  21 +.top_panel_issues{
  22 + #issue_search_form {
  23 + margin:5px 0;
  24 + input {
  25 + border:1px solid #D3D3D3;
  26 + padding: 3px;
  27 + height: 28px;
  28 + width: 300px;
  29 + -webkit-appearance:none;
  30 + box-sizing: border-box;
  31 + -moz-box-sizing: border-box;
  32 +
  33 + &:focus {
  34 + border-color:#c2e1ef;
  35 + }
  36 + }
  37 + }
  38 +}
... ...
app/assets/stylesheets/notes.css.scss 0 → 100644
  Diff comments   View file @ef08872
... ... @@ -0,0 +1,44 @@
  1 +/** Notes **/
  2 +
  3 +#notes-list {
  4 + display:block;
  5 + list-style:none;
  6 + margin:0px;
  7 + padding:0px;
  8 +}
  9 +
  10 +.issue_notes {
  11 + .note_content {
  12 + float:left;
  13 + width:400px;
  14 + }
  15 +}
  16 +
  17 +
  18 +/* Note textare */
  19 +#note_note {
  20 + height:100px;
  21 + width:97%;
  22 + font-size:14px;
  23 +}
  24 +
  25 +#new_note {
  26 + #note_note {
  27 + height:25px;
  28 + }
  29 + .attach_holder {
  30 + display:none;
  31 + }
  32 +}
  33 +
  34 +#notes-list .note .delete-note { display:none; }
  35 +#notes-list .note:hover .delete-note { display:block; }
  36 +
  37 +body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
  38 +body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
  39 +body.project-page #notes-list .note img{float: left; margin-right: 10px;}
  40 +body.project-page #notes-list .note span.note-title{display: block;}
  41 +body.project-page #notes-list .note span.note-title{margin-bottom: 10px}
  42 +body.project-page #notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;}
  43 +body.project-page #notes-list .note span.note-author strong{font-weight: bold; font-style: normal;}
  44 +
... ...
app/assets/stylesheets/profile.css.scss
View file @60f4576
... ... @@ -1,3 +0,0 @@
1   -// Place all the styles related to the Profile controller here.
2   -// They will automatically be included in application.css.
3   -// You can use Sass (SCSS) here: http://sass-lang.com/
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @ef08872
... ... @@ -4,26 +4,20 @@
4 4  
5 5 @mixin round-borders-bottom($radius) {
6 6 border-top: 1px solid #eaeaea;
7   -
8 7 -moz-border-radius-bottomright: $radius;
9 8 -moz-border-radius-bottomleft: $radius;
10   -
11 9 border-bottom-right-radius: $radius;
12 10 border-bottom-left-radius: $radius;
13   -
14 11 -webkit-border-bottom-left-radius: $radius;
15 12 -webkit-border-bottom-right-radius: $radius;
16 13 }
17 14  
18 15 @mixin round-borders-top($radius) {
19 16 border-top: 1px solid #eaeaea;
20   -
21 17 -moz-border-radius-topright: $radius;
22 18 -moz-border-radius-topleft: $radius;
23   -
24 19 border-top-right-radius: $radius;
25 20 border-top-left-radius: $radius;
26   -
27 21 -webkit-border-top-left-radius: $radius;
28 22 -webkit-border-top-right-radius: $radius;
29 23 }
... ... @@ -36,45 +30,18 @@
36 30 }
37 31  
38 32 @mixin hover-color {
39   - background: #fff !important;
40   - background: -webkit-gradient(linear,left top,left bottom,from(#fff),to(#FFF6BF)) !important;
41   - background: -moz-linear-gradient(top,#fff,#FFF6BF) !important;
42   - background: transparent 9 !important;
  33 + background-color:#FFFFCF;
43 34 }
44 35  
45   -.diff_file {
46   - border:1px solid #CCC;
47   - margin-bottom:1em;
48   -
49   - .diff_file_header {
50   - padding:5px 5px;
51   - border-bottom:1px solid #CCC;
52   - background: #eee;
53   - }
54   - .diff_file_content {
55   - overflow:auto;
56   - overflow-y:hidden;
57   - background:#fff;
58   - color:#333;
59   - font-size: 12px;
60   - font-family: 'Courier New', 'andale mono','lucida console',monospace;
61   - }
62   - .diff_file_content_image {
63   - background:#eee;
64   - text-align:center;
65   - img {
66   - padding:100px;
67   - max-width:300px;
68   - }
69   - }
  36 +@mixin panel-color {
  37 + background: #111 !important;
  38 + background: -webkit-gradient(linear,left top,left bottom,from(#333),to(#111)) !important;
  39 + background: -moz-linear-gradient(top,#333,#111) !important;
  40 + background: transparent 9 !important;
70 41 }
71 42  
72   -#logo {
73   - &:hover {
74   - background:none;
75   - }
76   -}
77 43  
  44 +/** File stat **/
78 45 .file_stats {
79 46 margin-bottom:10px;
80 47 @include round-borders-all(4px);
... ... @@ -103,12 +70,6 @@ table.round-borders {
103 70 float:left;
104 71 }
105 72  
106   -@mixin panel-color {
107   - background: #111 !important;
108   - background: -webkit-gradient(linear,left top,left bottom,from(#333),to(#111)) !important;
109   - background: -moz-linear-gradient(top,#333,#111) !important;
110   - background: transparent 9 !important;
111   -}
112 73  
113 74 #content-container{
114 75 min-height:250px;
... ... @@ -123,17 +84,6 @@ a {
123 84 color: #111;
124 85 }
125 86  
126   -.diff_file_content{
127   - .old_line, .new_line {
128   - background:#ECECEC;
129   - color:#777;
130   - width:30px;
131   - float:left;
132   - padding: 0px 5px;
133   - border-right: 1px solid #ccc;
134   - }
135   -}
136   -
137 87 .view_file_content{
138 88 .old_line, .new_line {
139 89 background:#ECECEC;
... ... @@ -263,36 +213,12 @@ input.ssh_project_url {
263 213 border-width: 1px;
264 214 }
265 215  
266   -
267   -.top_menu_count {
268   - background: none repeat scroll 0 0 white;
269   - color: #333;
270   - border-color: #4BB8D2;
271   - padding: 2px;
272   - font-size:10px;
273   - border-top:none;
274   - text-align:center;
275   - float:right;
276   - width:25px;
277   -
278   -
279   -}
280   -
281   -#logo {
282   - color: #EAEAEA;
283   - font-family: monospace;
284   - font-size: 26px;
285   - padding: 4px;
286   - text-decoration: none;
287   - text-shadow: #555 1px 1px;
288   -}
289   -
290 216 /** FLASH **/
291 217  
292 218 #flash_container {
293 219 height:40px;
294 220 position:fixed;
295   - z-index:1009;
  221 + z-index:1209;
296 222 top:0px;
297 223 width:100%;
298 224 margin-bottom:10px;
... ... @@ -342,34 +268,6 @@ input.ssh_project_url {
342 268 }
343 269 }
344 270  
345   -/** Notes **/
346   -
347   -#notes-list {
348   - display:block;
349   - list-style:none;
350   - margin:0px;
351   - padding:0px;
352   -}
353   -
354   -.notes_count {
355   - background: none repeat scroll 0 0 #FFF6BF;
356   - border-color: #FFD324;
357   - color: #514721;
358   - border: 2px solid #DDDDDD;
359   - margin-bottom: 1em;
360   - margin-top: 3px;
361   - padding: 2px 5px;
362   - position: relative;
363   - right: 6px;
364   - top: 6px;
365   -}
366   -
367   -.issue_notes {
368   - .note_content {
369   - float:left;
370   - width:400px;
371   - }
372   -}
373 271  
374 272 #user_projects_limit{
375 273 width: 60px;
... ... @@ -400,24 +298,6 @@ input.ssh_project_url {
400 298 }
401 299  
402 300  
403   -/* Note textare */
404   -#note_note {
405   - height:100px;
406   - width:97%;
407   - font-size:14px;
408   -}
409   -
410   -#new_note {
411   - #note_note {
412   - height:25px;
413   - }
414   - .attach_holder {
415   - display:none;
416   - }
417   -}
418   -
419   -
420   -
421 301 .tag {
422 302 @include round-borders-all(4px);
423 303 padding:2px 4px;
... ... @@ -448,33 +328,6 @@ input.ssh_project_url {
448 328 }
449 329 }
450 330  
451   -#issues-table .issue {
452   - &.critical {
453   - td {
454   - //background: #D12F19;
455   - //color:#fff;
456   - }
457   - }
458   -}
459   -
460   -.top_panel_issues{
461   - #issue_search_form {
462   - margin:5px 0;
463   - input {
464   - border:1px solid #D3D3D3;
465   - padding: 3px;
466   - height: 28px;
467   - width: 300px;
468   - -webkit-appearance:none;
469   - box-sizing: border-box;
470   - -moz-box-sizing: border-box;
471   -
472   - &:focus {
473   - border-color:#c2e1ef;
474   - }
475   - }
476   - }
477   -}
478 331  
479 332 .left {
480 333 float:left;
... ... @@ -553,12 +406,6 @@ table.highlighttable .linenodiv pre {
553 406 width:200px;
554 407 }
555 408  
556   -.issues_filter {
557   - margin-top:10px;
558   - .left {
559   - margin-right:15px;
560   - }
561   -}
562 409 .filter .left { margin-right:15px; }
563 410  
564 411  
... ... @@ -575,8 +422,6 @@ body.project-page table .commit {
575 422 }
576 423 }
577 424  
578   -#notes-list .note .delete-note { display:none; }
579   -#notes-list .note:hover .delete-note { display:block; }
580 425  
581 426 .snippet .action-links,
582 427 #issues-table-holder .issue .action-links {
... ... @@ -588,27 +433,6 @@ body.project-page table .commit {
588 433  
589 434 .snippet:hover .action-links { display:block; }
590 435  
591   -.issue-number {
592   - float: left;
593   - border-radius: 5px;
594   - text-shadow: none;
595   - background: rgba(0, 0, 0, 0.12);
596   - text-align: center;
597   - padding: 14px 8px;
598   - width: 40px;
599   - margin-right: 10px;
600   - color: #444;
601   -}
602   -
603   -#issues-table-holder .issue:hover .action-links { display:block; }
604   -
605   -body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
606   -body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
607   -body.project-page #notes-list .note img{float: left; margin-right: 10px;}
608   -body.project-page #notes-list .note span.note-title{display: block;}
609   -body.project-page #notes-list .note span.note-title{margin-bottom: 10px}
610   -body.project-page #notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;}
611   -body.project-page #notes-list .note span.note-author strong{font-weight: bold; font-style: normal;}
612 436  
613 437  
614 438 /** NEW PROJECT **/
... ... @@ -640,3 +464,8 @@ body.project-page #notes-list .note span.note-author strong{font-weight: bold; f
640 464 color: #999
641 465 }
642 466 }
  467 +
  468 +/** UI autocomplete **/
  469 +.ui-autocomplete { @include round-borders-all(5px); }
  470 +.ui-menu-item { cursor: pointer }
  471 +
... ...
app/assets/stylesheets/snippets.css.scss
View file @60f4576
... ... @@ -1,3 +0,0 @@
1   -// Place all the styles related to the Snippets controller here.
2   -// They will automatically be included in application.css.
3   -// You can use Sass (SCSS) here: http://sass-lang.com/