Commit cc1ba255 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Lists restyled, blue link colors added

parent 14e42acaeaee
app/assets/images/blueprint_add.png

518 Bytes | W: | H:

app/assets/images/blueprint_add.png

177 Bytes | W: | H:

app/assets/images/blueprint_add.png
app/assets/images/blueprint_add.png
app/assets/images/blueprint_add.png
app/assets/images/blueprint_add.png
  • 2-up
  • Swipe
  • Onion skin
app/assets/images/blueprint_delete.png

469 Bytes | W: | H:

app/assets/images/blueprint_delete.png

295 Bytes | W: | H:

app/assets/images/blueprint_delete.png
app/assets/images/blueprint_delete.png
app/assets/images/blueprint_delete.png
app/assets/images/blueprint_delete.png
  • 2-up
  • Swipe
  • Onion skin
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;
......
......@@ -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";
......
.merge-request-form-holder {
select {
width:300px;
}
}
......@@ -202,6 +202,13 @@ input.git_clone_url {
}
}
.merge-request-form-holder {
select {
width:300px;
}
}
/** Issues **/
#issue_assignee_id {
width:300px;
}
a {
color: $link_color;
&:hover {
text-decoration:none;
color: $active_link_color;
}
}
......@@ -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;
}
}
......
......@@ -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;
......
%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
- @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
......
- @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
......
= 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
......
= 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
......
%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
......
%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
%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
......
- @activities.each do |update|
.entry
.wll
= link_to dashboard_feed_path(@project, update) do
- if update.kind_of? Note
%p
......
- 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]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment