From e53e585e91d39addc95c660d9780adc766a6ebec Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 18 Nov 2016 14:27:34 +0100
Subject: [PATCH] put explanatory text directly in popup

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 core/css/apps.css                  |  6 ++++--
 core/css/header.css                |  8 ++++----
 settings/css/settings.css          | 20 ++++++++++++++------
 settings/js/federationscopemenu.js |  6 +++---
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/core/css/apps.css b/core/css/apps.css
index ee640d54641..bef5c7c4937 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -333,7 +333,8 @@
 	opacity: .5 !important;
 }
 .bubble .action:hover,
-.bubble .action:focus {
+.bubble .action:focus,
+.bubble .action.active {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
 	filter: alpha(opacity=100) !important;
 	opacity: 1 !important;
@@ -646,7 +647,8 @@ em {
 }
 
 .popovermenu .menuitem:hover,
-.popovermenu .menuitem:focus {
+.popovermenu .menuitem:focus,
+.popovermenu .menuitem.active {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 	opacity: 1;
diff --git a/core/css/header.css b/core/css/header.css
index efdd3be7ceb..19ecf77bcd3 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -227,8 +227,8 @@
 	#apps-management a:hover span,
 	#apps-management a:focus span,
 	#apps-management a.active span {
-		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)";
-		opacity: .75;
+		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+		opacity: 1;
 	}
 
 #navigation .app-icon {
@@ -372,8 +372,8 @@
 	#expanddiv a:focus,
 	#expanddiv a:active,
 	#expanddiv a.active {
-		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)";
-		opacity: .75;
+		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+		opacity: 1;
 	}
 
 /* do not show display name when profile picture is present */
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5ed97a61a25..74e19a22011 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -90,9 +90,11 @@ input#openid, input#webdav { width:20em; }
 #personal-settings-container > div h2 span[class^="icon-"],
 #personal-settings-avatar-container h2 span[class^="icon-"] {
 	display: inline-block;
-	margin-left: 5px;
-	background-size: 110%;
-	opacity: 0.3;
+	padding: 8px;
+	margin-left: -5px;
+	margin-bottom: -8px;
+	background-size: 22px;
+	opacity: .3;
 	cursor: pointer;
 }
 .personal-settings-setting-box input[type="text"],
@@ -112,10 +114,16 @@ input#openid, input#webdav { width:20em; }
 .federationScopeMenu.bubble::after {
 	right: 50%;
 	transform: translate(50%, 0);
+	margin-right: -8px;
+}
+.federationScopeMenu.popovermenu a.menuitem,
+.federationScopeMenu.popovermenu label.menuitem,
+.federationScopeMenu.popovermenu .menuitem {
+	font-size: 12.8px;
+	line-height: 1.6em;
 }
-.federationScopeMenu.popovermenu {
-	font-weight: 100;
-	font-size: medium;
+.federationScopeMenu.popovermenu .menuitem .menuitem-text-detail {
+	opacity: .75;
 }
 
 #lostpassword,
diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js
index e129f69fe9e..a5da04df918 100644
--- a/settings/js/federationscopemenu.js
+++ b/settings/js/federationscopemenu.js
@@ -16,7 +16,7 @@
 		'<ul>' +
 		'{{#each items}}' +
 		'<li>' +
-		'<a href="#" class="menuitem action action-{{name}} permanent" data-action="{{name}}" title="{{tooltip}}">' +
+		'<a href="#" class="menuitem action action-{{name}} permanent {{#if active}}active{{/if}}" data-action="{{name}}">' +
 			'{{#if icon}}<img class="icon" src="{{icon}}"/>' +
 			'{{else}}'+
 				'{{#if iconClass}}' +
@@ -25,7 +25,8 @@
 				'<span class="no-icon"></span>' +
 				'{{/if}}' +
 			'{{/if}}' +
-			'<span>{{displayName}}</span></a>' +
+			'<p><strong class="menuitem-text">{{displayName}}</strong><br>' +
+			'<span class="menuitem-text-detail">{{tooltip}}</span></p></a>' +
 		'</li>' +
 		'{{/each}}' +
 		'</ul>';
@@ -134,4 +135,3 @@
 	OC.Settings.FederationScopeMenu = FederationScopeMenu;
 
 })();
-
-- 
2.39.5