Commit e51b2d58 authored by randx's avatar randx

Restyled last push widget. Increased line-height for td in tables

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