Commit @f5b794411e43ec969e0216b395d14784a5df71a6

[Notice] Announcing the End of Demo Server [Read me]

doortts 2018-12-11

sidebar: Modify margin and add selected ux

@f5b794411e43ec969e0216b395d14784a5df71a6

0873901

f5b7944

app/assets/stylesheets/less/_page.less

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

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


 
         .active {
             a {
-                color: white;
+                color: #f36c22;
                 background-color: black;
                 border: none;
             }

 }
 
 .pin {
-    position: fixed;
+    position: absolute;
     display: inline-block;
     left: -2px;
     top: 9px;
     border: 1px solid #666;
+
+    .yobicon-arrow-right {
+        padding: 4px 2px;
+    }
 }
 
 .gnb-inner {

0873901

f5b7944

app/assets/stylesheets/less/_usermenu.less

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

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


   .user-li {
     cursor: pointer;
 
-    &:hover {
-      background-color: rgba(255, 255, 255, 0.15);
-    }
-
     .popover {
       word-wrap: break-word;
       min-width: 200px;

     width:0;
     bottom:1px;
     position:absolute;
-    background: @orange;
+    background: #1976d2;
     transition:0.2s ease all;
   }
   .bar:before {

   }
 
   .starred {
-    color: #e91e63;
+    color: rgba(255, 255, 255, 0.85);
   }
 
   .star-project, .star-org {
     width: 29px;
     min-height: 26px;
     flex-shrink: 0;
-    color: #eee;
 
     &:hover {
       color: #e91e63;

   }
 
   .selected {
-    border-radius: 5px;
-    background-color: #9C27B0;
-    color: #fafafa;
-    padding: 3px 7px;
-    margin-right: 5px;
-    line-height: 25px;
-    z-index: 999;
+    background-color: rgba(255, 255, 255, 0.15);
   }
 
   .additional-help{

   }
 
   .site-logo {
-    width: 45px;
+    width: 26px;
     text-align: center;
     margin-left: 2px;
-    margin-right: -2px;
     padding-top: 3px;
     overflow: hidden;
     flex-shrink: 0;
+
     img {
-      width: 24px;
+      width: 16px;
       border-radius: 3px;
-      margin-right: 3px;
+      margin-right: 0;
       height: auto;
+      vertical-align: text-top;
     }
   }
 

0873901

f5b7944

public/javascripts/common/yona.Usermenu.js

--- public/javascripts/common/yona.Usermenu.js

+++ public/javascripts/common/yona.Usermenu.js


                         that.find('i').addClass("starred");
                     } else {
                         that.find('i').removeClass("starred");
-                        removeIfNotFavoriteProject(that);
                     }
                 })
                 .fail(function (data) {

                         that.find('i').addClass("starred");
                     } else {
                         that.find('i').removeClass("starred");
-                        removeIfNotFavoriteProject(that);
                     }
                     $yobi.notify(Messages(data.message), 3000);
                 })

                 });
 
         });
