Lists restyled, blue link colors added

This commit is contained in:
Dmitriy Zaporozhets 2012-02-11 23:22:33 +02:00
parent bc3735004c
commit cc1ba255d6
22 changed files with 125 additions and 82 deletions

View file

@ -1 +1 @@
2.1.0 2.2.0pre

Binary file not shown.

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 295 B

View file

@ -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 **/ /** COLORS **/
.cgray { color:gray; } .cgray { color:gray; }
.cred { color:#D12F19; } .cred { color:#D12F19; }
@ -70,7 +95,7 @@
margin:10px 0 0 0; margin:10px 0 0 0;
font-size:13px; font-size:13px;
font-weight:bold; font-weight:bold;
color:#444; color:$style_color;
} }
} }
@ -112,19 +137,30 @@ img.lil_av {
.wll { .wll {
background-color: #FFF; background-color: #FFF;
margin-bottom: 10px; padding: 10px 5px;
padding: 5px;
min-height: 20px; min-height: 20px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05); border-bottom: 1px solid rgba(0, 0, 0, 0.05);
.author { color: #999; } cursor:pointer;
&:hover {
background:$hover;
}
&:last-child { border:none } &: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, .visible_link,
.author_link { .author_link {
color: $active_link_color; color: $link_color;
} }
.entry { .entry {
position: relative; position: relative;
@ -147,7 +183,9 @@ img.lil_av {
background:#F1F1F1; background:#F1F1F1;
border: 1px solid #ccc; border: 1px solid #ccc;
p { p {
color:$style_color;
margin-bottom: 0; margin-bottom: 0;
img { img {
position:relative; position:relative;
@ -156,6 +194,11 @@ img.lil_av {
} }
} }
.well {
a h3 {
color:$link_color;
}
}
.widget { .widget {
padding:20px; padding:20px;
margin-bottom:20px; margin-bottom:20px;

View file

@ -3,7 +3,7 @@
/** GITLAB colors **/ /** GITLAB colors **/
$text_color:#222; $text_color:#222;
$lite_text_color: #666; $lite_text_color: #666;
$link_color:#111; $link_color:#2A79A3;
$active_link_color:#2FA0BB; $active_link_color:#2FA0BB;
$active_bg_color:#79C3E0; $active_bg_color:#79C3E0;
$active_bd_color: #2FA0BB; $active_bd_color: #2FA0BB;
@ -17,6 +17,12 @@ $styled_border_color: #2FA0BB;
$color: "#4BB8D2"; $color: "#4BB8D2";
$blue_link: "#2fa0bb"; $blue_link: "#2fa0bb";
/** Style colors **/
$style_color: #474D57;
$hover: #FDF5D9;
/** MIXINS **/ /** MIXINS **/
@mixin round-borders-bottom($radius) { @mixin round-borders-bottom($radius) {
border-top: 1px solid #eaeaea; border-top: 1px solid #eaeaea;
@ -46,14 +52,12 @@ $blue_link: "#2fa0bb";
} }
@import "reset_bootstrap.scss";
@import "common.scss"; @import "common.scss";
@import "top_panel.scss"; @import "top_panel.scss";
@import "projects.css.scss"; @import "projects.css.scss";
@import "commits.css.scss"; @import "commits.css.scss";
@import "tree.scss"; @import "tree.scss";
@import "merge_requests.css.scss";
@import "notes.css.scss"; @import "notes.css.scss";
@import "login.scss"; @import "login.scss";

View file

@ -1,5 +0,0 @@
.merge-request-form-holder {
select {
width:300px;
}
}

View file

@ -202,6 +202,13 @@ input.git_clone_url {
} }
} }
.merge-request-form-holder {
select {
width:300px;
}
}
/** Issues **/
#issue_assignee_id { #issue_assignee_id {
width:300px; width:300px;
} }

View file

@ -1,7 +0,0 @@
a {
color: $link_color;
&:hover {
text-decoration:none;
color: $active_link_color;
}
}

View file

@ -30,7 +30,7 @@ body header {
font-size:20px; font-size:20px;
line-height:34px; line-height:34px;
font-weight:bold; font-weight:bold;
color:#666; color:$style_color;
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
} }
@ -76,7 +76,7 @@ body header {
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
&:hover { &:hover {
color:$active_link_color; color:$style_color;
} }
} }

View file

@ -113,12 +113,15 @@ table.highlighttable .linenodiv pre {
.tree-item { .tree-item {
&:hover { &:hover {
background: #FFFFCF; background: $hover;
cursor:pointer; cursor:pointer;
} }
.tree-item-file-name { .tree-item-file-name {
font-weight:bold; font-weight:bold;
a {
color:$style_color;
}
img { img {
position: relative; position: relative;

View file

@ -1,17 +1,14 @@
%li %li.wll
.row .right.span2
.span12 = link_to "Browse Code", tree_project_ref_path(@project, commit.id), :class => "btn small right"
.entry = link_to project_commit_path(@project, :id => commit.id) do
= link_to project_commit_path(@project, :id => commit.id) do %p
%p %code= commit.id.to_s[0..10]
%code= commit.id.to_s[0..10] –
– = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
= image_tag gravatar_icon(commit.author_email), :class => "", :width => 16 = truncate(commit.safe_message, :length => 50)
= truncate(commit.safe_message, :length => 50)
%span.right.cgray %span.right.cgray
= time_ago_in_words(commit.committed_date) = time_ago_in_words(commit.committed_date)
ago ago
.span2
= link_to "Browse Code", tree_project_ref_path(@project, commit.id), :class => "btn small"

View file

@ -1,9 +1,9 @@
- @issues.each do |issue| - @issues.each do |issue|
.entry .wll
= link_to [issue.project, issue] do = link_to [issue.project, issue] do
%p %p
%strong %strong
= issue.project.name %span.label= issue.project.name
– –
Issue # Issue #
= issue.id = issue.id

View file

@ -1,9 +1,9 @@
- @merge_requests.each do |merge_request| - @merge_requests.each do |merge_request|
.entry .wll
= link_to [merge_request.project, merge_request] do = link_to [merge_request.project, merge_request] do
%p %p
%strong %strong
= merge_request.project.name %span.label= merge_request.project.name
– –
Merge Request # Merge Request #
= merge_request.id = merge_request.id

View file

@ -1,6 +1,6 @@
= render "repositories/head" = render "repositories/head"
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
.alert-message.block-message.info .alert-message.block-message
Deploy keys allow read-only access to repository. Deploy keys allow read-only access to repository.
= link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
Add Deploy Key Add Deploy Key

View file

@ -1,15 +1,15 @@
= render "repositories/head" = render "repositories/head"
- if can? current_user, :admin_project, @project - 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. 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 = link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do
Add Post Receive Hook Add Post Receive Hook
%ul.unstyled %ul.unstyled
- @hooks.each do |hook| - @hooks.each do |hook|
%li %li.wll
%a.update-item{:href => project_hook_path(@project, hook)} = link_to project_hook_path(@project, hook) do
= hook.url = hook.url
.alert-message.block-message.info .alert-message.block-message.info

View file

@ -1,13 +1,4 @@
%li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } %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 .right
- if can? current_user, :write_issue, issue - if can? current_user, :write_issue, issue
- if issue.closed - 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 = 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 -#- 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}" = 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 = link_to project_issue_path(issue.project, issue) do

View file

@ -1,7 +1,8 @@
%li.entry %li.wll
= link_to key_path(key) do = link_to key_path(key) do
%strong= key.title %p
%span.right.cgray %strong= key.title
Added %span.right.cgray
= time_ago_in_words(key.created_at) Added
ago = time_ago_in_words(key.created_at)
ago

View file

@ -1,6 +1,6 @@
%aside.projects %aside.projects
- if current_user.can_create_project? - if current_user.can_create_project?
.alert-message.block-message.info .alert-message.block-message
You can create at least You can create at least
= current_user.projects_limit = current_user.projects_limit
projects. Click on button to add a new one projects. Click on button to add a new one
@ -9,7 +9,7 @@
New Project » New Project »
- if current_user.is_admin? - 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: You have administrator privilegies. You can configure application following this button:
.alert-actions .alert-actions
= link_to admin_root_path, :class => "btn small", :title => "Admin" do = link_to admin_root_path, :class => "btn small", :title => "Admin" do

View file

@ -1,5 +1,5 @@
- @activities.each do |update| - @activities.each do |update|
.entry .wll
= link_to dashboard_feed_path(@project, update) do = link_to dashboard_feed_path(@project, update) do
- if update.kind_of? Note - if update.kind_of? Note
%p %p

View file

@ -1,8 +1,8 @@
- commit = update - commit = update
.entry .wll
= link_to project_commits_path(@project, :ref => commit.head.name) do = link_to project_commits_path(@project, :ref => commit.head.name) do
%p %p
%strong %strong.label
= commit.head.name = commit.head.name
%br %br
%code= commit.id.to_s[0..10] %code= commit.id.to_s[0..10]

View file

@ -21,7 +21,7 @@
= time_ago_in_words(@activities.first.commit.committed_date) = time_ago_in_words(@activities.first.commit.committed_date)
ago to ago to
= link_to project_commits_path(@project, :ref => @activities.first.head.name), :class => "visible_link" do = 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 %h4.cgray
Recent Branches Recent Branches

View file

@ -1,17 +1,17 @@
= render "head" = render "head"
- unless @tags.empty? - unless @tags.empty?
- @tags.each do |tag| %ul.unstyled
.row - @tags.each do |tag|
.span7 %li.wll
.entry .span3.right
= tag.name - if can? current_user, :download_code, @project
%code= tag.commit.id.to_s[0..10] = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small"
%span.update-author.right = link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small"
= time_ago_in_words(tag.commit.committed_date)
ago = tag.name
.span3 %code= tag.commit.id.to_s[0..10]
- if can? current_user, :download_code, @project %span.update-author.right
= link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small" = time_ago_in_words(tag.commit.committed_date)
= link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small" ago
- else - else
%h3 No tags %h3 No tags