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
494e8090
Commit
494e8090
authored
Jun 06, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add rows hover state and improve layout for mobile
parent
e21d9e88
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
78 additions
and
60 deletions
+78
-60
app/assets/javascripts/groups/components/group_item.vue
app/assets/javascripts/groups/components/group_item.vue
+58
-57
app/assets/javascripts/groups/stores/groups_store.js
app/assets/javascripts/groups/stores/groups_store.js
+1
-0
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+19
-3
No files found.
app/assets/javascripts/groups/components/group_item.vue
View file @
494e8090
...
...
@@ -102,70 +102,71 @@ export default {
:id=
"groupDomId"
:class=
"rowClass"
>
<div
class=
"controls"
>
<a
v-if=
"group.canEdit"
class=
"edit-group btn"
:href=
"group.editPath"
>
<i
aria-hidden=
"true"
class=
"fa fa-cogs"
></i>
</a>
<a
@
click=
"onLeaveGroup"
:href=
"group.leavePath"
class=
"leave-group btn"
title=
"Leave this group"
>
<i
aria-hidden=
"true"
class=
"fa fa-sign-out"
></i>
</a>
</div>
<div
class=
"group-row-contents"
>
<div
class=
"controls"
>
<a
v-if=
"group.canEdit"
class=
"edit-group btn"
:href=
"group.editPath"
>
<i
aria-hidden=
"true"
class=
"fa fa-cogs"
></i>
</a>
<a
@
click=
"onLeaveGroup"
:href=
"group.leavePath"
class=
"leave-group btn"
title=
"Leave this group"
>
<i
aria-hidden=
"true"
class=
"fa fa-sign-out"
></i>
</a>
</div>
<div
class=
"stats"
>
<span
class=
"number-projects"
>
<i
aria-hidden=
"true"
class=
"fa fa-bookmark"
></i>
{{
group
.
numberProjects
}}
</span>
<span
class=
"number-users"
>
<i
aria-hidden=
"true"
class=
"fa fa-users"
></i>
{{
group
.
numberUsers
}}
</span>
<span
class=
"group-visibility"
>
<i
aria-hidden=
"true"
:class=
"visibilityIcon"
></i>
</span>
</div>
<div
class=
"stats"
>
<span
class=
"number-projects"
>
<i
aria-hidden=
"true"
class=
"fa fa-bookmark"
></i>
{{
group
.
numberProjects
}}
</span>
<span
class=
"number-users"
>
<i
aria-hidden=
"true"
class=
"fa fa-users"
></i>
{{
group
.
numberUsers
}}
</span>
<span
class=
"group-visibility"
>
<i
aria-hidden=
"true"
:class=
"visibilityIcon"
></i>
</span>
</div>
<div
class=
"folder-toggle-wrap"
>
<span
class=
"folder-caret"
v-if=
"group.hasSubgroups"
>
<i
v-if=
"group.isOpen"
class=
"fa fa-caret-down"
/>
<i
v-if=
"!group.isOpen"
class=
"fa fa-caret-right"
/>
</span>
<div
class=
"folder-toggle-wrap"
>
<span
class=
"folder-caret"
v-if=
"group.hasSubgroups"
>
<i
v-if=
"group.isOpen"
class=
"fa fa-caret-down"
/>
<i
v-if=
"!group.isOpen"
class=
"fa fa-caret-right"
/>
</span>
<span
class=
"folder-icon"
>
<i
v-if=
"group.isOpen"
class=
"fa fa-folder-open"
aria-hidden=
"true"
></i>
<i
v-if=
"!group.isOpen"
class=
"fa fa-folder"
></i>
</span>
</div>
<span
class=
"folder-icon"
>
<i
v-if=
"group.isOpen"
class=
"fa fa-folder-open"
aria-hidden=
"true"
></i>
<i
v-if=
"!group.isOpen"
class=
"fa fa-folder"
></i>
</span>
</div>
<div
class=
"avatar-container s40
"
>
<a
href=
"/h5bp
"
>
<img
class=
"avatar s40 hidden-xs"
src=
"http://localhost:3000/uploads/group/avatar/2/logo-extra-whitespace.png"
alt=
"Logo extra whitespace"
>
</a>
</div>
<div
class=
"avatar-container s40 hidden-xs
"
>
<a
:href=
"group.webUrl
"
>
<img
class=
"avatar s40"
:src=
"group.avatarUrl"
/
>
</a>
</div>
<div
class=
"title"
>
<a
:href=
"group.webUrl"
>
{{
fullPath
}}
</a>
</div>
<div
class=
"title"
>
<a
:href=
"group.webUrl"
>
{{
fullPath
}}
</a>
</div>
<div
class=
"description"
>
{{
group
.
description
}}
<div
class=
"description"
>
{{
group
.
description
}}
</div>
</div>
<group-folder
v-if=
"group.isOpen && hasGroups"
:groups=
"group.subGroups"
:baseGroup=
"group"
/>
</li>
</
template
>
app/assets/javascripts/groups/stores/groups_store.js
View file @
494e8090
...
...
@@ -116,6 +116,7 @@ export default class GroupsStore {
id
:
rawGroup
.
id
,
fullName
:
rawGroup
.
full_name
,
fullPath
:
rawGroup
.
full_path
,
avatarUrl
:
rawGroup
.
avatar_url
,
name
:
rawGroup
.
name
,
hasSubgroups
:
rawGroup
.
has_subgroups
,
canEdit
:
rawGroup
.
can_edit
,
...
...
app/assets/stylesheets/framework/lists.scss
View file @
494e8090
...
...
@@ -302,10 +302,9 @@ ul.indent-list {
}
.group-list-tree
{
margin-top
:
10px
;
margin-bottom
:
0
;
margin-left
:
20px
;
border-top
:
solid
1px
$border-white-light
;
//
border-top: solid 1px $border-white-light;
position
:
relative
;
&
:
:
before
{
...
...
@@ -313,7 +312,7 @@ ul.indent-list {
display
:
block
;
width
:
0
;
position
:
absolute
;
top
:
0
;
top
:
5px
;
bottom
:
0
;
left
:
-16px
;
border-left
:
2px
solid
$border-white-normal
;
...
...
@@ -341,6 +340,23 @@ ul.indent-list {
}
}
}
.group-row
{
padding
:
0
;
border
:
none
;
}
.group-row-contents
{
padding
:
10px
10px
8px
10px
;
border-top
:
solid
1px
transparent
;
border-bottom
:
solid
1px
$white-normal
;
&
:hover
{
border-color
:
$row-hover-border
;
background-color
:
$row-hover
;
cursor
:
pointer
;
}
}
}
.js-groups-list-holder
{
...
...
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