Merge branch 'master' into absolute_fluoride

2 files changed, 18 insertions, 8 deletions

diff --git a/static/fluoride.js b/static/fluoride.js
index c7f3109..279483f 100644
--- a/static/fluoride.js
+++ b/static/fluoride.js
@@ -298,20 +298,24 @@ function setPos(el, cx, cy, mw, mh) {
 }
 
 var imgPrev = null;
+var imgX = 0;
+var imgY = 0;
 function handleImgPreview(a) {
 	a.onmouseenter = function(e) {
 		var mw = document.documentElement.clientWidth;
 		var mh = document.documentElement.clientHeight - 24;
+		imgX = e.clientX;
+		imgY = e.clientY;
 		var img = document.createElement("img");
 		img.id = "img-preview";
 		img.src = e.target.getAttribute("href");
 		img.style["max-width"] = mw + "px";
 		img.style["max-height"] = mh + "px";
+		imgPrev = img;
 		img.onload = function(e2) {
-			setPos(e2.target, e.clientX, e.clientY, mw, mh);
+			setPos(imgPrev, imgX, imgY, mw, mh);
 		}
 		document.body.appendChild(img);
-		imgPrev = img;
 	}
 	a.onmouseleave = function(e) {
 		var img = document.getElementById("img-preview");
@@ -324,7 +328,9 @@ function handleImgPreview(a) {
 			return;
 		var mw = document.documentElement.clientWidth;
 		var mh = document.documentElement.clientHeight - 24;
-		setPos(imgPrev, e.clientX, e.clientY, mw, mh);
+		imgX = e.clientX;
+		imgY = e.clientY;
+		setPos(imgPrev, imgX, imgY, mw, mh);
 	}
 }
 
diff --git a/static/style.css b/static/style.css
index cd7e98c..4e2a196 100644
--- a/static/style.css
+++ b/static/style.css
@@ -517,16 +517,16 @@ img.emoji {
 	margin-top: 6px;
 }
 
-.notification-title-container {
+.page-title-container {
 	margin: 8px 0;
 }
 
-.notification-text {
-	vertical-align: middle;
+.page-refresh {
+	margin-right: 8px;
 }
 
-.notification-refresh {
-	margin-right: 8px;
+.notification-text {
+	vertical-align: middle;
 }
 
 .notification-read {
@@ -575,6 +575,10 @@ kbd {
 	position: fixed;
 }
 
+.quote {
+	color: #789922;
+}
+
 .dark {
 	background-color: #222222;
 	background-image: none;