Commit @cfeb5402e1eb495ff442d6a950253ffe97195deb

doortts 2019-01-10

Merge branch 'enhance/sidebar' into next

Reviewed-by: Hyunjae Park

@cfeb5402e1eb495ff442d6a950253ffe97195deb

c07a164

cfeb540

app/assets/stylesheets/less/_page.less

--- app/assets/stylesheets/less/_page.less

+++ app/assets/stylesheets/less/_page.less


     top: 0;
     left: 0;
     bottom: 0;
-    min-height: 100vh;
 
     .nav {
         width: 270px;

c07a164

cfeb540

app/assets/stylesheets/less/_usermenu.less

--- app/assets/stylesheets/less/_usermenu.less

+++ app/assets/stylesheets/less/_usermenu.less


     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;

 
   .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 {

   }
 
   .project-item {
-    font-size: 13px;
+    font-size: 14px;
     font-weight: 400;
     overflow: hidden;
     color: rgba( 255, 255, 255, 0.85 );

 
       &.org-name {
         max-width: 140px;
-        font-size: 13px;
+        font-size: 14px;
         color: #00bcd4;
       }
 

 
   .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);

c07a164

cfeb540

app/views/index/myOrganizationList.scala.html

--- app/views/index/myOrganizationList.scala.html

+++ app/views/index/myOrganizationList.scala.html


                     @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

Open 0
Closed 0

List

...	...	@@ -81,6 +81,21 @@
81	81	margin: 10px 0;
82	82	padding: 0;
83	83	list-style-type: none;
	84	+ overflow-x: visible;
	85	+ overflow-y: auto;
	86	+ height: 100vh;
	87	+
	88	+ -ms-overflow-style: -ms-autohiding-scrollbar;
	89	+
	90	+ &::-webkit-scrollbar {
	91	+ height: 10px;
	92	+ width: 7px;
	93	+ background: lightgray;
	94	+ }
	95	+
	96	+ &::-webkit-scrollbar-thumb {
	97	+ background: #2788ba;
	98	+ }
84	99
85	100	.favored {
86	101	border-bottom: 1px dashed gray;
...	...	@@ -89,12 +104,15 @@
89	104
90	105	.user-li {
91	106	cursor: pointer;
	107	+ line-height: normal;
	108	+ font-size: 0;
92	109
93	110	.popover {
94	111	word-wrap: break-word;
95	112	min-width: 200px;
96	113	background-color: rgb(3, 169, 244);
97	114	color: white;
	115	+ font-size: 13px;
98	116
99	117	.arrow {
100	118	&::after {
...	...	@@ -458,7 +476,7 @@
458	476	}
459	477
460	478	.project-item {
461		- font-size: 13px;
	479	+ font-size: 14px;
462	480	font-weight: 400;
463	481	overflow: hidden;
464	482	color: rgba( 255, 255, 255, 0.85 );
...	...	@@ -478,7 +496,7 @@
478	496
479	497	&.org-name {
480	498	max-width: 140px;
481		- font-size: 13px;
	499	+ font-size: 14px;
482	500	color: #00bcd4;
483	501	}
484	502
...	...	@@ -595,9 +613,21 @@
595	613
596	614	.org-li {
597	615	margin-top: 3px;
	616	+ margin-bottom: 8px;
598	617	}
599	618
600		- .project-list, .org-list {
	619	+ .project-list {
	620	+ padding: 1px 0;
	621	+
	622	+ &:hover {
	623	+ cursor: pointer;
	624	+ background-color: rgba(255, 255, 255, 0.15);
	625	+ }
	626	+ }
	627	+
	628	+ .org-list {
	629	+ padding: 1px 0;
	630	+
601	631	&:hover {
602	632	cursor: pointer;
603	633	background-color: rgba(255, 255, 255, 0.15);

...	...	@@ -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

...	...	@@ -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;

Delete comment