Merge branch 'enhance/sidebar' into next
Reviewed-by: Hyunjae Park
@cfeb5402e1eb495ff442d6a950253ffe97195deb
--- app/assets/stylesheets/less/_page.less
+++ app/assets/stylesheets/less/_page.less
... | ... | @@ -11,7 +11,6 @@ |
11 | 11 |
top: 0; |
12 | 12 |
left: 0; |
13 | 13 |
bottom: 0; |
14 |
- min-height: 100vh; |
|
15 | 14 |
|
16 | 15 |
.nav { |
17 | 16 |
width: 270px; |
--- app/views/index/myOrganizationList.scala.html
+++ app/views/index/myOrganizationList.scala.html
... | ... | @@ -45,16 +45,16 @@ |
45 | 45 |
@myOrganizationList_partial(organization, false) |
46 | 46 |
} |
47 | 47 |
} |
48 |
- </ul> |
|
49 |
- @defining(currentUser.favoriteProjects){ favoriteProjects => |
|
50 |
- <ul class="etc-favorites user-ul"> |
|
48 |
+ <ul class="etc-favorites"> |
|
49 |
+ </ul> |
|
50 |
+ @defining(currentUser.favoriteProjects){ favoriteProjects => |
|
51 | 51 |
@for(favoriteProject <- favoriteProjects){ |
52 | 52 |
@if(!favoriteProject.project.hasGroup && !favoriteProject.owner.equals(currentUser.loginId)) { |
53 | 53 |
@myProjectList_partial(favoriteProject.project, true) |
54 | 54 |
} |
55 | 55 |
} |
56 |
- </ul> |
|
57 |
- } |
|
56 |
+ } |
|
57 |
+ </ul> |
|
58 | 58 |
} |
59 | 59 |
} |
60 | 60 |
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?