Download as
Browse Code »

Commit 51558bd57a7021a31d4e60342078e48a3dcb805a

Authored by randx
1 parent 1dd938d2
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Refactoring scss & improving some UI elements

Showing 14 changed files with 101 additions and 216 deletions   Show diff stats
app/assets/images/merge.png 0 → 100644
View file @51558bd

593 Bytes
app/assets/stylesheets/common.scss
  Diff comments   View file @51558bd
@@ -105,16 +105,6 @@ table a code { @@ -105,16 +105,6 @@ table a code {
105 .git_url_wrapper { 105 .git_url_wrapper {
106 margin-right:50px 106 margin-right:50px
107 } 107 }
108 -.file_stats {  
109 - span {  
110 - img {  
111 - width:14px;  
112 - float:left;  
113 - margin-right:6px;  
114 - padding:2px 0;  
115 - }  
116 - }  
117 -}  
118 108
119 .handle:hover { 109 .handle:hover {
120 cursor:move; 110 cursor:move;
@@ -148,18 +138,6 @@ span.update-author { @@ -148,18 +138,6 @@ span.update-author {
148 font-weight:bold; 138 font-weight:bold;
149 } 139 }
150 140
151 -a.project-update.titled {  
152 - position:relative;  
153 - padding-left:35% !important;  
154 - .title-block {  
155 - padding:10px;  
156 - width:35%;  
157 - position:absolute;  
158 - left:0;  
159 - top:0;  
160 - }  
161 -}  
162 -  
163 .neib { 141 .neib {
164 margin-right:10px; 142 margin-right:10px;
165 } 143 }
@@ -230,10 +208,6 @@ form { @@ -230,10 +208,6 @@ form {
230 } 208 }
231 209
232 210
233 -  
234 -  
235 -  
236 -  
237 .field_with_errors { 211 .field_with_errors {
238 display:inline; 212 display:inline;
239 } 213 }
@@ -343,40 +317,6 @@ p.time { @@ -343,40 +317,6 @@ p.time {
343 } 317 }
344 318
345 319
346 -/**  
347 - * Dashboard page  
348 - *  
349 - */  
350 -.dashboard_category {  
351 - margin-bottom:30px;  
352 - h3 a {  
353 - color:#474D57;  
354 - &:hover {  
355 - text-decoration:underline;  
356 - }  
357 - }  
358 -  
359 - .dashboard_block {  
360 - .dash_project_item {  
361 - margin-bottom:10px;  
362 - border:none;  
363 - padding:0px 5px;  
364 - .project_link {  
365 - color:#888;  
366 - &:hover {  
367 - color:#111;  
368 - .ico.project {  
369 - background-position:-209px -21px;  
370 - }  
371 - }  
372 - }  
373 - h4 {  
374 - color:#666;  
375 - }  
376 - }  
377 - }  
378 -}  
379 -  
380 .styled_image { 320 .styled_image {
381 border:2px solid #ddd; 321 border:2px solid #ddd;
382 } 322 }
@@ -466,39 +406,6 @@ p.time { @@ -466,39 +406,6 @@ p.time {
466 } 406 }
467 } 407 }
468 408
469 -.btn {  
470 - &.very_small {  
471 - font-size:11px;  
472 - padding:2px 6px;  
473 - margin:2px;  
474 - }  
475 -  
476 - &.grouped {  
477 - margin-right:7px;  
478 - float:left;  
479 - }  
480 -  
481 - &.padded {  
482 - margin-right:3px;  
483 - padding:4px 10px 4px;  
484 - }  
485 -}  
486 -  
487 -  
488 -.prettyprint {  
489 - background-color: #fefbf3;  
490 - padding: 9px;  
491 - border: 1px solid rgba(0,0,0,.2);  
492 - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);  
493 - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.1);  
494 - box-shadow: 0 1px 2px rgba(0,0,0,.1);  
495 -}  
496 -  
497 -.hint {  
498 - font-style: italic;  
499 - color: #999;  
500 -}  
501 -  
502 .upvotes { 409 .upvotes {
503 font-size: 14px; 410 font-size: 14px;
504 font-weight: bold; 411 font-weight: bold;
@@ -622,14 +529,6 @@ li.note { @@ -622,14 +529,6 @@ li.note {
622 } 529 }
623 530
624 531
625 -/**  
626 - * Milestones list  
627 - *  
628 - */  
629 -  
630 -.milestone {  
631 - @extend .wll;  
632 -}  
633 532
634 /** 533 /**
635 * Admin area 534 * Admin area
@@ -676,11 +575,10 @@ li.note { @@ -676,11 +575,10 @@ li.note {
676 * 575 *
677 */ 576 */
678 .event_lp { 577 .event_lp {
679 - @extend .alert-info; 578 + @extend .ui-box;
  579 + color:#777;
680 margin-bottom:20px; 580 margin-bottom:20px;
681 padding:8px; 581 padding:8px;
682 - border-style: solid;  
683 - border-width: 1px;  
684 @include border-radius(4px); 582 @include border-radius(4px);
685 min-height:22px; 583 min-height:22px;
686 584
@@ -694,88 +592,19 @@ li.note { @@ -694,88 +592,19 @@ li.note {
694 cursor:pointer; 592 cursor:pointer;
695 } 593 }
696 594
697 -/**  
698 - * Issues, MRs legend  
699 - *  
700 - */  
701 -  
702 -.list_legend {  
703 - float:left;  
704 - margin-right:20px;  
705 - .icon {  
706 - width:12px;  
707 - height:12px;  
708 - float:left;  
709 - margin-right:5px;  
710 - margin-top: 2px;  
711 - @include border-radius(4px);  
712 - &.today{  
713 - background: #ADA;  
714 - border:1px solid #8B8;  
715 - }  
716 - &.closed {  
717 - background: #DDD;  
718 - border:1px solid #BBB;  
719 - }  
720 - &.yours {  
721 - background: #AAD;  
722 - border:1px solid #88B;  
723 - }  
724 - &.merged {  
725 - background: #DAD;  
726 - border:1px solid #B8B;  
727 - }  
728 - }  
729 - .text {  
730 - padding-bottom: 10px;  
731 - float:left;  
732 - }  
733 -}  
734 -  
735 .merge_request, 595 .merge_request,
736 .issue { 596 .issue {
737 - .list_legend {  
738 - margin-right: 5px;  
739 - margin-top: 14px;  
740 - .icon {  
741 - width:8px;  
742 - height:8px;  
743 - float:left;  
744 - margin-right:5px;  
745 - @include border-radius(4px);  
746 - border:1px solid #ddd;  
747 - }  
748 - }  
749 -  
750 &.today{ 597 &.today{
751 background: #EFE; 598 background: #EFE;
752 border-color:#CEC; 599 border-color:#CEC;
753 - .icon {  
754 - background: #ADA;  
755 - border:1px solid #8B8;  
756 - }  
757 } 600 }
758 &.closed { 601 &.closed {
759 background: #F5f5f5; 602 background: #F5f5f5;
760 border-color:#E5E5E5; 603 border-color:#E5E5E5;
761 - .icon {  
762 - background: #DDD;  
763 - border:1px solid #BBB;  
764 - }  
765 - }  
766 - &.yours {  
767 - .icon {  
768 - background: #AAD;  
769 - border:1px solid #88B;  
770 - }  
771 } 604 }
772 &.merged { 605 &.merged {
773 background: #F5f5f5; 606 background: #F5f5f5;
774 border-color:#E5E5E5; 607 border-color:#E5E5E5;
775 - .icon {  
776 - background: #DAD;  
777 - border:1px solid #B8B;  
778 - }  
779 } 608 }
780 } 609 }
781 610
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @51558bd
@@ -69,4 +69,20 @@ @@ -69,4 +69,20 @@
69 border-color:#aaa; 69 border-color:#aaa;
70 background-color:#ccc; 70 background-color:#ccc;
71 } 71 }
  72 +
  73 + &.very_small {
  74 + font-size:11px;
  75 + padding:2px 6px;
  76 + margin:2px;
  77 + }
  78 +
  79 + &.grouped {
  80 + margin-right:7px;
  81 + float:left;
  82 + }
  83 +
  84 + &.padded {
  85 + margin-right:3px;
  86 + padding:4px 10px 4px;
  87 + }
72 } 88 }
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @51558bd
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 .no-borders { border:none; } 27 .no-borders { border:none; }
28 .vlink { color: $link_color !important; } 28 .vlink { color: $link_color !important; }
29 .borders { border: 1px solid #ccc; @include shade; } 29 .borders { border: 1px solid #ccc; @include shade; }
  30 +.hint { font-style: italic; color: #999; }
30 31
31 /** PILLS & TABS**/ 32 /** PILLS & TABS**/
32 .nav-pills a:hover { background-color:#888; } 33 .nav-pills a:hover { background-color:#888; }
app/assets/stylesheets/sections/commits.scss
  Diff comments   View file @51558bd
@@ -206,9 +206,24 @@ @@ -206,9 +206,24 @@
206 min-width:65px; 206 min-width:65px;
207 font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; 207 font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
208 } 208 }
  209 +
  210 + .commit-author-name {
  211 + color: #777;
  212 + }
209 } 213 }
210 214
211 .diff_file_header a, 215 .diff_file_header a,
212 .file_stats a { 216 .file_stats a {
213 color:$style_color; 217 color:$style_color;
214 } 218 }
  219 +
  220 +.file_stats {
  221 + span {
  222 + img {
  223 + width:14px;
  224 + float:left;
  225 + margin-right:6px;
  226 + padding:2px 0;
  227 + }
  228 + }
  229 +}
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @51558bd
@@ -99,3 +99,11 @@ input.check_all_issues { @@ -99,3 +99,11 @@ input.check_all_issues {
99 #update_status { 99 #update_status {
100 width:100px; 100 width:100px;
101 } 101 }
  102 +
  103 +/**
  104 + * Milestones list
  105 + *
  106 + */
  107 +.milestone {
  108 + @extend .wll;
  109 +}
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @51558bd
@@ -11,23 +11,6 @@ @@ -11,23 +11,6 @@
11 background:#f1f1f1; 11 background:#f1f1f1;
12 } 12 }
13 13
14 - .commit {  
15 - margin:0;  
16 - padding:0;  
17 - padding: 5px;  
18 - margin-bottom: 5px;  
19 -  
20 - .committed_ago {  
21 - display:none;  
22 - }  
23 - .browse_code_link_holder {  
24 - display:none;  
25 - }  
26 - list-style:none;  
27 - &:hover {  
28 - background:none;  
29 - }  
30 - }  
31 } 14 }
32 15
33 /** 16 /**
@@ -110,3 +93,31 @@ li.merge_request { @@ -110,3 +93,31 @@ li.merge_request {
110 font-weight:bold; 93 font-weight:bold;
111 font-family: monospace; 94 font-family: monospace;
112 } 95 }
  96 +
  97 +.mr_source_commit,
  98 +.mr_target_commit {
  99 + .commit {
  100 + margin:0;
  101 + padding:0;
  102 + padding: 5px;
  103 + margin-bottom: 5px;
  104 + .avatar { position:relative }
  105 + .row_title {
  106 + color:#444;
  107 + }
  108 + .commit-author-name,
  109 + .dash,
  110 + .committed_ago,
  111 + .browse_code_link_holder {
  112 + display:none;
  113 + }
  114 + list-style:none;
  115 + &:hover {
  116 + background:none;
  117 + }
  118 + }
  119 +}
  120 +
  121 +.mr_direction_tip {
  122 + margin-top:40px
  123 +}
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @51558bd
@@ -33,11 +33,14 @@ @@ -33,11 +33,14 @@
33 color:#888; 33 color:#888;
34 } 34 }
35 .btn { 35 .btn {
36 - padding:6px; 36 + padding:6px 10px;
37 margin-left:10px; 37 margin-left:10px;
38 margin-bottom:8px; 38 margin-bottom:8px;
39 } 39 }
40 } 40 }
  41 + .adv_settings {
  42 + h6 { margin-left:40px; }
  43 + }
41 } 44 }
42 45
43 .project_clone_panel { 46 .project_clone_panel {
app/views/commits/_commit.html.haml
  Diff comments   View file @51558bd
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), class: "right" 4 %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), class: "right"
5 %p 5 %p
6 = link_to commit.short_id(8), project_commit_path(@project, id: commit.id), class: "commit_short_id" 6 = link_to commit.short_id(8), project_commit_path(@project, id: commit.id), class: "commit_short_id"
7 - %strong.cgray= commit.author_name  
8 - – 7 + %strong.commit-author-name= commit.author_name
  8 + %span.dash –
9 = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16 9 = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
10 = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, id: commit.id), class: "row_title" 10 = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, id: commit.id), class: "row_title"
11 11
app/views/events/_event_last_push.html.haml
  Diff comments   View file @51558bd
@@ -9,5 +9,5 @@ @@ -9,5 +9,5 @@
9 at 9 at
10 %strong= link_to event.project.name, event.project 10 %strong= link_to event.project.name, event.project
11 11
12 - = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn very_small primary" do 12 + = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn very_small" do
13 Create Merge Request 13 Create Merge Request
app/views/issues/_form.html.haml
  Diff comments   View file @51558bd
@@ -43,14 +43,15 @@ @@ -43,14 +43,15 @@
43 43
44 .actions 44 .actions
45 - if @issue.new_record? 45 - if @issue.new_record?
46 - = f.submit 'Submit new issue', class: "primary btn" 46 + = f.submit 'Submit new issue', class: "btn save-btn"
47 -else 47 -else
48 - = f.submit 'Save changes', class: "primary btn" 48 + = f.submit 'Save changes', class: "save-btn btn"
49 49
  50 + - cancel_class = 'btn cancel-btn'
50 - if request.xhr? 51 - if request.xhr?
51 - = link_to "Cancel", "#back", onclick: "backToIssues();", class: "btn" 52 + = link_to "Cancel", "#back", onclick: "backToIssues();", class: cancel_class
52 - else 53 - else
53 - if @issue.new_record? 54 - if @issue.new_record?
54 - = link_to "Cancel", project_issues_path(@project), class: "btn" 55 + = link_to "Cancel", project_issues_path(@project), class: cancel_class
55 - else 56 - else
56 - = link_to "Cancel", project_issue_path(@project, @issue), class: "btn" 57 + = link_to "Cancel", project_issue_path(@project, @issue), class: cancel_class
app/views/merge_requests/_form.html.haml
  Diff comments   View file @51558bd
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 %br 9 %br
10 10
11 .row 11 .row
12 - .span6 12 + .span5
13 .mr_branch_box 13 .mr_branch_box
14 %h5 From (Head Branch) 14 %h5 From (Head Branch)
15 .body 15 .body
@@ -17,10 +17,11 @@ @@ -17,10 +17,11 @@
17 = f.label :source_branch, "From", class: "control-label" 17 = f.label :source_branch, "From", class: "control-label"
18 .controls 18 .controls
19 = f.select(:source_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px") 19 = f.select(:source_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px")
20 - .bottom_commit  
21 - .mr_source_commit 20 + .mr_source_commit
22 21
23 - .span6 22 + .span2
  23 + %center= image_tag "merge.png", class: 'mr_direction_tip'
  24 + .span5
24 .mr_branch_box 25 .mr_branch_box
25 %h5 To (Base Branch) 26 %h5 To (Base Branch)
26 .body 27 .body
@@ -28,8 +29,7 @@ @@ -28,8 +29,7 @@
28 = f.label :target_branch, "To", class: "control-label" 29 = f.label :target_branch, "To", class: "control-label"
29 .controls 30 .controls
30 = f.select(:target_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px") 31 = f.select(:target_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px")
31 - .bottom_commit  
32 - .mr_target_commit 32 + .mr_target_commit
33 33
34 %h4.cdark 2. Fill info 34 %h4.cdark 2. Fill info
35 35
@@ -48,12 +48,12 @@ @@ -48,12 +48,12 @@
48 .control-group 48 .control-group
49 49
50 .form-actions 50 .form-actions
51 - = f.submit 'Save', class: "btn-primary btn" 51 + = f.submit 'Save', class: "btn save-btn"
52 - if @merge_request.new_record? 52 - if @merge_request.new_record?
53 - = link_to project_merge_requests_path(@project), class: "btn" do 53 + = link_to project_merge_requests_path(@project), class: "btn cancel-btn" do
54 Cancel 54 Cancel
55 - else 55 - else
56 - = link_to project_merge_request_path(@project, @merge_request), class: "btn" do 56 + = link_to project_merge_request_path(@project, @merge_request), class: "btn cancel-btn" do
57 Cancel 57 Cancel
58 58
59 59
app/views/projects/_form.html.haml
  Diff comments   View file @51558bd
@@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
10 .input 10 .input
11 = f.text_field :name, placeholder: "Example Project", class: "xxlarge" 11 = f.text_field :name, placeholder: "Example Project", class: "xxlarge"
12 12
13 - %h5.page_title  
14 - .alert.alert-info  
15 - %h5 Advanced settings: 13 + %hr
  14 + .adv_settings
  15 + %h6 Advanced settings:
16 .clearfix 16 .clearfix
17 = f.label :path do 17 = f.label :path do
18 Path 18 Path
@@ -34,8 +34,9 @@ @@ -34,8 +34,9 @@
34 .input= f.select(:default_branch, @project.heads.map(&:name), {}, style: "width:210px;") 34 .input= f.select(:default_branch, @project.heads.map(&:name), {}, style: "width:210px;")
35 35
36 - unless @project.new_record? 36 - unless @project.new_record?
37 - .alert.alert-info  
38 - %h5 Features: 37 + %hr
  38 + .adv_settings
  39 + %h6 Features:
39 40
40 .clearfix 41 .clearfix
41 = f.label :issues_enabled, "Issues" 42 = f.label :issues_enabled, "Issues"
@@ -56,7 +57,7 @@ @@ -56,7 +57,7 @@
56 %br 57 %br
57 58
58 .actions 59 .actions
59 - = f.submit 'Save', class: "btn primary" 60 + = f.submit 'Save', class: "btn save-btn"
60 = link_to 'Cancel', @project, class: "btn" 61 = link_to 'Cancel', @project, class: "btn"
61 - unless @project.new_record? 62 - unless @project.new_record?
62 .right 63 .right
app/views/projects/_new_form.html.haml
  Diff comments   View file @51558bd
@@ -10,8 +10,8 @@ @@ -10,8 +10,8 @@
10 = f.submit 'Create project', class: "btn primary" 10 = f.submit 'Create project', class: "btn primary"
11 11
12 %hr 12 %hr
13 - .alert.alert-info  
14 - %h5 Advanced settings: 13 + %div.adv_settings
  14 + %h6 Advanced settings:
15 .clearfix 15 .clearfix
16 = f.label :path do 16 = f.label :path do
17 Git Clone 17 Git Clone