Lists restyled, blue link colors added

22 files changed, 125 insertions, 82 deletions

diff --git a/VERSION b/VERSION
index 7ec1d6db408..be536cf2a58 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.2.0pre
diff --git a/app/assets/images/blueprint_add.png b/app/assets/images/blueprint_add.png
index e63641d09d3..0f01128df96 100644
--- a/app/assets/images/blueprint_add.png
+++ b/app/assets/images/blueprint_add.png
diff --git a/app/assets/images/blueprint_delete.png b/app/assets/images/blueprint_delete.png
index f171846bd0e..b4d360f329d 100644
--- a/app/assets/images/blueprint_delete.png
+++ b/app/assets/images/blueprint_delete.png
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 61b26bb5578..6e17a9b9c46 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,3 +1,28 @@
+a {
+  color: $link_color;
+  &:hover { 
+    text-decoration:none; 
+    color: $style_color;
+  }
+}
+
+.pills .active a {
+  background-color: #474D57;
+}
+
+.label { 
+  background-color: #474D57;
+}
+
+.tabs > li > a, .pills > li > a {
+  color:$style_color;
+}
+
+.diff_file_header a,
+.file_stats a {
+  color:$style_color;
+}
+
 /** COLORS **/
 .cgray { color:gray; }
 .cred { color:#D12F19; }
@@ -70,7 +95,7 @@
     margin:10px 0 0 0;
     font-size:13px;
     font-weight:bold;
-    color:#444;
+    color:$style_color;
   }
 }
 
