polishing UI a bit. Added footer links for dashboard
This commit is contained in:
Dmitriy Zaporozhets
parent
6d8d32c244
commit
bf625b7c92
11 changed files with 117 additions and 71 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ input.check_all_issues {
|
|||
width:100px;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Milestones list
|
||||
*
|
||||
|
|
|
|||
|
|
@ -88,11 +88,10 @@ 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,
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
%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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
%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,6 +15,7 @@
|
|||
.row
|
||||
.span6
|
||||
%table
|
||||
%thead
|
||||
%tr
|
||||
%th Projects
|
||||
%tbody
|
||||
|
|
@ -32,6 +33,7 @@
|
|||
%h4.nothing_here_message No Projects
|
||||
%br
|
||||
%table
|
||||
%thead
|
||||
%tr
|
||||
%th Merge Requests
|
||||
%tbody
|
||||
|
|
@ -50,6 +52,7 @@
|
|||
%h4.nothing_here_message No Merge Requests
|
||||
.span6
|
||||
%table
|
||||
%thead
|
||||
%tr
|
||||
%th Issues
|
||||
%tbody
|
||||
|
|
|
|||
Loading…
Reference in a new issue