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
Boxiang Sun
gitlab-ce
Commits
012ea64d
Commit
012ea64d
authored
Feb 26, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix description margin for groups list
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
d51f3b7b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
11 deletions
+31
-11
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+7
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-7
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+21
-1
app/views/shared/groups/_group.html.haml
app/views/shared/groups/_group.html.haml
+1
-1
app/views/shared/projects/_project.html.haml
app/views/shared/projects/_project.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/lists.scss
View file @
012ea64d
...
@@ -118,6 +118,13 @@ ul.content-list {
...
@@ -118,6 +118,13 @@ ul.content-list {
font-weight
:
600
;
font-weight
:
600
;
}
}
.description
{
p
{
@include
str-truncated
;
margin-bottom
:
0
;
}
}
.avatar
{
.avatar
{
margin-right
:
15px
;
margin-right
:
15px
;
}
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
012ea64d
...
@@ -410,13 +410,6 @@ pre.light-well {
...
@@ -410,13 +410,6 @@ pre.light-well {
margin-left
:
10px
;
margin-left
:
10px
;
}
}
}
}
.project-description
{
p
{
@include
str-truncated
;
margin-bottom
:
0
;
}
}
}
}
.bottom
{
.bottom
{
...
...
app/views/help/ui.html.haml
View file @
012ea64d
...
@@ -64,8 +64,10 @@
...
@@ -64,8 +64,10 @@
%h2
#lists
Lists
%h2
#lists
Lists
%h4
.lead
Simple list using
%code
.content-list
%code
.content-list
%ul
.content-list
%ul
.content-list
%li
%li
One item
One item
...
@@ -74,6 +76,24 @@
...
@@ -74,6 +76,24 @@
%li
%li
One item
One item
.lead
List with avatar, title and description using
%code
.content-list
%ul
.content-list
%li
=
image_tag
'no_avatar.png'
,
class:
'avatar s40'
.title
Title
.description
Description
%li
=
image_tag
'no_avatar.png'
,
class:
'avatar s40'
.title
Title
.description
Description
%li
=
image_tag
'no_avatar.png'
,
class:
'avatar s40'
.title
Title
.description
Description
%h4
%h4
%code
.well-list
%code
.well-list
%ul
.well-list
%ul
.well-list
...
...
app/views/shared/groups/_group.html.haml
View file @
012ea64d
...
@@ -30,5 +30,5 @@
...
@@ -30,5 +30,5 @@
%span
#{
group_member
.
human_access
}
%span
#{
group_member
.
human_access
}
-
if
group
.
description
.
present?
-
if
group
.
description
.
present?
.
light
.
description
=
markdown
(
group
.
description
,
pipeline: :description
)
=
markdown
(
group
.
description
,
pipeline: :description
)
app/views/shared/projects/_project.html.haml
View file @
012ea64d
...
@@ -43,9 +43,9 @@
...
@@ -43,9 +43,9 @@
title:
"#{visibility_level_label(project.visibility_level)} - #{project_visibility_level_description(project.visibility_level)}"
}
title:
"#{visibility_level_label(project.visibility_level)} - #{project_visibility_level_description(project.visibility_level)}"
}
=
visibility_level_icon
(
project
.
visibility_level
,
fw:
false
)
=
visibility_level_icon
(
project
.
visibility_level
,
fw:
false
)
-
if
show_last_commit_as_description
-
if
show_last_commit_as_description
.
project-
description
.description
=
link_to_gfm
project
.
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
project
.
commit
),
=
link_to_gfm
project
.
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
project
.
commit
),
class:
"commit-row-message"
class:
"commit-row-message"
-
elsif
project
.
description
.
present?
-
elsif
project
.
description
.
present?
.
project-
description
.description
=
markdown
(
project
.
description
,
pipeline: :description
)
=
markdown
(
project
.
description
,
pipeline: :description
)
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