Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup

Conflicts:
	mod/dfrn_poll.php

2 files changed, 30 insertions, 0 deletions

diff --git a/view/theme/loozah/photo-menu.jpg b/view/theme/loozah/photo-menu.jpg
new file mode 100644
index 000000000..bd39696a2
--- /dev/null
+++ b/view/theme/loozah/photo-menu.jpg
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 566220711..d6ddb26dd 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -959,6 +959,7 @@ input#dfrn-url {
 .wall-item-content-wrapper {
 	margin-top: 10px;
 	border: 1px solid #CCC;
+	position: relative;
 }
 
 .wall-item-content-wrapper.comment {
@@ -973,6 +974,35 @@ input#dfrn-url {
 	width: 100px;
 	float: left;
 }
+
+.wall-item-photo-menu-button {
+	display: block;
+	position: absolute;
+	background-image: url("photo-menu.jpg");
+	background-position: top left; 
+	background-repeat: no-repeat;
+	margin: 0px; padding: 0px;
+	width: 16px;
+	height: 16px;
+	top: 74px; left:10px;
+	overflow: hidden;
+	text-indent: 40px;
+	display: none;
+}
+.wall-item-photo-menu {
+	width: auto;
+	border: 2px solid #444444;
+	background: #FFFFFF;
+	position: absolute;
+	left: 10px; top: 90px;
+	display: none;
+	z-index: 10000;
+}
+.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.wall-item-photo-menu li a { display: block; padding: 2px; }
+.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
+
+
 .wall-item-arrowphoto-wrapper {
 	margin-top: 40px;
 	margin-right: 20px;