Commit c4562316 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Use css truncation on dashboard

parent 491eccd0a39d
......@@ -71,12 +71,7 @@ pre {
}
.str-truncated {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
white-space: nowrap;
max-width: 82%;
@include str-truncated;
}
/** FLASH message **/
......
......@@ -123,3 +123,12 @@
margin-top: 0px;
margin-bottom: 15px;
}
@mixin str-truncated($max_width: "82%") {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
white-space: nowrap;
max-width: $max_width;
}
......@@ -45,6 +45,7 @@
padding: 12px 0px;
border-bottom: 1px solid #eee;
.event-title {
@include str-truncated(72%);
color: #333;
font-weight: normal;
font-size: 14px;
......@@ -135,6 +136,12 @@
}
}
}
.event-item-timestamp {
float: right;
color: #999;
line-height: 22px;
}
}
/**
......@@ -166,3 +173,13 @@
}
}
}
/*
* Last push widget
*/
.event-last-push {
.event-last-push-text {
@include str-truncated(75%);
line-height: 24px;
}
}
- if event.proper?
.event-item{class: "#{event.body? ? "event-block" : "event-inline" }"}
%span.cgray.pull-right
.event-item-timestamp
#{time_ago_with_tooltip(event.created_at)}
= cache event do
......
- if show_last_push_widget?(event)
.event-last-push
%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_project event.project
#{time_ago_with_tooltip(event.created_at)}
.event-last-push-text
%span You pushed to
= link_to project_commits_path(event.project, event.ref_name) do
%strong= event.ref_name
at
%strong= link_to_project event.project
#{time_ago_with_tooltip(event.created_at)}
.pull-right
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do
......
......@@ -5,7 +5,7 @@
%strong= event.ref_name
- else
= link_to project_commits_path(event.project, event.ref_name) do
%strong= truncate(event.ref_name, length: 30)
%strong= event.ref_name
at
= link_to_project event.project
......
Supports Markdown
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