Restyled last push widget. Increased line-height for td in tables
This commit is contained in:
parent
42abdf69d5
commit
e51b2d58e7
|
@ -24,6 +24,22 @@
|
|||
}
|
||||
}
|
||||
|
||||
&.btn-info {
|
||||
background:#5aB9C3;
|
||||
border-color: $blue_link;
|
||||
color:#fff;
|
||||
text-shadow: 0 1px 1px #268;
|
||||
&:hover {
|
||||
background:$blue_link;
|
||||
color:#fff;
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
color:#fff;
|
||||
background:#29B;
|
||||
}
|
||||
}
|
||||
|
||||
&.success {
|
||||
@extend .btn-success;
|
||||
|
||||
|
|
|
@ -5,6 +5,12 @@ table {
|
|||
border:1px solid #bbb;
|
||||
width:100%;
|
||||
|
||||
&.low {
|
||||
td {
|
||||
line-height:18px;
|
||||
}
|
||||
}
|
||||
|
||||
th {
|
||||
font-weight: bold;
|
||||
vertical-align: middle;
|
||||
|
@ -26,6 +32,8 @@ table {
|
|||
|
||||
td {
|
||||
border-color:#f1f1f1;
|
||||
line-height:28px;
|
||||
|
||||
&:first-child {
|
||||
border-left:1px solid #bbb;
|
||||
}
|
||||
|
|
|
@ -97,14 +97,21 @@
|
|||
*
|
||||
*/
|
||||
.event_lp {
|
||||
@extend .ui-box;
|
||||
color:#777;
|
||||
margin-bottom:20px;
|
||||
padding:8px;
|
||||
@include border-radius(4px);
|
||||
padding:10px;
|
||||
min-height:22px;
|
||||
border-left: 5px solid #5AB9C3;
|
||||
margin-bottom:20px;
|
||||
background:#f9f9f9;
|
||||
|
||||
.avatar {
|
||||
width:24px;
|
||||
}
|
||||
|
||||
.btn-new-mr {
|
||||
@extend .btn-info;
|
||||
@extend .small;
|
||||
@extend .right;
|
||||
margin: -3px;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
padding: 2px 10px;
|
||||
}
|
||||
td {
|
||||
line-height:20px;
|
||||
background:#fafafa;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
= render 'admin/shared/projects_head'
|
||||
%h3.page_title
|
||||
Groups
|
||||
%small
|
||||
allows you to keep projects organized.
|
||||
Use groups for uniting related projects.
|
||||
|
||||
= link_to 'New Group', new_admin_group_path, class: "btn small right"
|
||||
%br
|
||||
= form_tag admin_groups_path, method: :get, class: 'form-inline' do
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
- if @projects.any?
|
||||
.projects
|
||||
.activities.span8
|
||||
= render "events/event_last_push", event: @last_push
|
||||
= render 'shared/no_ssh'
|
||||
- if @events.any?
|
||||
.content_list= render @events
|
||||
|
@ -8,7 +9,6 @@
|
|||
%h4.nothing_here_message Projects activity will be displayed here
|
||||
.loading.hide
|
||||
.side
|
||||
= render "events/event_last_push", event: @last_push
|
||||
- if @groups.present?
|
||||
= render "groups", groups: @groups
|
||||
= render "projects", projects: @projects
|
||||
|
|
|
@ -1,13 +1,15 @@
|
|||
- if show_last_push_widget?(event)
|
||||
.event_lp
|
||||
%div
|
||||
= image_tag gravatar_icon(event.author_email), class: "avatar"
|
||||
%span You pushed to
|
||||
= event.ref_type
|
||||
= link_to project_commits_path(event.project, event.ref_name) do
|
||||
%strong= truncate(event.ref_name, length: 28)
|
||||
at
|
||||
%strong= link_to event.project.name, event.project
|
||||
= image_tag "event_push.png"
|
||||
|
||||
%span You pushed to
|
||||
= link_to project_commits_path(event.project, event.ref_name) do
|
||||
%strong= truncate(event.ref_name, length: 28)
|
||||
at
|
||||
%strong= link_to event.project.name, event.project
|
||||
%span
|
||||
= time_ago_in_words(event.created_at)
|
||||
ago.
|
||||
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn very_small" do
|
||||
Create Merge Request
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-new-mr" do
|
||||
Create Merge Request
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
.projects
|
||||
.activities.span8
|
||||
= render "events/event_last_push", event: @last_push
|
||||
= link_to dashboard_path, class: 'btn very_small' do
|
||||
← To dashboard
|
||||
|
||||
|
@ -12,7 +13,6 @@
|
|||
%h4.nothing_here_message Projects activity will be displayed here
|
||||
.loading.hide
|
||||
.side
|
||||
= render "events/event_last_push", event: @last_push
|
||||
= render "projects", projects: @projects
|
||||
%div
|
||||
%span.rss-icon
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
%tr
|
||||
%td
|
||||
= link_to key_path(key) do
|
||||
%p
|
||||
%strong= key.title
|
||||
%strong= key.title
|
||||
%td
|
||||
%span.cgray
|
||||
Added
|
||||
|
|
|
@ -4,14 +4,13 @@
|
|||
%thead
|
||||
%tr
|
||||
%th File name
|
||||
%th
|
||||
%th
|
||||
|
||||
- @notes.each do |note|
|
||||
%tr
|
||||
%td
|
||||
%a{href: note.attachment.url}
|
||||
= image_tag gravatar_icon(note.author_email), class: "left", width: 16
|
||||
|
||||
= image_tag gravatar_icon(note.author_email), class: "avatar s24"
|
||||
= note.attachment_identifier
|
||||
%td
|
||||
Added
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- grouper_project_members(@project).each do |access, members|
|
||||
%table
|
||||
%table.low
|
||||
%thead
|
||||
%tr
|
||||
%th.span7
|
||||
|
|
|
@ -16,7 +16,7 @@ class Dashboard < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
Then 'I should see last push widget' do
|
||||
page.should have_content "You pushed to branch new_design"
|
||||
page.should have_content "You pushed to new_design"
|
||||
page.should have_link "Create Merge Request"
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue