Commit @ebb2a7062749f3da9640546cdf7b15669b0f88f1

Hyeonjae Park 2019-01-08

Merge branch 'feature/sidebar-button' into next

Reviewed-by: Suwon Chae

@ebb2a7062749f3da9640546cdf7b15669b0f88f1

0ada41b

ebb2a70

app/assets/stylesheets/less/_page.less

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

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


         padding: 6px 2px;
     }
 
+    .yobicon-arrow-left {
+        padding: 6px 2px;
+    }
+
     &:hover {
         cursor: pointer;
         color: white;

0ada41b

ebb2a70

app/views/layout.scala.html

--- app/views/layout.scala.html

+++ app/views/layout.scala.html


                     window.location.href = "@routes.Application.index?path=" + window.location.pathname;
                 } else {
                     window.parent.$(".sidebar").toggle();
+                    var btn = $("div.pin > i.yobicon-arrow-right").removeClass("yobicon-arrow-right").addClass("yobicon-arrow-left");
+                    if (btn.length < 1) {
+                        $("div.pin > i.yobicon-arrow-left").removeClass("yobicon-arrow-left").addClass("yobicon-arrow-right");
+                    }
                     if(window.parent.$(".sidebar").text().trim().length < 1) {
                         window.parent.location.reload();
                     }
                 }
             });
-        })
 
+            if ($("div#sidebar.sidebar", window.parent.document).css("display") === "block") {
+                $("div.pin > i.yobicon-arrow-right").removeClass("yobicon-arrow-right").addClass("yobicon-arrow-left");
+            }
+        });
     </script>
 
     @if(Application.SEND_YONA_USAGE){

0ada41b

ebb2a70

public/javascripts/common/yona.Usermenu.js

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

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


             }
         });
 
-        $("#sidebar-open-btn").on("click", function (event) {
-            event.stopPropagation();
-            if( $sidebar.width() !== 0){
-                closeSidebar($sidebar);
-            } else {
-                openSidebar($sidebar);
-                updateStar();
-            }
-        });
-
         function closeSidebar($sidebar) {
             $sidebar.width("0").css("border", "none");
             $(".main-stream").removeClass("span8").addClass("span12");
         }
 
-        function openSidebar($sidebar){
+        function openSidebar($sidebar) {
             // 720px is a criteria to distinguish small devices
             if (viewSize > PIXEL_CRITERIA_FOR_SMALL_DEVICE) {
                 $sidebar.width(SIDE_BAR_DEFAULT_WIDTH).css("border", "1px solid #ccc");

0ada41b

ebb2a70

public/stylesheets/yobicon/style.css

--- public/stylesheets/yobicon/style.css

+++ public/stylesheets/yobicon/style.css


     content: "\e02f";
 }
 .yobicon-arrow-left:before {
-    content: "\e030";
+    content: "\e031";
 }
 .yobicon-arrow-right:before {
-    content: "\e031";
+    content: "\e030";
 }
 .yobicon-arrow-up:before {
     content: "\e032";

Add a comment

Open 0
Closed 0

List

...	...	@@ -133,6 +133,10 @@
133	133	padding: 6px 2px;
134	134	}
135	135
	136	+ .yobicon-arrow-left {
	137	+ padding: 6px 2px;
	138	+ }
	139	+
136	140	&:hover {
137	141	cursor: pointer;
138	142	color: white;

...	...	@@ -100,13 +100,20 @@
100	100	window.location.href = "@routes.Application.index?path=" + window.location.pathname;
101	101	} else {
102	102	window.parent.$(".sidebar").toggle();
	103	+ var btn = $("div.pin > i.yobicon-arrow-right").removeClass("yobicon-arrow-right").addClass("yobicon-arrow-left");
	104	+ if (btn.length < 1) {
	105	+ $("div.pin > i.yobicon-arrow-left").removeClass("yobicon-arrow-left").addClass("yobicon-arrow-right");
	106	+ }
103	107	if(window.parent.$(".sidebar").text().trim().length < 1) {
104	108	window.parent.location.reload();
105	109	}
106	110	}
107	111	});
108		- })
109	112
	113	+ if ($("div#sidebar.sidebar", window.parent.document).css("display") === "block") {
	114	+ $("div.pin > i.yobicon-arrow-right").removeClass("yobicon-arrow-right").addClass("yobicon-arrow-left");
	115	+ }
	116	+ });
110	117	</script>
111	118
112	119	@if(Application.SEND_YONA_USAGE){

...	...	@@ -180,10 +180,10 @@
180	180	content: "\e02f";
181	181	}
182	182	.yobicon-arrow-left:before {
183		- content: "\e030";
	183	+ content: "\e031";
184	184	}
185	185	.yobicon-arrow-right:before {
186		- content: "\e031";
	186	+ content: "\e030";
187	187	}
188	188	.yobicon-arrow-up:before {
189	189	content: "\e032";

...	...	@@ -28,22 +28,12 @@
28	28	}
29	29	});
30	30
31		- $("#sidebar-open-btn").on("click", function (event) {
32		- event.stopPropagation();
33		- if( $sidebar.width() !== 0){
34		- closeSidebar($sidebar);
35		- } else {
36		- openSidebar($sidebar);
37		- updateStar();
38		- }
39		- });
40		-
41	31	function closeSidebar($sidebar) {
42	32	$sidebar.width("0").css("border", "none");
43	33	$(".main-stream").removeClass("span8").addClass("span12");
44	34	}
45	35
46		- function openSidebar($sidebar){
	36	+ function openSidebar($sidebar) {
47	37	// 720px is a criteria to distinguish small devices
48	38	if (viewSize > PIXEL_CRITERIA_FOR_SMALL_DEVICE) {
49	39	$sidebar.width(SIDE_BAR_DEFAULT_WIDTH).css("border", "1px solid #ccc");

Delete comment