Download as
Browse Code »

Commit bf625b7c92d5f07516339f53fdf391185df8547c

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

polishing UI a bit. Added footer links for dashboard

Showing 11 changed files with 117 additions and 71 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @bf625b7
... ... @@ -145,6 +145,19 @@ span.update-author {
145 145 .label {
146 146 background-color: #474D57;
147 147  
  148 + &.label-tag {
  149 + background: none;
  150 + border: none;
  151 + padding:4px 6px;
  152 + color:#444;
  153 + text-shadow:0 0 1px #fff;
  154 +
  155 + &.grouped {
  156 + float: left;
  157 + margin-right: 6px;
  158 + padding: 6px;
  159 + }
  160 + }
148 161 &.label-issue {
149 162 background-color: #eee;
150 163 border: 1px solid #ccc;
... ... @@ -722,3 +735,10 @@ li.note {
722 735 padding: 6px 20px;
723 736 margin-right: 12px;
724 737 }
  738 +
  739 +.gitlab-promo {
  740 + a {
  741 + color:#aaa;
  742 + margin-right: 30px;
  743 + }
  744 +}
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @bf625b7
... ... @@ -72,3 +72,13 @@ img.lil_av { padding-left: 4px; padding-right:3px; }
72 72 /** HELPERS **/
73 73 .nothing_here_message { text-align:center; padding:20px; color:#777; }
74 74 p.slead { color:#456; font-size:16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
  75 +
  76 +/** FORMS **/
  77 +input[type='search'].search-text-input {
  78 + background-image: url("icon-search.png");
  79 + background-repeat: no-repeat;
  80 + background-position: 10px;
  81 + padding-left:25px;
  82 + @include border-radius(4px);
  83 + border:1px solid #ccc;
  84 +}
... ...
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @bf625b7
1   -.issue_form_box {
  1 +.issue_form_box {
2 2 @extend .main_box;
3   - .issue_title {
  3 + .issue_title {
4 4 @extend .top_box_content;
5   - .clearfix {
6   - margin-bottom:0px;
7   - input {
  5 + .clearfix {
  6 + margin-bottom:0px;
  7 + input {
8 8 @extend .span8;
9 9 }
10 10 }
11 11 }
12   - .issue_middle_block {
  12 + .issue_middle_block {
13 13 @extend .middle_box_content;
14 14 height:30px;
15   - .issue_assignee {
  15 + .issue_assignee {
16 16 @extend .span6;
17 17 float:left;
18 18 }
19   - .issue_milestone {
  19 + .issue_milestone {
20 20 @extend .span4;
21 21 float:left;
22 22 }
23 23 }
24   - .issue_description {
  24 + .issue_description {
25 25 @extend .bottom_box_content;
26 26 }
27 27 }
28 28  
29   -.issues_table {
30   - .issue {
  29 +.issues_table {
  30 + .issue {
31 31 padding:7px 10px;
32 32  
33   - .issue_check {
  33 + .issue_check {
34 34 float:left;
35 35 padding: 8px 0;
36 36 padding-right: 8px;
37 37 min-width: 15px;
38 38 }
39 39  
40   - p {
  40 + p {
41 41 padding-top:0;
42 42 padding-bottom:2px;
43 43 }
44 44  
45   - img.avatar {
  45 + img.avatar {
46 46 width:32px;
47 47 margin-top:4px;
48 48 }
49 49 }
50 50 }
51 51  
52   -input.check_all_issues {
  52 +input.check_all_issues {
53 53 float:left;
54 54 padding: 0;
55 55 margin:0;
... ... @@ -59,8 +59,8 @@ input.check_all_issues {
59 59 height: 22px;
60 60 }
61 61  
62   -.issues_content {
63   - .title {
  62 +.issues_content {
  63 + .title {
64 64 height: 40px;
65 65 }
66 66 }
... ... @@ -70,30 +70,30 @@ input.check_all_issues {
70 70 @media (min-width: 1200px) { .issues_filters select { width:220px; } }
71 71  
72 72  
73   -#issues-table-holder {
74   - .issues_filters {
75   - form {
  73 +#issues-table-holder {
  74 + .issues_filters {
  75 + form {
76 76 padding:0;
77 77 margin:0;
78 78 margin-top:7px
79 79 }
80   - }
  80 + }
81 81  
82   - .issues_bulk_update {
  82 + .issues_bulk_update {
83 83 margin: 0;
84   - form {
  84 + form {
85 85 padding:0;
86 86 margin:0;
87 87 margin-top:7px
88 88 }
89   - .update_selected_issues {
  89 + .update_selected_issues {
90 90 position:relative;
91 91 top:-2px;
92 92 margin-left:4px;
93 93 float:left;
94 94 }
95   -
96   - .update_issues_text {
  95 +
  96 + .update_issues_text {
97 97 padding:3px;
98 98 line-height: 18px;
99 99 float:left;
... ... @@ -101,10 +101,11 @@ input.check_all_issues {
101 101 }
102 102 }
103 103  
104   -#update_status {
  104 +#update_status {
105 105 width:100px;
106 106 }
107 107  
  108 +
108 109 /**
109 110 * Milestones list
110 111 *
... ...
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @bf625b7
1   -/**
  1 +/**
2 2 * MR form
3 3 *
4 4 */
5 5  
6   -.mr_branch_box {
  6 +.mr_branch_box {
7 7 @extend .ui-box;
8 8 margin-bottom:20px;
9 9  
10   - .body {
  10 + .body {
11 11 background:#f1f1f1;
12 12 }
13 13  
... ... @@ -17,19 +17,19 @@
17 17 * MR -> show: Automerge widget
18 18 *
19 19 */
20   -.automerge_widget {
21   - &.can_be_merged {
  20 +.automerge_widget {
  21 + &.can_be_merged {
22 22 background: #DFF0D8;
23 23 }
24 24  
25   - form {
  25 + form {
26 26 margin-bottom:0;
27   - .clearfix {
  27 + .clearfix {
28 28 margin-bottom:0;
29 29 }
30 30 }
31 31  
32   - .accept_group {
  32 + .accept_group {
33 33 float:left;
34 34 border: 1px solid #ADA;
35 35 padding: 2px;
... ... @@ -37,29 +37,29 @@
37 37 border-radius: 5px;
38 38 background: #CEB;
39 39  
40   - .accept_merge_request {
  40 + .accept_merge_request {
41 41 font-size:13px;
42 42 float:left;
43 43 }
44   - .remove_branch_holder {
  44 + .remove_branch_holder {
45 45 margin-left:20px;
46 46 margin-right:10px;
47 47 float:left;
48 48 }
49   - label {
  49 + label {
50 50 color:#444;
51 51 }
52 52 }
53 53  
54 54  
55   - .how_to_merge_link {
  55 + .how_to_merge_link {
56 56 @extend .primary;
57 57 }
58 58 }
59 59  
60   -.mr_nav_tabs {
61   - li {
62   - a {
  60 +.mr_nav_tabs {
  61 + li {
  62 + a {
63 63 font-weight:bold;
64 64 padding:8px 20px;
65 65 text-align:center;
... ... @@ -67,19 +67,19 @@
67 67 }
68 68 }
69 69  
70   -li.merge_request {
  70 +li.merge_request {
71 71 padding:7px 10px;
72   - img.avatar {
  72 + img.avatar {
73 73 width: 32px;
74 74 margin-top: 4px;
75 75 }
76   - p {
  76 + p {
77 77 padding: 0px;
78 78 padding-bottom: 2px;
79 79 }
80 80 }
81 81  
82   -.merge_in_progress {
  82 +.merge_in_progress {
83 83 @extend .padded;
84 84 @extend .append-bottom-10;
85 85 }
... ... @@ -88,22 +88,21 @@ li.merge_request {
88 88 @include round-borders-all(4px);
89 89 padding:2px 4px;
90 90 border:none;
91   - font-size:13px;
  91 + font-size:14px;
92 92 background: #474D57;
93 93 color:#fff;
94   - font-weight:bold;
95   - font-family: monospace;
  94 + font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
96 95 }
97 96  
98   -.mr_source_commit,
99   -.mr_target_commit {
100   - .commit {
  97 +.mr_source_commit,
  98 +.mr_target_commit {
  99 + .commit {
101 100 margin:0;
102 101 padding:0;
103 102 padding: 5px;
104 103 margin-bottom: 5px;
105 104 .avatar { position:relative }
106   - .row_title {
  105 + .row_title {
107 106 color:#444;
108 107 }
109 108 .commit-author-name,
... ... @@ -113,12 +112,12 @@ li.merge_request {
113 112 display:none;
114 113 }
115 114 list-style:none;
116   - &:hover {
  115 + &:hover {
117 116 background:none;
118 117 }
119 118 }
120 119 }
121 120  
122   -.mr_direction_tip {
  121 +.mr_direction_tip {
123 122 margin-top:40px
124 123 }
... ...
app/views/admin/resque/show.html.haml
  Diff comments   View file @bf625b7
1   -%h3 Resque
2   -%iframe{src: resque_url, width: 1168, height: 600, style: "border: none"}
  1 +%h3.page_title Resque
  2 +%br
  3 +.ui-box
  4 + %iframe{src: resque_url, width: '100%', height: 600, style: "border: none"}
... ...
app/views/dashboard/index.html.haml
  Diff comments   View file @bf625b7
... ... @@ -31,13 +31,19 @@
31 31 %span= project_last_activity(project)
32 32 .bottom= paginate @projects, theme: "gitlab"
33 33  
34   - %hr
35 34 %div
36 35 %span.rss-icon
37 36 = link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
38 37 = image_tag "rss_ui.png", title: "feed"
39 38 %strong News Feed
40 39  
  40 + %hr
  41 + .gitlab-promo
  42 + = link_to "Homepage", "http://gitlabhq.com"
  43 + = link_to "Blog", "http://blog.gitlabhq.com"
  44 + = link_to "@gitlabhq", "https://twitter.com/gitlabhq"
  45 +
  46 +
41 47 - else
42 48 %h3.nothing_here_message There are no projects you have access to.
43 49 %br
... ...
app/views/events/_event_last_push.html.haml
  Diff comments   View file @bf625b7
... ... @@ -2,7 +2,7 @@
2 2 .event_lp
3 3 %div
4 4 = image_tag gravatar_icon(event.author_email), class: "avatar"
5   - %span Your pushed to
  5 + %span Your pushed to
6 6 = event.ref_type
7 7 = link_to project_commits_path(event.project, ref: event.ref_name) do
8 8 %strong= truncate(event.ref_name, length: 28)
... ...
app/views/issues/_show.html.haml
  Diff comments   View file @bf625b7
... ... @@ -4,7 +4,7 @@
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)
5 5 .right
6 6 - issue.labels.each do |label|
7   - %span.label.label-issue.grouped
  7 + %span.label.label-tag.grouped
8 8 %i.icon-tag
9 9 = label.name
10 10 - if issue.notes.any?
... ...
app/views/issues/index.html.haml
  Diff comments   View file @bf625b7
... ... @@ -12,7 +12,7 @@
12 12 = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do
13 13 = hidden_field_tag :project_id, @project.id, { id: 'project_id' }
14 14 = hidden_field_tag :status, params[:f]
15   - = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib' }
  15 + = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib search-text-input' }
16 16  
17 17 .clearfix
18 18  
... ...
app/views/labels/_label.html.haml
  Diff comments   View file @bf625b7
1 1 %li.wll
2   - %strong= label.name
  2 + %strong
  3 + %i.icon-tag
  4 + = label.name
3 5 .right
4   - %span= pluralize label.count, 'issue'
  6 + = link_to project_issues_path(label_name: label.name) do
  7 + %strong
  8 + = pluralize(label.count, 'issue')
  9 + = "»"
... ...
app/views/search/show.html.haml
  Diff comments   View file @bf625b7
... ... @@ -3,8 +3,8 @@
3 3 = label_tag :search do
4 4 %strong Looking for
5 5 .input
6   - = text_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge", id: "dashboard_search"
7   - = submit_tag 'Search', class: "btn primary"
  6 + = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
  7 + = submit_tag 'Search', class: "btn primary wide"
8 8 - if params[:search].present?
9 9 %br
10 10 %h3
... ... @@ -15,8 +15,9 @@
15 15 .row
16 16 .span6
17 17 %table
18   - %tr
19   - %th Projects
  18 + %thead
  19 + %tr
  20 + %th Projects
20 21 %tbody
21 22 - @projects.each do |project|
22 23 %tr
... ... @@ -32,8 +33,9 @@
32 33 %h4.nothing_here_message No Projects
33 34 %br
34 35 %table
35   - %tr
36   - %th Merge Requests
  36 + %thead
  37 + %tr
  38 + %th Merge Requests
37 39 %tbody
38 40 - @merge_requests.each do |merge_request|
39 41 %tr
... ... @@ -50,8 +52,9 @@
50 52 %h4.nothing_here_message No Merge Requests
51 53 .span6
52 54 %table
53   - %tr
54   - %th Issues
  55 + %thead
  56 + %tr
  57 + %th Issues
55 58 %tbody
56 59 - @issues.each do |issue|
57 60 %tr
... ...