-
-
-        function removeIfNotFavoriteProject(that) {
-            var $recentlyVisited = $('.user-li');
-            var lastFavoriteItemIndex = $recentlyVisited.index($(".favored"));
-            var currentItemIndex = $recentlyVisited.index(that.parent(".project-list").parent());
-            if (lastFavoriteItemIndex < currentItemIndex) {
-                that.parent(".project-list").remove();
-            }
-        }
-
-        function removeIfNotFavoriteIssue(that) {
-            var $recentlyVisited = $('.user-li');
-            var lastFavoriteItemIndex = $recentlyVisited.index($(".favored"));
-            var currentItemIndex = $recentlyVisited.index(that.parent(".issue-list").parent());
-            if (lastFavoriteItemIndex < currentItemIndex) {
-                that.parent(".issue-list").remove();
-            }
-        }
 
         $(".user-ul > .user-li, .project-ul > .user-li").on("click", function (e) {
             e.preventDefault();

             } else {
                 window.open(location, 'mainFrame');
             }
+
+            $(".user-ul > .user-li, .project-ul > .user-li").removeClass("selected");
+            $(this).addClass("selected");
         });
 
       $(".org-list > .star-org").on("click", function toggleOrgFavorite(e) {

Add a comment

Open 0
Closed 0

List

...	...	@@ -38,7 +38,7 @@
38	38
39	39	.active {
40	40	a {
41		- color: white;
	41	+ color: #f36c22;
42	42	background-color: black;
43	43	border: none;
44	44	}
...	...	@@ -122,11 +122,15 @@
122	122	}
123	123
124	124	.pin {
125		- position: fixed;
	125	+ position: absolute;
126	126	display: inline-block;
127	127	left: -2px;
128	128	top: 9px;
129	129	border: 1px solid #666;
	130	+
	131	+ .yobicon-arrow-right {
	132	+ padding: 4px 2px;
	133	+ }
130	134	}
131	135
132	136	.gnb-inner {

...	...	@@ -91,10 +91,6 @@
91	91	.user-li {
92	92	cursor: pointer;
93	93
94		- &:hover {
95		- background-color: rgba(255, 255, 255, 0.15);
96		- }
97		-
98	94	.popover {
99	95	word-wrap: break-word;
100	96	min-width: 200px;
...	...	@@ -211,7 +207,7 @@
211	207	width:0;
212	208	bottom:1px;
213	209	position:absolute;
214		- background: @orange;
	210	+ background: #1976d2;
215	211	transition:0.2s ease all;
216	212	}
217	213	.bar:before {
...	...	@@ -323,14 +319,13 @@
323	319	}
324	320
325	321	.starred {
326		- color: #e91e63;
	322	+ color: rgba(255, 255, 255, 0.85);
327	323	}
328	324
329	325	.star-project, .star-org {
330	326	width: 29px;
331	327	min-height: 26px;
332	328	flex-shrink: 0;
333		- color: #eee;
334	329
335	330	&:hover {
336	331	color: #e91e63;
...	...	@@ -368,13 +363,7 @@
368	363	}
369	364
370	365	.selected {
371		- border-radius: 5px;
372		- background-color: #9C27B0;
373		- color: #fafafa;
374		- padding: 3px 7px;
375		- margin-right: 5px;
376		- line-height: 25px;
377		- z-index: 999;
	366	+ background-color: rgba(255, 255, 255, 0.15);
378	367	}
379	368
380	369	.additional-help{
...	...	@@ -403,18 +392,19 @@
403	392	}
404	393
405	394	.site-logo {
406		- width: 45px;
	395	+ width: 26px;
407	396	text-align: center;
408	397	margin-left: 2px;
409		- margin-right: -2px;
410	398	padding-top: 3px;
411	399	overflow: hidden;
412	400	flex-shrink: 0;
	401	+
413	402	img {
414		- width: 24px;
	403	+ width: 16px;
415	404	border-radius: 3px;
416		- margin-right: 3px;
	405	+ margin-right: 0;
417	406	height: auto;
	407	+ vertical-align: text-top;
418	408	}
419	409	}
420	410

...	...	@@ -115,7 +115,6 @@
115	115	that.find('i').addClass("starred");
116	116	} else {
117	117	that.find('i').removeClass("starred");
118		- removeIfNotFavoriteProject(that);
119	118	}
120	119	})
121	120	.fail(function (data) {
...	...	@@ -132,7 +131,6 @@
132	131	that.find('i').addClass("starred");
133	132	} else {
134	133	that.find('i').removeClass("starred");
135		- removeIfNotFavoriteProject(that);
136	134	}
137	135	$yobi.notify(Messages(data.message), 3000);
138	136	})
...	...	@@ -141,25 +139,6 @@
141	139	});
142	140
143	141	});
144		-
145		-
146		- function removeIfNotFavoriteProject(that) {
147		- var $recentlyVisited = $('.user-li');
148		- var lastFavoriteItemIndex = $recentlyVisited.index($(".favored"));
149		- var currentItemIndex = $recentlyVisited.index(that.parent(".project-list").parent());
150		- if (lastFavoriteItemIndex < currentItemIndex) {
151		- that.parent(".project-list").remove();
152		- }
153		- }
154		-
155		- function removeIfNotFavoriteIssue(that) {
156		- var $recentlyVisited = $('.user-li');
157		- var lastFavoriteItemIndex = $recentlyVisited.index($(".favored"));
158		- var currentItemIndex = $recentlyVisited.index(that.parent(".issue-list").parent());
159		- if (lastFavoriteItemIndex < currentItemIndex) {
160		- that.parent(".issue-list").remove();
161		- }
162		- }
163	142
164	143	$(".user-ul > .user-li, .project-ul > .user-li").on("click", function (e) {
165	144	e.preventDefault();
...	...	@@ -170,6 +149,9 @@
170	149	} else {
171	150	window.open(location, 'mainFrame');
172	151	}
	152	+
	153	+ $(".user-ul > .user-li, .project-ul > .user-li").removeClass("selected");
	154	+ $(this).addClass("selected");
173	155	});
174	156
175	157	$(".org-list > .star-org").on("click", function toggleOrgFavorite(e) {

Delete comment