summaryrefslogtreecommitdiffstats
path: root/settings/css
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2017-09-27 15:19:34 +0200
committerGitHub <noreply@github.com>2017-09-27 15:19:34 +0200
commita90b046a17356f806fe17c5bbdf121985d38a9ad (patch)
tree3e91e3f040974cc8797e2081e7c4228336d0702d /settings/css
parent90d7e8f6f4efcdf158136683e554e1c94509beb2 (diff)
parent291e3d331f0b5665892c5bfdcb81c4d3924c51ae (diff)
downloadnextcloud-server-a90b046a17356f806fe17c5bbdf121985d38a9ad.tar.gz
nextcloud-server-a90b046a17356f806fe17c5bbdf121985d38a9ad.zip
Merge pull request #6666 from nextcloud/federation-menu-triangle
Fix style of federation scope menu triangles, simplify CSS
Diffstat (limited to 'settings/css')
-rw-r--r--settings/css/settings.scss23
1 files changed, 9 insertions, 14 deletions
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index ab8d69b3a42..509d867baf9 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"] {
@@ -224,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);