Commit bf625b7c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

polishing UI a bit. Added footer links for dashboard

parent 6d8d32c2
......@@ -145,6 +145,19 @@ span.update-author {
.label {
background-color: #474D57;
&.label-tag {
background: none;
border: none;
padding:4px 6px;
color:#444;
text-shadow:0 0 1px #fff;
&.grouped {
float: left;
margin-right: 6px;
padding: 6px;
}
}
&.label-issue {
background-color: #eee;
border: 1px solid #ccc;
......@@ -722,3 +735,10 @@ li.note {
padding: 6px 20px;
margin-right: 12px;
}
.gitlab-promo {
a {
color:#aaa;
margin-right: 30px;
}
}
......@@ -72,3 +72,13 @@ img.lil_av { padding-left: 4px; padding-right:3px; }
/** HELPERS **/
.nothing_here_message { text-align:center; padding:20px; color:#777; }
p.slead { color:#456; font-size:16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
/** FORMS **/
input[type='search'].search-text-input {
background-image: url("icon-search.png");
background-repeat: no-repeat;
background-position: 10px;
padding-left:25px;
@include border-radius(4px);
border:1px solid #ccc;
}
.issue_form_box {
.issue_form_box {
@extend .main_box;
.issue_title {
.issue_title {
@extend .top_box_content;
.clearfix {
margin-bottom:0px;
input {
.clearfix {
margin-bottom:0px;
input {
@extend .span8;
}
}
}
.issue_middle_block {
.issue_middle_block {
@extend .middle_box_content;
height:30px;
.issue_assignee {
.issue_assignee {
@extend .span6;
float:left;
}
.issue_milestone {
.issue_milestone {
@extend .span4;
float:left;
}
}
.issue_description {
.issue_description {
@extend .bottom_box_content;
}
}
.issues_table {
.issue {
.issues_table {
.issue {
padding:7px 10px;
.issue_check {
.issue_check {
float:left;
padding: 8px 0;
padding-right: 8px;
min-width: 15px;
}
p {
p {
padding-top:0;
padding-bottom:2px;
}
img.avatar {
img.avatar {
width:32px;
margin-top:4px;
}
}
}
input.check_all_issues {
input.check_all_issues {
float:left;
padding: 0;
margin:0;
......@@ -59,8 +59,8 @@ input.check_all_issues {
height: 22px;
}
.issues_content {
.title {
.issues_content {
.title {
height: 40px;
}
}
......@@ -70,30 +70,30 @@ input.check_all_issues {
@media (min-width: 1200px) { .issues_filters select { width:220px; } }
#issues-table-holder {
.issues_filters {
form {
#issues-table-holder {
.issues_filters {
form {
padding:0;
margin:0;
margin-top:7px
}
}
}
.issues_bulk_update {
.issues_bulk_update {
margin: 0;
form {
form {
padding:0;
margin:0;
margin-top:7px
}
.update_selected_issues {
.update_selected_issues {
position:relative;
top:-2px;
margin-left:4px;
float:left;
}
.update_issues_text {
.update_issues_text {
padding:3px;
line-height: 18px;
float:left;
......@@ -101,10 +101,11 @@ input.check_all_issues {
}
}
#update_status {
#update_status {
width:100px;
}
/**
* Milestones list
*
......
/**
/**
* MR form
*
*/
.mr_branch_box {
.mr_branch_box {
@extend .ui-box;
margin-bottom:20px;
.body {
.body {
background:#f1f1f1;
}
......@@ -17,19 +17,19 @@
* MR -> show: Automerge widget
*
*/
.automerge_widget {
&.can_be_merged {
.automerge_widget {
&.can_be_merged {
background: #DFF0D8;
}
form {
form {
margin-bottom:0;
.clearfix {
.clearfix {
margin-bottom:0;
}
}
.accept_group {
.accept_group {
float:left;
border: 1px solid #ADA;
padding: 2px;
......@@ -37,29 +37,29 @@
border-radius: 5px;
background: #CEB;
.accept_merge_request {
.accept_merge_request {
font-size:13px;
float:left;
}
.remove_branch_holder {
.remove_branch_holder {
margin-left:20px;
margin-right:10px;
float:left;
}
label {
label {
color:#444;
}
}
.how_to_merge_link {
.how_to_merge_link {
@extend .primary;
}
}
.mr_nav_tabs {
li {
a {
.mr_nav_tabs {
li {
a {
font-weight:bold;
padding:8px 20px;
text-align:center;
......@@ -67,19 +67,19 @@
}
}
li.merge_request {
li.merge_request {
padding:7px 10px;
img.avatar {
img.avatar {
width: 32px;
margin-top: 4px;
}
p {
p {
padding: 0px;
padding-bottom: 2px;
}
}
.merge_in_progress {
.merge_in_progress {
@extend .padded;
@extend .append-bottom-10;
}
......@@ -88,22 +88,21 @@ li.merge_request {
@include round-borders-all(4px);
padding:2px 4px;
border:none;
font-size:13px;
font-size:14px;
background: #474D57;
color:#fff;
font-weight:bold;
font-family: monospace;
font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
}
.mr_source_commit,
.mr_target_commit {
.commit {
.mr_source_commit,
.mr_target_commit {
.commit {
margin:0;
padding:0;
padding: 5px;
margin-bottom: 5px;
.avatar { position:relative }
.row_title {
.row_title {
color:#444;
}
.commit-author-name,
......@@ -113,12 +112,12 @@ li.merge_request {
display:none;
}
list-style:none;
&:hover {
&:hover {
background:none;
}
}
}
.mr_direction_tip {
.mr_direction_tip {
margin-top:40px
}
%h3 Resque
%iframe{src: resque_url, width: 1168, height: 600, style: "border: none"}
%h3.page_title Resque
%br
.ui-box
%iframe{src: resque_url, width: '100%', height: 600, style: "border: none"}
......@@ -31,13 +31,19 @@
%span= project_last_activity(project)
.bottom= paginate @projects, theme: "gitlab"
%hr
%div
%span.rss-icon
= link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
= image_tag "rss_ui.png", title: "feed"
%strong News Feed
%hr
.gitlab-promo
= link_to "Homepage", "http://gitlabhq.com"
= link_to "Blog", "http://blog.gitlabhq.com"
= link_to "@gitlabhq", "https://twitter.com/gitlabhq"
- else
%h3.nothing_here_message There are no projects you have access to.
%br
......
......@@ -2,7 +2,7 @@
.event_lp
%div
= image_tag gravatar_icon(event.author_email), class: "avatar"
%span Your pushed to
%span Your pushed to
= event.ref_type
= link_to project_commits_path(event.project, ref: event.ref_name) do
%strong= truncate(event.ref_name, length: 28)
......
......@@ -4,7 +4,7 @@
= check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
.right
- issue.labels.each do |label|
%span.label.label-issue.grouped
%span.label.label-tag.grouped
%i.icon-tag
= label.name
- if issue.notes.any?
......
......@@ -12,7 +12,7 @@
= form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do
= hidden_field_tag :project_id, @project.id, { id: 'project_id' }
= hidden_field_tag :status, params[:f]
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib' }
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib search-text-input' }
.clearfix
......
%li.wll
%strong= label.name
%strong
%i.icon-tag
= label.name
.right
%span= pluralize label.count, 'issue'
= link_to project_issues_path(label_name: label.name) do
%strong
= pluralize(label.count, 'issue')
= "»"
......@@ -3,8 +3,8 @@
= label_tag :search do
%strong Looking for
.input
= text_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge", id: "dashboard_search"
= submit_tag 'Search', class: "btn primary"
= search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
= submit_tag 'Search', class: "btn primary wide"
- if params[:search].present?
%br
%h3
......@@ -15,8 +15,9 @@
.row
.span6
%table
%tr
%th Projects
%thead
%tr
%th Projects
%tbody
- @projects.each do |project|
%tr
......@@ -32,8 +33,9 @@
%h4.nothing_here_message No Projects
%br
%table
%tr
%th Merge Requests
%thead
%tr
%th Merge Requests
%tbody
- @merge_requests.each do |merge_request|
%tr
......@@ -50,8 +52,9 @@
%h4.nothing_here_message No Merge Requests
.span6
%table
%tr
%th Issues
%thead
%tr
%th Issues
%tbody
- @issues.each do |issue|
%tr
......
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