doortts doortts 2019-01-10
Merge branch 'enhance/sidebar' into next
Reviewed-by: Hyunjae Park
@cfeb5402e1eb495ff442d6a950253ffe97195deb
app/assets/stylesheets/less/_page.less
--- app/assets/stylesheets/less/_page.less
+++ app/assets/stylesheets/less/_page.less
@@ -11,7 +11,6 @@
     top: 0;
     left: 0;
     bottom: 0;
-    min-height: 100vh;
 
     .nav {
         width: 270px;
app/assets/stylesheets/less/_usermenu.less
--- app/assets/stylesheets/less/_usermenu.less
+++ app/assets/stylesheets/less/_usermenu.less
@@ -81,6 +81,21 @@
     margin: 10px 0;
     padding: 0;
     list-style-type: none;
+    overflow-x: visible;
+    overflow-y: auto;
+    height: 100vh;
+
+    -ms-overflow-style: -ms-autohiding-scrollbar;
+
+    &::-webkit-scrollbar {
+      height: 10px;
+      width: 7px;
+      background: lightgray;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #2788ba;
+    }
 
     .favored {
       border-bottom: 1px dashed gray;
@@ -89,12 +104,15 @@
 
   .user-li {
     cursor: pointer;
+    line-height: normal;
+    font-size: 0;
 
     .popover {
       word-wrap: break-word;
       min-width: 200px;
       background-color: rgb(3, 169, 244);
       color: white;
+      font-size: 13px;
 
       .arrow {
         &::after {
@@ -458,7 +476,7 @@
   }
 
   .project-item {
-    font-size: 13px;
+    font-size: 14px;
     font-weight: 400;
     overflow: hidden;
     color: rgba( 255, 255, 255, 0.85 );
@@ -478,7 +496,7 @@
 
       &.org-name {
         max-width: 140px;
-        font-size: 13px;
+        font-size: 14px;
         color: #00bcd4;
       }
 
@@ -595,9 +613,21 @@
 
   .org-li {
     margin-top: 3px;
+    margin-bottom: 8px;
   }
 
-  .project-list, .org-list {
+  .project-list {
+    padding: 1px 0;
+
+    &:hover {
+      cursor: pointer;
+      background-color: rgba(255, 255, 255, 0.15);
+    }
+  }
+
+  .org-list {
+    padding: 1px 0;
+
     &:hover {
       cursor: pointer;
       background-color: rgba(255, 255, 255, 0.15);
app/views/index/myOrganizationList.scala.html
--- app/views/index/myOrganizationList.scala.html
+++ app/views/index/myOrganizationList.scala.html
@@ -45,16 +45,16 @@
                     @myOrganizationList_partial(organization, false)
                 }
             }
-        </ul>
-        @defining(currentUser.favoriteProjects){ favoriteProjects =>
-            <ul class="etc-favorites user-ul">
+            <ul class="etc-favorites">
+            </ul>
+            @defining(currentUser.favoriteProjects){ favoriteProjects =>
                 @for(favoriteProject <- favoriteProjects){
                     @if(!favoriteProject.project.hasGroup && !favoriteProject.owner.equals(currentUser.loginId)) {
                         @myProjectList_partial(favoriteProject.project, true)
                     }
                 }
-            </ul>
-        }
+            }
+        </ul>
     }
 }
 
Add a comment
List