Download as
Browse Code »

Commit cc1ba255d6c5ffdce87a357ba7ccc397a4f4026b

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

Lists restyled, blue link colors added

Showing 22 changed files with 125 additions and 82 deletions   Show diff stats
1 -2.1.0 1 +2.2.0pre
app/assets/images/blueprint_add.png
View file @cc1ba25

518 Bytes | W: | H:

177 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/assets/images/blueprint_delete.png
View file @cc1ba25

469 Bytes | W: | H:

295 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/assets/stylesheets/common.scss
  Diff comments   View file @cc1ba25
  1 +a {
  2 + color: $link_color;
  3 + &:hover {
  4 + text-decoration:none;
  5 + color: $style_color;
  6 + }
  7 +}
  8 +
  9 +.pills .active a {
  10 + background-color: #474D57;
  11 +}
  12 +
  13 +.label {
  14 + background-color: #474D57;
  15 +}
  16 +
  17 +.tabs > li > a, .pills > li > a {
  18 + color:$style_color;
  19 +}
  20 +
  21 +.diff_file_header a,
  22 +.file_stats a {
  23 + color:$style_color;
  24 +}
  25 +
1 /** COLORS **/ 26 /** COLORS **/
2 .cgray { color:gray; } 27 .cgray { color:gray; }
3 .cred { color:#D12F19; } 28 .cred { color:#D12F19; }
@@ -70,7 +95,7 @@ @@ -70,7 +95,7 @@
70 margin:10px 0 0 0; 95 margin:10px 0 0 0;
71 font-size:13px; 96 font-size:13px;
72 font-weight:bold; 97 font-weight:bold;
73 - color:#444; 98 + color:$style_color;
74 } 99 }
75 } 100 }
76 101
@@ -112,19 +137,30 @@ img.lil_av { @@ -112,19 +137,30 @@ img.lil_av {
112 137
113 .wll { 138 .wll {
114 background-color: #FFF; 139 background-color: #FFF;
115 - margin-bottom: 10px;  
116 - padding: 5px; 140 + padding: 10px 5px;
117 min-height: 20px; 141 min-height: 20px;
118 border-bottom: 1px solid #eee; 142 border-bottom: 1px solid #eee;
119 border-bottom: 1px solid rgba(0, 0, 0, 0.05); 143 border-bottom: 1px solid rgba(0, 0, 0, 0.05);
120 - .author { color: #999; } 144 + cursor:pointer;
  145 + &:hover {
  146 + background:$hover;
  147 + }
121 &:last-child { border:none } 148 &:last-child { border:none }
122 - p { padding-top:5px;} 149 + p { padding-top:5px; margin:0; color:$style_color;}
  150 + .author { color: #999; }
  151 + p {
  152 + color:$style_color;
  153 + margin-bottom: 0;
  154 + img {
  155 + position:relative;
  156 + top:3px;
  157 + }
  158 + }
123 } 159 }
124 160
125 .visible_link, 161 .visible_link,
126 .author_link { 162 .author_link {
127 - color: $active_link_color; 163 + color: $link_color;
128 } 164 }
129 .entry { 165 .entry {
130 position: relative; 166 position: relative;
@@ -147,7 +183,9 @@ img.lil_av { @@ -147,7 +183,9 @@ img.lil_av {
147 background:#F1F1F1; 183 background:#F1F1F1;
148 border: 1px solid #ccc; 184 border: 1px solid #ccc;
149 185
  186 +
150 p { 187 p {
  188 + color:$style_color;
151 margin-bottom: 0; 189 margin-bottom: 0;
152 img { 190 img {
153 position:relative; 191 position:relative;
@@ -156,6 +194,11 @@ img.lil_av { @@ -156,6 +194,11 @@ img.lil_av {
156 } 194 }
157 } 195 }
158 196
  197 +.well {
  198 + a h3 {
  199 + color:$link_color;
  200 + }
  201 +}
159 .widget { 202 .widget {
160 padding:20px; 203 padding:20px;
161 margin-bottom:20px; 204 margin-bottom:20px;
app/assets/stylesheets/main.scss
  Diff comments   View file @cc1ba25
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 /** GITLAB colors **/ 3 /** GITLAB colors **/
4 $text_color:#222; 4 $text_color:#222;
5 $lite_text_color: #666; 5 $lite_text_color: #666;
6 -$link_color:#111; 6 +$link_color:#2A79A3;
7 $active_link_color:#2FA0BB; 7 $active_link_color:#2FA0BB;
8 $active_bg_color:#79C3E0; 8 $active_bg_color:#79C3E0;
9 $active_bd_color: #2FA0BB; 9 $active_bd_color: #2FA0BB;
@@ -17,6 +17,12 @@ $styled_border_color: #2FA0BB; @@ -17,6 +17,12 @@ $styled_border_color: #2FA0BB;
17 $color: "#4BB8D2"; 17 $color: "#4BB8D2";
18 $blue_link: "#2fa0bb"; 18 $blue_link: "#2fa0bb";
19 19
  20 +
  21 +/** Style colors **/
  22 +$style_color: #474D57;
  23 +$hover: #FDF5D9;
  24 +
  25 +
20 /** MIXINS **/ 26 /** MIXINS **/
21 @mixin round-borders-bottom($radius) { 27 @mixin round-borders-bottom($radius) {
22 border-top: 1px solid #eaeaea; 28 border-top: 1px solid #eaeaea;
@@ -46,14 +52,12 @@ $blue_link: "#2fa0bb"; @@ -46,14 +52,12 @@ $blue_link: "#2fa0bb";
46 } 52 }
47 53
48 54
49 -@import "reset_bootstrap.scss";  
50 @import "common.scss"; 55 @import "common.scss";
51 @import "top_panel.scss"; 56 @import "top_panel.scss";
52 57
53 @import "projects.css.scss"; 58 @import "projects.css.scss";
54 @import "commits.css.scss"; 59 @import "commits.css.scss";
55 @import "tree.scss"; 60 @import "tree.scss";
56 -@import "merge_requests.css.scss";  
57 @import "notes.css.scss"; 61 @import "notes.css.scss";
58 @import "login.scss"; 62 @import "login.scss";
59 63
app/assets/stylesheets/merge_requests.css.scss
View file @bc37350
@@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
1 -.merge-request-form-holder {  
2 - select {  
3 - width:300px;  
4 - }  
5 -}  
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @cc1ba25
@@ -202,6 +202,13 @@ input.git_clone_url { @@ -202,6 +202,13 @@ input.git_clone_url {
202 } 202 }
203 } 203 }
204 204
  205 +.merge-request-form-holder {
  206 + select {
  207 + width:300px;
  208 + }
  209 +}
  210 +
  211 +/** Issues **/
205 #issue_assignee_id { 212 #issue_assignee_id {
206 width:300px; 213 width:300px;
207 } 214 }
app/assets/stylesheets/reset_bootstrap.scss
View file @bc37350
@@ -1,7 +0,0 @@ @@ -1,7 +0,0 @@
1 -a {  
2 - color: $link_color;  
3 - &:hover {  
4 - text-decoration:none;  
5 - color: $active_link_color;  
6 - }  
7 -}  
app/assets/stylesheets/top_panel.scss
  Diff comments   View file @cc1ba25
@@ -30,7 +30,7 @@ body header { @@ -30,7 +30,7 @@ body header {
30 font-size:20px; 30 font-size:20px;
31 line-height:34px; 31 line-height:34px;
32 font-weight:bold; 32 font-weight:bold;
33 - color:#666; 33 + color:$style_color;
34 text-shadow: 0 1px 1px #FFF; 34 text-shadow: 0 1px 1px #FFF;
35 } 35 }
36 36
@@ -76,7 +76,7 @@ body header { @@ -76,7 +76,7 @@ body header {
76 text-shadow: 0 1px 1px #FFF; 76 text-shadow: 0 1px 1px #FFF;
77 77
78 &:hover { 78 &:hover {
79 - color:$active_link_color; 79 + color:$style_color;
80 } 80 }
81 } 81 }
82 82
app/assets/stylesheets/tree.scss
  Diff comments   View file @cc1ba25
@@ -113,12 +113,15 @@ table.highlighttable .linenodiv pre { @@ -113,12 +113,15 @@ table.highlighttable .linenodiv pre {
113 113
114 .tree-item { 114 .tree-item {
115 &:hover { 115 &:hover {
116 - background: #FFFFCF; 116 + background: $hover;
117 cursor:pointer; 117 cursor:pointer;
118 } 118 }
119 119
120 .tree-item-file-name { 120 .tree-item-file-name {
121 font-weight:bold; 121 font-weight:bold;
  122 + a {
  123 + color:$style_color;
  124 + }
122 125
123 img { 126 img {
124 position: relative; 127 position: relative;
app/views/commits/_commit.html.haml
  Diff comments   View file @cc1ba25
1 -%li  
2 - .row  
3 - .span12  
4 - .entry  
5 - = link_to project_commit_path(@project, :id => commit.id) do  
6 - %p  
7 - %code= commit.id.to_s[0..10]  
8 - –  
9 - = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16  
10 - = truncate(commit.safe_message, :length => 50) 1 +%li.wll
  2 + .right.span2
  3 + = link_to "Browse Code", tree_project_ref_path(@project, commit.id), :class => "btn small right"
  4 + = link_to project_commit_path(@project, :id => commit.id) do
  5 + %p
  6 + %code= commit.id.to_s[0..10]
  7 + –
  8 + = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
  9 + = truncate(commit.safe_message, :length => 50)
11 10
12 - %span.right.cgray  
13 - = time_ago_in_words(commit.committed_date)  
14 - ago  
15 - .span2  
16 - = link_to "Browse Code", tree_project_ref_path(@project, commit.id), :class => "btn small" 11 + %span.right.cgray
  12 + = time_ago_in_words(commit.committed_date)
  13 + ago
17 14
app/views/dashboard/_issues_feed.html.haml
  Diff comments   View file @cc1ba25
1 - @issues.each do |issue| 1 - @issues.each do |issue|
2 - .entry 2 + .wll
3 = link_to [issue.project, issue] do 3 = link_to [issue.project, issue] do
4 %p 4 %p
5 %strong 5 %strong
6 - = issue.project.name 6 + %span.label= issue.project.name
7 – 7 –
8 Issue # 8 Issue #
9 = issue.id 9 = issue.id
app/views/dashboard/_merge_requests_feed.html.haml
  Diff comments   View file @cc1ba25
1 - @merge_requests.each do |merge_request| 1 - @merge_requests.each do |merge_request|
2 - .entry 2 + .wll
3 = link_to [merge_request.project, merge_request] do 3 = link_to [merge_request.project, merge_request] do
4 %p 4 %p
5 %strong 5 %strong
6 - = merge_request.project.name 6 + %span.label= merge_request.project.name
7 – 7 –
8 Merge Request # 8 Merge Request #
9 = merge_request.id 9 = merge_request.id
app/views/deploy_keys/index.html.haml
  Diff comments   View file @cc1ba25
1 = render "repositories/head" 1 = render "repositories/head"
2 - if can? current_user, :admin_project, @project 2 - if can? current_user, :admin_project, @project
3 - .alert-message.block-message.info 3 + .alert-message.block-message
4 Deploy keys allow read-only access to repository. 4 Deploy keys allow read-only access to repository.
5 = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do 5 = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
6 Add Deploy Key 6 Add Deploy Key
app/views/hooks/index.html.haml
  Diff comments   View file @cc1ba25
1 = render "repositories/head" 1 = render "repositories/head"
2 2
3 - if can? current_user, :admin_project, @project 3 - if can? current_user, :admin_project, @project
4 - .alert-message.block-message.info 4 + .alert-message.block-message
5 Post receive hooks for binding events when someone push to repository. 5 Post receive hooks for binding events when someone push to repository.
6 = link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do 6 = link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do
7 Add Post Receive Hook 7 Add Post Receive Hook
8 8
9 %ul.unstyled 9 %ul.unstyled
10 - @hooks.each do |hook| 10 - @hooks.each do |hook|
11 - %li  
12 - %a.update-item{:href => project_hook_path(@project, hook)} 11 + %li.wll
  12 + = link_to project_hook_path(@project, hook) do
13 = hook.url 13 = hook.url
14 14
15 .alert-message.block-message.info 15 .alert-message.block-message.info
app/views/issues/_show.html.haml
  Diff comments   View file @cc1ba25
1 %li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } 1 %li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
2 - = image_tag gravatar_icon(issue.assignee_email), :class => "avatar"  
3 - %span.update-author  
4 - assigned to  
5 - %strong= link_to_issue_assignee(issue)  
6 - - if issue.critical  
7 - %span.label.important critical  
8 - - if issue.today?  
9 - %span.label.success today  
10 -  
11 .right 2 .right
12 - if can? current_user, :write_issue, issue 3 - if can? current_user, :write_issue, issue
13 - if issue.closed 4 - if issue.closed
@@ -18,6 +9,15 @@ @@ -18,6 +9,15 @@
18 = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true 9 = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true
19 -#- if can?(current_user, :admin_issue, @project) || issue.author == current_user 10 -#- if can?(current_user, :admin_issue, @project) || issue.author == current_user
20 = link_to 'Remove', [issue.project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "danger btn small delete-issue", :id => "destroy_issue_#{issue.id}" 11 = link_to 'Remove', [issue.project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "danger btn small delete-issue", :id => "destroy_issue_#{issue.id}"
  12 + = image_tag gravatar_icon(issue.assignee_email), :class => "avatar"
  13 + %span.update-author
  14 + assigned to
  15 + %strong= link_to_issue_assignee(issue)
  16 + - if issue.critical
  17 + %span.label.important critical
  18 + - if issue.today?
  19 + %span.label.success today
  20 +
21 21
22 22
23 = link_to project_issue_path(issue.project, issue) do 23 = link_to project_issue_path(issue.project, issue) do
app/views/keys/_show.html.haml
  Diff comments   View file @cc1ba25
1 -%li.entry 1 +%li.wll
2 = link_to key_path(key) do 2 = link_to key_path(key) do
3 - %strong= key.title  
4 - %span.right.cgray  
5 - Added  
6 - = time_ago_in_words(key.created_at)  
7 - ago 3 + %p
  4 + %strong= key.title
  5 + %span.right.cgray
  6 + Added
  7 + = time_ago_in_words(key.created_at)
  8 + ago
app/views/layouts/_projects_side.html.haml
  Diff comments   View file @cc1ba25
1 %aside.projects 1 %aside.projects
2 - if current_user.can_create_project? 2 - if current_user.can_create_project?
3 - .alert-message.block-message.info 3 + .alert-message.block-message
4 You can create at least 4 You can create at least
5 = current_user.projects_limit 5 = current_user.projects_limit
6 projects. Click on button to add a new one 6 projects. Click on button to add a new one
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 New Project » 9 New Project »
10 10
11 - if current_user.is_admin? 11 - if current_user.is_admin?
12 - .alert-message.block-message.info 12 + .alert-message.block-message
13 You have administrator privilegies. You can configure application following this button: 13 You have administrator privilegies. You can configure application following this button:
14 .alert-actions 14 .alert-actions
15 = link_to admin_root_path, :class => "btn small", :title => "Admin" do 15 = link_to admin_root_path, :class => "btn small", :title => "Admin" do
app/views/projects/_feed.html.haml
  Diff comments   View file @cc1ba25
1 - @activities.each do |update| 1 - @activities.each do |update|
2 - .entry 2 + .wll
3 = link_to dashboard_feed_path(@project, update) do 3 = link_to dashboard_feed_path(@project, update) do
4 - if update.kind_of? Note 4 - if update.kind_of? Note
5 %p 5 %p
app/views/repositories/_feed.html.haml
  Diff comments   View file @cc1ba25
1 - commit = update 1 - commit = update
2 -.entry 2 +.wll
3 = link_to project_commits_path(@project, :ref => commit.head.name) do 3 = link_to project_commits_path(@project, :ref => commit.head.name) do
4 %p 4 %p
5 - %strong 5 + %strong.label
6 = commit.head.name 6 = commit.head.name
7 %br 7 %br
8 %code= commit.id.to_s[0..10] 8 %code= commit.id.to_s[0..10]
app/views/repositories/show.html.haml
  Diff comments   View file @cc1ba25
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 = time_ago_in_words(@activities.first.commit.committed_date) 21 = time_ago_in_words(@activities.first.commit.committed_date)
22 ago to 22 ago to
23 = link_to project_commits_path(@project, :ref => @activities.first.head.name), :class => "visible_link" do 23 = link_to project_commits_path(@project, :ref => @activities.first.head.name), :class => "visible_link" do
24 - = @activities.first.head.name 24 + %span.label= @activities.first.head.name
25 25
26 %h4.cgray 26 %h4.cgray
27 Recent Branches 27 Recent Branches
app/views/repositories/tags.html.haml
  Diff comments   View file @cc1ba25
1 = render "head" 1 = render "head"
2 - unless @tags.empty? 2 - unless @tags.empty?
3 - - @tags.each do |tag|  
4 - .row  
5 - .span7  
6 - .entry  
7 - = tag.name  
8 - %code= tag.commit.id.to_s[0..10]  
9 - %span.update-author.right  
10 - = time_ago_in_words(tag.commit.committed_date)  
11 - ago  
12 - .span3  
13 - - if can? current_user, :download_code, @project  
14 - = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small"  
15 - = link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small" 3 + %ul.unstyled
  4 + - @tags.each do |tag|
  5 + %li.wll
  6 + .span3.right
  7 + - if can? current_user, :download_code, @project
  8 + = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small"
  9 + = link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small"
  10 +
  11 + = tag.name
  12 + %code= tag.commit.id.to_s[0..10]
  13 + %span.update-author.right
  14 + = time_ago_in_words(tag.commit.committed_date)
  15 + ago
16 - else 16 - else
17 %h3 No tags 17 %h3 No tags