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 { ...@@ -145,6 +145,19 @@ span.update-author {
.label { .label {
background-color: #474D57; 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 { &.label-issue {
background-color: #eee; background-color: #eee;
border: 1px solid #ccc; border: 1px solid #ccc;
...@@ -722,3 +735,10 @@ li.note { ...@@ -722,3 +735,10 @@ li.note {
padding: 6px 20px; padding: 6px 20px;
margin-right: 12px; margin-right: 12px;
} }
.gitlab-promo {
a {
color:#aaa;
margin-right: 30px;
}
}
...@@ -72,3 +72,13 @@ img.lil_av { padding-left: 4px; padding-right:3px; } ...@@ -72,3 +72,13 @@ img.lil_av { padding-left: 4px; padding-right:3px; }
/** HELPERS **/ /** HELPERS **/
.nothing_here_message { text-align:center; padding:20px; color:#777; } .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; } 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;
}
...@@ -105,6 +105,7 @@ input.check_all_issues { ...@@ -105,6 +105,7 @@ input.check_all_issues {
width:100px; width:100px;
} }
/** /**
* Milestones list * Milestones list
* *
......
...@@ -88,11 +88,10 @@ li.merge_request { ...@@ -88,11 +88,10 @@ li.merge_request {
@include round-borders-all(4px); @include round-borders-all(4px);
padding:2px 4px; padding:2px 4px;
border:none; border:none;
font-size:13px; font-size:14px;
background: #474D57; background: #474D57;
color:#fff; color:#fff;
font-weight:bold; font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
font-family: monospace;
} }
.mr_source_commit, .mr_source_commit,
......
%h3 Resque %h3.page_title Resque
%iframe{src: resque_url, width: 1168, height: 600, style: "border: none"} %br
.ui-box
%iframe{src: resque_url, width: '100%', height: 600, style: "border: none"}
...@@ -31,13 +31,19 @@ ...@@ -31,13 +31,19 @@
%span= project_last_activity(project) %span= project_last_activity(project)
.bottom= paginate @projects, theme: "gitlab" .bottom= paginate @projects, theme: "gitlab"
%hr
%div %div
%span.rss-icon %span.rss-icon
= link_to dashboard_path(:atom, { private_token: current_user.private_token }) do = link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
= image_tag "rss_ui.png", title: "feed" = image_tag "rss_ui.png", title: "feed"
%strong News 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 - else
%h3.nothing_here_message There are no projects you have access to. %h3.nothing_here_message There are no projects you have access to.
%br %br
......
...@@ -4,7 +4,7 @@ ...@@ -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) = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
.right .right
- issue.labels.each do |label| - issue.labels.each do |label|
%span.label.label-issue.grouped %span.label.label-tag.grouped
%i.icon-tag %i.icon-tag
= label.name = label.name
- if issue.notes.any? - if issue.notes.any?
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do = 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 :project_id, @project.id, { id: 'project_id' }
= hidden_field_tag :status, params[:f] = 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 .clearfix
......
%li.wll %li.wll
%strong= label.name %strong
%i.icon-tag
= label.name
.right .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 @@ ...@@ -3,8 +3,8 @@
= label_tag :search do = label_tag :search do
%strong Looking for %strong Looking for
.input .input
= text_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge", id: "dashboard_search" = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
= submit_tag 'Search', class: "btn primary" = submit_tag 'Search', class: "btn primary wide"
- if params[:search].present? - if params[:search].present?
%br %br
%h3 %h3
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
.row .row
.span6 .span6
%table %table
%thead
%tr %tr
%th Projects %th Projects
%tbody %tbody
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
%h4.nothing_here_message No Projects %h4.nothing_here_message No Projects
%br %br
%table %table
%thead
%tr %tr
%th Merge Requests %th Merge Requests
%tbody %tbody
...@@ -50,6 +52,7 @@ ...@@ -50,6 +52,7 @@
%h4.nothing_here_message No Merge Requests %h4.nothing_here_message No Merge Requests
.span6 .span6
%table %table
%thead
%tr %tr
%th Issues %th Issues
%tbody %tbody
......
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