deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

polishing UI a bit. Added footer links for dashboard

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-09-19 09:14:07 +03:00
parent 6d8d32c244
commit bf625b7c92
11 changed files with 117 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/assets/stylesheets/common.scss
View file

@ -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 {
padding: 6px 20px; padding: 6px 20px;
margin-right: 12px; margin-right: 12px;
} }
.gitlab-promo {
a {
color:#aaa;
margin-right: 30px;
}
}

10
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file

@ -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;
}

55
app/assets/stylesheets/sections/issues.scss
View file

@ -1,55 +1,55 @@
.issue_form_box { .issue_form_box {
@extend .main_box; @extend .main_box;
.issue_title { .issue_title {
@extend .top_box_content; @extend .top_box_content;
.clearfix { .clearfix {
margin-bottom:0px; margin-bottom:0px;
input { input {
@extend .span8; @extend .span8;
} }
} }
} }
.issue_middle_block { .issue_middle_block {
@extend .middle_box_content; @extend .middle_box_content;
height:30px; height:30px;
.issue_assignee { .issue_assignee {
@extend .span6; @extend .span6;
float:left; float:left;
} }
.issue_milestone { .issue_milestone {
@extend .span4; @extend .span4;
float:left; float:left;
} }
} }
.issue_description { .issue_description {
@extend .bottom_box_content; @extend .bottom_box_content;
} }
} }
.issues_table { .issues_table {
.issue { .issue {
padding:7px 10px; padding:7px 10px;
.issue_check { .issue_check {
float:left; float:left;
padding: 8px 0; padding: 8px 0;
padding-right: 8px; padding-right: 8px;
min-width: 15px; min-width: 15px;
} }
p { p {
padding-top:0; padding-top:0;
padding-bottom:2px; padding-bottom:2px;
} }
img.avatar { img.avatar {
width:32px; width:32px;
margin-top:4px; margin-top:4px;
} }
} }
} }
input.check_all_issues { input.check_all_issues {
float:left; float:left;
padding: 0; padding: 0;
margin:0; margin:0;
@ -59,8 +59,8 @@ input.check_all_issues {
height: 22px; height: 22px;
} }
.issues_content { .issues_content {
.title { .title {
height: 40px; height: 40px;
} }
} }
@ -70,30 +70,30 @@ input.check_all_issues {
@media (min-width: 1200px) { .issues_filters select { width:220px; } } @media (min-width: 1200px) { .issues_filters select { width:220px; } }
#issues-table-holder { #issues-table-holder {
.issues_filters { .issues_filters {
form { form {
padding:0; padding:0;
margin:0; margin:0;
margin-top:7px margin-top:7px
} }
} }
.issues_bulk_update { .issues_bulk_update {
margin: 0; margin: 0;
form { form {
padding:0; padding:0;
margin:0; margin:0;
margin-top:7px margin-top:7px
} }
.update_selected_issues { .update_selected_issues {
position:relative; position:relative;
top:-2px; top:-2px;
margin-left:4px; margin-left:4px;
float:left; float:left;
} }
.update_issues_text { .update_issues_text {
padding:3px; padding:3px;
line-height: 18px; line-height: 18px;
float:left; float:left;
@ -101,10 +101,11 @@ input.check_all_issues {
} }
} }
#update_status { #update_status {
width:100px; width:100px;
} }
/** /**
* Milestones list * Milestones list
* *

55
app/assets/stylesheets/sections/merge_requests.scss
View file

@ -1,13 +1,13 @@
/** /**
* MR form * MR form
* *
*/ */
.mr_branch_box { .mr_branch_box {
@extend .ui-box; @extend .ui-box;
margin-bottom:20px; margin-bottom:20px;
.body { .body {
background:#f1f1f1; background:#f1f1f1;
} }
@ -17,19 +17,19 @@
* MR -> show: Automerge widget * MR -> show: Automerge widget
* *
*/ */
.automerge_widget { .automerge_widget {
&.can_be_merged { &.can_be_merged {
background: #DFF0D8; background: #DFF0D8;
} }
form { form {
margin-bottom:0; margin-bottom:0;
.clearfix { .clearfix {
margin-bottom:0; margin-bottom:0;
} }
} }
.accept_group { .accept_group {
float:left; float:left;
border: 1px solid #ADA; border: 1px solid #ADA;
padding: 2px; padding: 2px;
@ -37,29 +37,29 @@
border-radius: 5px; border-radius: 5px;
background: #CEB; background: #CEB;
.accept_merge_request { .accept_merge_request {
font-size:13px; font-size:13px;
float:left; float:left;
} }
.remove_branch_holder { .remove_branch_holder {
margin-left:20px; margin-left:20px;
margin-right:10px; margin-right:10px;
float:left; float:left;
} }
label { label {
color:#444; color:#444;
} }
} }
.how_to_merge_link { .how_to_merge_link {
@extend .primary; @extend .primary;
} }
} }
.mr_nav_tabs { .mr_nav_tabs {
li { li {
a { a {
font-weight:bold; font-weight:bold;
padding:8px 20px; padding:8px 20px;
text-align:center; text-align:center;
@ -67,19 +67,19 @@
} }
} }
li.merge_request { li.merge_request {
padding:7px 10px; padding:7px 10px;
img.avatar { img.avatar {
width: 32px; width: 32px;
margin-top: 4px; margin-top: 4px;
} }
p { p {
padding: 0px; padding: 0px;
padding-bottom: 2px; padding-bottom: 2px;
} }
} }
.merge_in_progress { .merge_in_progress {
@extend .padded; @extend .padded;
@extend .append-bottom-10; @extend .append-bottom-10;
} }
@ -88,22 +88,21 @@ 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,
.mr_target_commit { .mr_target_commit {
.commit { .commit {
margin:0; margin:0;
padding:0; padding:0;
padding: 5px; padding: 5px;
margin-bottom: 5px; margin-bottom: 5px;
.avatar { position:relative } .avatar { position:relative }
.row_title { .row_title {
color:#444; color:#444;
} }
.commit-author-name, .commit-author-name,
@ -113,12 +112,12 @@ li.merge_request {
display:none; display:none;
} }
list-style:none; list-style:none;
&:hover { &:hover {
background:none; background:none;
} }
} }
} }
.mr_direction_tip { .mr_direction_tip {
margin-top:40px margin-top:40px
} }

6
app/views/admin/resque/show.html.haml
View file

@ -1,2 +1,4 @@
%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"}

8
app/views/dashboard/index.html.haml
View file

@ -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

2
app/views/events/_event_last_push.html.haml
View file

@ -2,7 +2,7 @@
.event_lp .event_lp
%div %div
= image_tag gravatar_icon(event.author_email), class: "avatar" = image_tag gravatar_icon(event.author_email), class: "avatar"
%span Your pushed to %span Your pushed to
= event.ref_type = event.ref_type
= link_to project_commits_path(event.project, ref: event.ref_name) do = link_to project_commits_path(event.project, ref: event.ref_name) do
%strong= truncate(event.ref_name, length: 28) %strong= truncate(event.ref_name, length: 28)

2
app/views/issues/_show.html.haml
View file

@ -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?

2
app/views/issues/index.html.haml
View file

@ -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

9
app/views/labels/_label.html.haml
View file

@ -1,4 +1,9 @@
%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')
= "»"

19
app/views/search/show.html.haml
View file

@ -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,8 +15,9 @@
.row .row
.span6 .span6
%table %table
%tr %thead
%th Projects %tr
%th Projects
%tbody %tbody
- @projects.each do |project| - @projects.each do |project|
%tr %tr
@ -32,8 +33,9 @@
%h4.nothing_here_message No Projects %h4.nothing_here_message No Projects
%br %br
%table %table
%tr %thead
%th Merge Requests %tr
%th Merge Requests
%tbody %tbody
- @merge_requests.each do |merge_request| - @merge_requests.each do |merge_request|
%tr %tr
@ -50,8 +52,9 @@
%h4.nothing_here_message No Merge Requests %h4.nothing_here_message No Merge Requests
.span6 .span6
%table %table
%tr %thead
%th Issues %tr
%th Issues
%tbody %tbody
- @issues.each do |issue| - @issues.each do |issue|
%tr %tr