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
Jérome Perrin
gitlab-ce
Commits
730e79e7
Commit
730e79e7
authored
Mar 04, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
better event-notes typography
parent
d54845a1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
10 deletions
+13
-10
app/assets/stylesheets/gitlab_bootstrap/typography.scss
app/assets/stylesheets/gitlab_bootstrap/typography.scss
+4
-0
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+5
-7
app/views/events/event/_note.html.haml
app/views/events/event/_note.html.haml
+4
-3
No files found.
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file @
730e79e7
...
@@ -95,3 +95,7 @@ a:focus {
...
@@ -95,3 +95,7 @@ a:focus {
.white
.highlight
pre
{
background
:
#f5f5f5
;
}
.white
.highlight
pre
{
background
:
#f5f5f5
;
}
ul
{
margin
:
0
0
9px
25px
!
important
;
}
ul
{
margin
:
0
0
9px
25px
!
important
;
}
}
}
.md
{
@include
md-typography
;
}
app/assets/stylesheets/sections/events.scss
View file @
730e79e7
...
@@ -48,15 +48,13 @@
...
@@ -48,15 +48,13 @@
color
:
#666
;
color
:
#666
;
}
}
.event-note
{
.event-note
{
padding-top
:
5px
;
padding-left
:
5px
;
display
:
inline-block
;
color
:
#555
;
color
:
#555
;
margin-top
:
5px
;
margin-left
:
40px
;
.note-file-attach
{
.note-file-attach
{
margin-left
:
-25px
;
float
:
left
;
.note-image-attach
{
.note-image-attach
{
margin-top
:
4px
;
margin-left
:
0px
;
margin-left
:
0px
;
max-width
:
200px
;
max-width
:
200px
;
}
}
...
@@ -66,8 +64,8 @@
...
@@ -66,8 +64,8 @@
color
:
#777
;
color
:
#777
;
float
:
left
;
float
:
left
;
font-size
:
16px
;
font-size
:
16px
;
line-height
:
1
8
px
;
line-height
:
1
6
px
;
margin
:
5px
;
margin
-right
:
5px
;
}
}
}
}
.avatar
{
.avatar
{
...
...
app/views/events/event/_note.html.haml
View file @
730e79e7
...
@@ -21,9 +21,10 @@
...
@@ -21,9 +21,10 @@
=
event
.
project_name
=
event
.
project_name
.event-body
.event-body
.event-note
.md
%i
.icon-comment-alt.event-note-icon
%i
.icon-comment-alt.event-note-icon
%span
.event-note
=
sanitize
(
markdown
(
truncate
(
event
.
target
.
note
,
length:
150
)),
tags:
%w(a img b pre p)
)
=
markdown
truncate
(
event
.
target
.
note
,
length:
70
)
-
note
=
event
.
target
-
note
=
event
.
target
-
if
note
.
attachment
.
url
-
if
note
.
attachment
.
url
=
link_to
note
.
attachment
.
secure_url
,
target:
"_blank"
,
class:
'note-file-attach'
do
=
link_to
note
.
attachment
.
secure_url
,
target:
"_blank"
,
class:
'note-file-attach'
do
...
...
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