From d4f15185332a679771e2e59a0505954f22f7dea9 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 27 Sep 2017 12:18:52 +0200
Subject: Fix style of federation scope menu triangles, simplify CSS

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 settings/css/settings.scss | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'settings/css')

diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index ab8d69b3a42..c3b1243f87e 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -13,11 +13,6 @@ input {
 	clear: both;
 }
 
-.icon-federation-menu {
-	width: 16px;
-	float: right;
-}
-
 /* icons for sidebar */
 .nav-icon-personal-settings {
 	background-image: url('../img/personal.svg?v=1');
@@ -121,12 +116,19 @@ input {
 	}
 }
 
-#personal-settings-avatar-container h2 span[class^="icon-"] {
+.icon-federation-menu {
+	float: right;
 	padding-left: 16px;
 	background-size: 16px;
 	background-position: left 8px;
 	opacity: .3;
 	cursor: pointer;
+
+	.icon-triangle-s {
+		display: inline-block;
+		vertical-align: middle;
+		cursor: pointer;
+	}
 }
 
 .personal-show-container {
@@ -167,13 +169,6 @@ input {
 		h2 {
 			position: relative;
 			margin-bottom: 5px;
-			span[class^="icon-"] {
-				padding-left: 16px;
-				background-size: 16px;
-				background-position: left 8px;
-				opacity: .3;
-				cursor: pointer;
-			}
 		}
 		> form span {
 			&[class^="icon-checkmark"], &[class^="icon-error"] {
-- 
cgit v1.2.3


From 291e3d331f0b5665892c5bfdcb81c4d3924c51ae Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Wed, 27 Sep 2017 13:34:29 +0200
Subject: No js for popover positionning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 settings/css/settings.scss         |  2 +-
 settings/js/federationscopemenu.js | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'settings/css')

diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index c3b1243f87e..509d867baf9 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -219,7 +219,7 @@ input {
 
 .federationScopeMenu {
 	top: 44px;
-	margin: -5px 5px 0;
+	margin-right: calc(-50% + 30px); /* half - the triangle icon width - borders */
 	&.bubble::after {
 		right: 50%;
 		transform: translate(50%, 0);
diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js
index a9f41831b94..467ca48f62d 100644
--- a/settings/js/federationscopemenu.js
+++ b/settings/js/federationscopemenu.js
@@ -137,16 +137,6 @@
 			this.$el.removeClass('hidden');
 
 			OC.showMenu(null, this.$el);
-
-			//Set the menuwidth
-			var menuWidth = this.$el.width();
-			this.$el.css('width', menuWidth);
-
-			//Calculate menu position
-			var l = offsetIcon.left - offsetHeading.left;
-			l = l - (menuWidth / 2) + ($el.outerWidth()/2);
-			this.$el.css('left', l);
-
 		}
 	});
 
-- 
cgit v1.2.3