Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
c4562316
Commit
c4562316
authored
May 26, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use css truncation on dashboard
parent
7ad5fb53
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
14 deletions
+36
-14
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+1
-6
app/assets/stylesheets/main/mixins.scss
app/assets/stylesheets/main/mixins.scss
+9
-0
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+17
-0
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+1
-1
app/views/events/_event_last_push.html.haml
app/views/events/_event_last_push.html.haml
+7
-6
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/common.scss
View file @
c4562316
...
@@ -71,12 +71,7 @@ pre {
...
@@ -71,12 +71,7 @@ pre {
}
}
.str-truncated
{
.str-truncated
{
display
:
inline-block
;
@include
str-truncated
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
vertical-align
:
top
;
white-space
:
nowrap
;
max-width
:
82%
;
}
}
/** FLASH message **/
/** FLASH message **/
...
...
app/assets/stylesheets/main/mixins.scss
View file @
c4562316
...
@@ -123,3 +123,12 @@
...
@@ -123,3 +123,12 @@
margin-top
:
0px
;
margin-top
:
0px
;
margin-bottom
:
15px
;
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
;
}
app/assets/stylesheets/sections/events.scss
View file @
c4562316
...
@@ -45,6 +45,7 @@
...
@@ -45,6 +45,7 @@
padding
:
12px
0px
;
padding
:
12px
0px
;
border-bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
#eee
;
.event-title
{
.event-title
{
@include
str-truncated
(
72%
);
color
:
#333
;
color
:
#333
;
font-weight
:
normal
;
font-weight
:
normal
;
font-size
:
14px
;
font-size
:
14px
;
...
@@ -135,6 +136,12 @@
...
@@ -135,6 +136,12 @@
}
}
}
}
}
}
.event-item-timestamp
{
float
:
right
;
color
:
#999
;
line-height
:
22px
;
}
}
}
/**
/**
...
@@ -166,3 +173,13 @@
...
@@ -166,3 +173,13 @@
}
}
}
}
}
}
/*
* Last push widget
*/
.event-last-push
{
.event-last-push-text
{
@include
str-truncated
(
75%
);
line-height
:
24px
;
}
}
app/views/events/_event.html.haml
View file @
c4562316
-
if
event
.
proper?
-
if
event
.
proper?
.event-item
{
class:
"#{event.body? ? "
event
-
block
" : "
event
-
inline
" }"
}
.event-item
{
class:
"#{event.body? ? "
event
-
block
" : "
event
-
inline
" }"
}
%span
.cgray.pull-right
.event-item-timestamp
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
=
cache
event
do
=
cache
event
do
...
...
app/views/events/_event_last_push.html.haml
View file @
c4562316
-
if
show_last_push_widget?
(
event
)
-
if
show_last_push_widget?
(
event
)
.event-last-push
.event-last-push
%span
You pushed to
.event-last-push-text
=
link_to
project_commits_path
(
event
.
project
,
event
.
ref_name
)
do
%span
You pushed to
%strong
=
truncate
(
event
.
ref_name
,
length:
28
)
=
link_to
project_commits_path
(
event
.
project
,
event
.
ref_name
)
do
at
%strong
=
event
.
ref_name
%strong
=
link_to_project
event
.
project
at
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
%strong
=
link_to_project
event
.
project
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
.pull-right
.pull-right
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-create btn-small"
do
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-create btn-small"
do
...
...
app/views/events/event/_push.html.haml
View file @
c4562316
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
%strong
=
event
.
ref_name
%strong
=
event
.
ref_name
-
else
-
else
=
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:
30
)
%strong
=
event
.
ref_name
at
at
=
link_to_project
event
.
project
=
link_to_project
event
.
project
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment