From 5c497152980d7d9c597d9c18031f4be2e380cade Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Sat, 16 Nov 2019 13:36:16 +0900
Subject: [PATCH] Around bookmark

---
 app/css/tl.css        |  3 ++-
 app/js/post/status.js |  5 +++++
 app/js/tl/parse.js    | 22 +++++++++++-----------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/css/tl.css b/app/css/tl.css
index b7841626..ed58612d 100644
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -419,7 +419,7 @@ iframe,
 	position: fixed;
 	width: 199vw;
 	height: 100vh;
-	z-index: 9998;
+	z-index: 100;
 }
 .contextMenu {
 	position: fixed;
@@ -447,6 +447,7 @@ iframe,
 .contextMenu .btn-flat {
 	text-transform: none !important;
 	width: 100%;
+	text-align: left;
 }
 
 .gray {
diff --git a/app/js/post/status.js b/app/js/post/status.js
index fa0b45ab..d60e0c57 100644
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@@ -632,6 +632,11 @@ function toggleAction(elem, height) {
 			cont.removeClass('top')
 			cont.addClass('bottom')
 		}
+		if(elem.parents('.cvo').attr('id') == 'toot-this'){
+			console.log($('#toot-this').offset().top, elem.offset().top)
+			left = $('#toot-this').offset().left + elem.offset().left + 10
+			top = $('#toot-this').offset().top - $('#toot-this').height() -height + 25
+		}
 		cont.css('top', top + 'px')
 		cont.css('right', `calc(100vw - ${left}px)`)
 		cont.removeClass('hide')
diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index 35b06b5e..edcf1fa7 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -1070,7 +1070,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="action ${noauth}">
 						<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
 							class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0">
-						<i class="text-darken-3 material-icons">more_vert</i></a>
+						<i class="text-darken-3 material-icons">menu_open</i></a>
 					</div>
 				</div>
 				<div class="contextMenu hide z-depth-4">
@@ -1079,39 +1079,39 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<a onclick="client('${$.strip_tags(via)}')" class="pointer">${lang.lang_parse_clientop}</a>
 					</div>
 					<div>
-					<a onclick="bkm('${toot.id}','${acct_id}','${tlid}')"
+					<button onclick="bkm('${toot.id}','${acct_id}','${tlid}')"
 						class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0">
 						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
 						<span class="bkmStr_${toot.id}">${bkmStr}</span>
-					</a>
+					</button>
 					</div>
 					<div class="${if_mine}">
-						<a onclick="del('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+						<button onclick="del('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
 							<i class="fas fa-trash"></i>${lang.lang_parse_del}
-						</a>
+						</button>
 					</div>
 					<div class="${if_mine}">
-						<a onclick="pin('${
+						<button onclick="pin('${
 							toot.id
 						}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
 							<i class="fas fa-map-pin pin_${toot.id} ${if_pin}"></i>
 							<span class="pinStr_${toot.id}">${pinStr}</span>
-						</a>
+						</button>
 					</div>
 					<div class="${if_mine}">
-						<a onclick="redraft('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+						<button onclick="redraft('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
 							<i class="material-icons">redo</i>${lang.lang_parse_redraft}
-						</a>
+						</button>
 					</div>
 					${trans}
 					<div>
-					<a onclick="postMessage(['openUrl', '${toot.url}'], '*')"
+					<button onclick="postMessage(['openUrl', '${toot.url}'], '*')"
 						class="waves-effect waves-dark btn-flat actct" style="padding:0">
 						<i class="fas text-darken-3 fa-globe"></i>
 						${lang.lang_parse_link}
-					</a>
+					</button>
 					</div>
 				</div>
 			</div>