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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8301836b
Commit
8301836b
authored
Sep 04, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small ui improvements to activity feed
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
af6f739f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+1
-1
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+6
-5
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+6
-1
app/views/events/event/_note.html.haml
app/views/events/event/_note.html.haml
+1
-2
No files found.
app/assets/stylesheets/generic/common.scss
View file @
8301836b
...
@@ -353,7 +353,7 @@ table {
...
@@ -353,7 +353,7 @@ table {
}
}
.description
{
.description
{
font-size
:
16px
;
font-size
:
$gl-font-size
;
color
:
#666
;
color
:
#666
;
margin-top
:
8px
;
margin-top
:
8px
;
}
}
...
...
app/assets/stylesheets/pages/events.scss
View file @
8301836b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
*
*
*/
*/
.event-item
{
.event-item
{
font-size
:
16px
;
font-size
:
$gl-font-size
;
padding
:
$gl-padding
;
padding
:
$gl-padding
;
margin-left
:
-
$gl-padding
;
margin-left
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
.event-title
{
.event-title
{
@include
str-truncated
(
calc
(
100%
-
174px
));
@include
str-truncated
(
calc
(
100%
-
174px
));
font-weight
:
5
00
;
font-weight
:
6
00
;
.author_name
{
.author_name
{
color
:
#333
;
color
:
#333
;
...
@@ -51,7 +51,8 @@
...
@@ -51,7 +51,8 @@
word-wrap
:
break-word
;
word-wrap
:
break-word
;
.md
{
.md
{
font-size
:
16px
;
color
:
#7f8fa4
;
font-size
:
$gl-font-size
;
iframe
.twitter-share-button
{
iframe
.twitter-share-button
{
vertical-align
:
bottom
;
vertical-align
:
bottom
;
...
@@ -81,7 +82,7 @@
...
@@ -81,7 +82,7 @@
.event-note-icon
{
.event-note-icon
{
color
:
#777
;
color
:
#777
;
float
:
left
;
float
:
left
;
font-size
:
16px
;
font-size
:
$gl-font-size
;
line-height
:
16px
;
line-height
:
16px
;
margin-right
:
5px
;
margin-right
:
5px
;
}
}
...
@@ -112,7 +113,7 @@
...
@@ -112,7 +113,7 @@
padding-left
:
0
;
padding-left
:
0
;
border
:
none
;
border
:
none
;
.commit-row-title
{
.commit-row-title
{
font-size
:
16px
;
font-size
:
$gl-font-size
;
}
}
}
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
8301836b
...
@@ -274,7 +274,7 @@ pre.light-well {
...
@@ -274,7 +274,7 @@ pre.light-well {
&
.no-description
{
&
.no-description
{
.project
{
.project
{
line-height
:
38
px
;
line-height
:
44
px
;
}
}
}
}
...
@@ -299,6 +299,11 @@ pre.light-well {
...
@@ -299,6 +299,11 @@ pre.light-well {
}
}
}
}
}
}
.bottom
{
padding-top
:
$gl-padding
;
padding-bottom
:
0
;
}
}
}
.panel
.projects-list
li
{
.panel
.projects-list
li
{
...
...
app/views/events/event/_note.html.haml
View file @
8301836b
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
event
.
action_name
=
event
.
action_name
=
event_note_title_html
(
event
)
=
event_note_title_html
(
event
)
at
at
-
if
event
.
project
-
if
event
.
project
=
link_to_project
event
.
project
=
link_to_project
event
.
project
-
else
-
else
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
.event-body
.event-body
.event-note
.event-note
.md
.md
%i
.fa.fa-comment-o.event-note-icon
=
event_note
(
event
.
target
.
note
,
project:
event
.
project
)
=
event_note
(
event
.
target
.
note
,
project:
event
.
project
)
-
note
=
event
.
target
-
note
=
event
.
target
-
if
note
.
attachment
.
url
-
if
note
.
attachment
.
url
...
...
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