@@ -112,19 +137,30 @@ img.lil_av {
 
 .wll { 
   background-color: #FFF;
-  margin-bottom: 10px;
-  padding: 5px;
+  padding: 10px 5px;
   min-height: 20px;
   border-bottom: 1px solid #eee;
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-  .author { color: #999; }
+  cursor:pointer;
+  &:hover { 
+    background:$hover;
+  }
   &:last-child { border:none }
-  p { padding-top:5px;}
+  p { padding-top:5px; margin:0; color:$style_color;}
+  .author { color: #999; }
+  p { 
+    color:$style_color;
+    margin-bottom: 0;
+    img { 
+      position:relative;
+      top:3px;
+    }
+  }
 }
 
 .visible_link,
 .author_link { 
-  color: $active_link_color;
+  color: $link_color;
 }
 .entry { 
   position: relative;
@@ -147,7 +183,9 @@ img.lil_av {
   background:#F1F1F1;
   border: 1px solid #ccc;
 
+
   p { 
+    color:$style_color;
     margin-bottom: 0;
     img { 
       position:relative;
@@ -156,6 +194,11 @@ img.lil_av {
   }
 }
 
+.well { 
+  a h3 {
+    color:$link_color;
+  }
+}
 .widget { 
   padding:20px;
   margin-bottom:20px;
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 6c91b7cf5e2..df61cc81c5d 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -3,7 +3,7 @@
 /** GITLAB colors **/
 $text_color:#222;
 $lite_text_color: #666; 
-$link_color:#111; 
+$link_color:#2A79A3; 
 $active_link_color:#2FA0BB;
 $active_bg_color:#79C3E0;
 $active_bd_color: #2FA0BB;
@@ -17,6 +17,12 @@ $styled_border_color: #2FA0BB;
 $color: "#4BB8D2";
 $blue_link: "#2fa0bb";
 
+
+/** Style colors **/
+$style_color: #474D57;
+$hover: #FDF5D9;
+
+
 /** MIXINS **/
 @mixin round-borders-bottom($radius) {
   border-top: 1px solid #eaeaea;
@@ -46,14 +52,12 @@ $blue_link: "#2fa0bb";
 }
 
 
-@import "reset_bootstrap.scss";
 @import "common.scss";
 @import "top_panel.scss";
 
 @import "projects.css.scss";
 @import "commits.css.scss";
 @import "tree.scss";
-@import "merge_requests.css.scss";
 @import "notes.css.scss";
 @import "login.scss";
 
diff --git a/app/assets/stylesheets/merge_requests.css.scss b/app/assets/stylesheets/merge_requests.css.scss
deleted file mode 100644
index 9f608c6bfcd..00000000000
--- a/app/assets/stylesheets/merge_requests.css.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.merge-request-form-holder {
-  select { 
-    width:300px;
-  }
-}
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index e7a69fd68e2..79a9045925c 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -202,6 +202,13 @@ input.git_clone_url {
   }
 }
 
+.merge-request-form-holder {
+  select { 
+    width:300px;
+  }
+}
+
+/** Issues **/
 #issue_assignee_id {
   width:300px;
 }
diff --git a/app/assets/stylesheets/reset_bootstrap.scss b/app/assets/stylesheets/reset_bootstrap.scss
deleted file mode 100644
index 02bed4229c4..00000000000
--- a/app/assets/stylesheets/reset_bootstrap.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-a {
-  color: $link_color;
-  &:hover { 
-    text-decoration:none; 
-    color: $active_link_color;
-  }
-}
diff --git a/app/assets/stylesheets/top_panel.scss b/app/assets/stylesheets/top_panel.scss
index 28b972a6fe9..5c18eb2b7ff 100644
--- a/app/assets/stylesheets/top_panel.scss
+++ b/app/assets/stylesheets/top_panel.scss
@@ -30,7 +30,7 @@ body header {
     font-size:20px;
     line-height:34px;
     font-weight:bold;
-    color:#666;
+    color:$style_color;
     text-shadow: 0 1px 1px #FFF;
   }
 
@@ -76,7 +76,7 @@ body header {
       text-shadow: 0 1px 1px #FFF;
 
       &:hover {
-        color:$active_link_color;
+        color:$style_color;
       }
     }
 
diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss
index 322b3d7fba8..90cdcb0df98 100644
--- a/app/assets/stylesheets/tree.scss
+++ b/app/assets/stylesheets/tree.scss
@@ -113,12 +113,15 @@ table.highlighttable .linenodiv pre {
 
 .tree-item { 
   &:hover { 
-    background: #FFFFCF;
+    background: $hover;
     cursor:pointer;
   }
 
   .tree-item-file-name { 
     font-weight:bold;
+    a { 
+      color:$style_color;
+    }
 
     img { 
       position: relative;
diff --git a/app/views/commits/_commit.html.haml b/app/views/commits/_commit.html.haml
index a8a4446c943..6264250c59b 100644
--- a/app/views/commits/_commit.html.haml
+++ b/app/views/commits/_commit.html.haml
@@ -1,17 +1,14 @@
-%li
-  .row
-    .span12
-      .entry
-        = link_to project_commit_path(@project, :id => commit.id) do
-          %p
-            %code= commit.id.to_s[0..10]
-            –
-            = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
-            = truncate(commit.safe_message, :length => 50)
+%li.wll
+  .right.span2
+    = link_to "Browse Code", tree_project_ref_path(@project, commit.id), :class => "btn small right"
+  = link_to project_commit_path(@project, :id => commit.id) do
+    %p
+      %code= commit.id.to_s[0..10]
+      –
+      = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
+      = truncate(commit.safe_message, :length => 50)
 
-            %span.right.cgray
-              = time_ago_in_words(commit.committed_date)
-              ago
-    .span2
-      = link_to "Browse Code", tree_project_ref_path(@project, commit.id), :class => "btn small"
+      %span.right.cgray
+        = time_ago_in_words(commit.committed_date)
+        ago
 
diff --git a/app/views/dashboard/_issues_feed.html.haml b/app/views/dashboard/_issues_feed.html.haml
index bb07aef2745..5c0e05ef0a5 100644
--- a/app/views/dashboard/_issues_feed.html.haml
+++ b/app/views/dashboard/_issues_feed.html.haml
@@ -1,9 +1,9 @@
 - @issues.each do |issue|
-  .entry
+  .wll
     = link_to [issue.project, issue] do 
       %p
         %strong
-          = issue.project.name
+          %span.label= issue.project.name
           –
           Issue #
           = issue.id
diff --git a/app/views/dashboard/_merge_requests_feed.html.haml b/app/views/dashboard/_merge_requests_feed.html.haml
index ffffc3cf3b8..db1ebd32a63 100644
--- a/app/views/dashboard/_merge_requests_feed.html.haml
+++ b/app/views/dashboard/_merge_requests_feed.html.haml
@@ -1,9 +1,9 @@
 - @merge_requests.each do |merge_request|
-  .entry
+  .wll
     = link_to [merge_request.project, merge_request] do 
       %p
         %strong
-          = merge_request.project.name
+          %span.label= merge_request.project.name
           –
           Merge Request #
           = merge_request.id
diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml
index 3e8ff515ac2..f0162f5168a 100644
--- a/app/views/deploy_keys/index.html.haml
+++ b/app/views/deploy_keys/index.html.haml
@@ -1,6 +1,6 @@
 = render "repositories/head"
 - if can? current_user, :admin_project, @project
-  .alert-message.block-message.info
+  .alert-message.block-message
     Deploy keys allow read-only access to repository. 
     = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do 
       Add Deploy Key 
diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml
index d00b0677621..09391898afd 100644
--- a/app/views/hooks/index.html.haml
+++ b/app/views/hooks/index.html.haml
@@ -1,15 +1,15 @@
 = render "repositories/head"
 
 - if can? current_user, :admin_project, @project
-  .alert-message.block-message.info
+  .alert-message.block-message
     Post receive hooks for binding events when someone push to repository.
     = link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do 
       Add Post Receive Hook
 
 %ul.unstyled
   - @hooks.each do |hook|
-    %li
-      %a.update-item{:href => project_hook_path(@project, hook)}
+    %li.wll
+      = link_to project_hook_path(@project, hook) do
         = hook.url
 
 .alert-message.block-message.info
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index 91bbb1aae84..ef9e156020e 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -1,13 +1,4 @@
 %li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
-  = image_tag gravatar_icon(issue.assignee_email), :class => "avatar"
-  %span.update-author
-    assigned to
-    %strong= link_to_issue_assignee(issue)
-    - if issue.critical
-      %span.label.important critical
-    - if issue.today?
-      %span.label.success today
-
   .right
     - if can? current_user, :write_issue, issue
       - if issue.closed
@@ -18,6 +9,15 @@
       = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true
     -#- if can?(current_user, :admin_issue, @project) || issue.author == current_user
       = 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}"
+  = image_tag gravatar_icon(issue.assignee_email), :class => "avatar"
+  %span.update-author
+    assigned to
+    %strong= link_to_issue_assignee(issue)
+    - if issue.critical
+      %span.label.important critical
+    - if issue.today?
+      %span.label.success today
+
 
 
   = link_to project_issue_path(issue.project, issue) do
diff --git a/app/views/keys/_show.html.haml b/app/views/keys/_show.html.haml
index 81ecbfe6ba6..132511b2dd9 100644
--- a/app/views/keys/_show.html.haml
+++ b/app/views/keys/_show.html.haml
@@ -1,7 +1,8 @@
-%li.entry
+%li.wll
   = link_to key_path(key) do
-    %strong= key.title
-    %span.right.cgray
-      Added
-      = time_ago_in_words(key.created_at)
-      ago
+    %p
+      %strong= key.title
+      %span.right.cgray
+        Added
+        = time_ago_in_words(key.created_at)
+        ago
diff --git a/app/views/layouts/_projects_side.html.haml b/app/views/layouts/_projects_side.html.haml
index 4c35c62649b..84aba5da446 100644
--- a/app/views/layouts/_projects_side.html.haml
+++ b/app/views/layouts/_projects_side.html.haml
@@ -1,6 +1,6 @@
 %aside.projects
   - if current_user.can_create_project?
-    .alert-message.block-message.info
+    .alert-message.block-message
       You can create at least
       = current_user.projects_limit
       projects. Click on button to add a new one
@@ -9,7 +9,7 @@
           New Project » 
 
   - if current_user.is_admin?
-    .alert-message.block-message.info
+    .alert-message.block-message
       You have administrator privilegies. You can configure application following this button:
       .alert-actions
         = link_to admin_root_path, :class => "btn small", :title => "Admin"  do 
diff --git a/app/views/projects/_feed.html.haml b/app/views/projects/_feed.html.haml
index e973a763d9b..f907b8a253f 100644
--- a/app/views/projects/_feed.html.haml
+++ b/app/views/projects/_feed.html.haml
@@ -1,5 +1,5 @@
 - @activities.each do |update|
-  .entry
+  .wll
     = link_to dashboard_feed_path(@project, update) do 
       - if update.kind_of? Note
         %p
diff --git a/app/views/repositories/_feed.html.haml b/app/views/repositories/_feed.html.haml
index 204157ceadc..be88d59bd80 100644
--- a/app/views/repositories/_feed.html.haml
+++ b/app/views/repositories/_feed.html.haml
@@ -1,8 +1,8 @@
 - commit = update
-.entry
+.wll
   = link_to project_commits_path(@project, :ref => commit.head.name) do 
     %p
-      %strong
+      %strong.label
         = commit.head.name
       %br
       %code= commit.id.to_s[0..10]
diff --git a/app/views/repositories/show.html.haml b/app/views/repositories/show.html.haml
index c92ad48acb6..6f71ae7c86f 100644
--- a/app/views/repositories/show.html.haml
+++ b/app/views/repositories/show.html.haml
@@ -21,7 +21,7 @@
   = time_ago_in_words(@activities.first.commit.committed_date)
   ago to 
   = link_to project_commits_path(@project, :ref => @activities.first.head.name), :class => "visible_link" do 
-    = @activities.first.head.name
+    %span.label= @activities.first.head.name
 
 %h4.cgray
   Recent Branches
diff --git a/app/views/repositories/tags.html.haml b/app/views/repositories/tags.html.haml
index b67010c7ba5..4c90bae2a3b 100644
--- a/app/views/repositories/tags.html.haml
+++ b/app/views/repositories/tags.html.haml
@@ -1,17 +1,17 @@
 = render "head"
 - unless @tags.empty?
-  - @tags.each do |tag|
-    .row
-      .span7
-        .entry
-          = tag.name
-          %code= tag.commit.id.to_s[0..10]
-          %span.update-author.right
-            = time_ago_in_words(tag.commit.committed_date)
-            ago
-      .span3
-        - if can? current_user, :download_code, @project
-          = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small"
-        = link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small"
+  %ul.unstyled
+    - @tags.each do |tag|
+      %li.wll
+        .span3.right
+          - if can? current_user, :download_code, @project
+            = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small"
+          = link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small"
+
+        = tag.name
+        %code= tag.commit.id.to_s[0..10]
+        %span.update-author.right
+          = time_ago_in_words(tag.commit.committed_date)
+          ago
 - else 
   %h3 No tags