summaryrefslogtreecommitdiffstats
path: root/settings/css/settings.scss
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-10-04 17:01:03 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-10-14 10:37:17 +0200
commit4ca88471b0ff08a92d2091b55bab5711ff00935c (patch)
tree8fc79718082a56f68f6500c09334b6760e4cf157 /settings/css/settings.scss
parent0ce3636fbaca4695f22f30fb6794e7dc36af5190 (diff)
downloadnextcloud-server-4ca88471b0ff08a92d2091b55bab5711ff00935c.tar.gz
nextcloud-server-4ca88471b0ff08a92d2091b55bab5711ff00935c.zip
Fix popover position and avatar loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/css/settings.scss')
-rw-r--r--settings/css/settings.scss17
1 files changed, 12 insertions, 5 deletions
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 221dad33ac3..a14f0ecef06 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -35,12 +35,13 @@ input {
}
#avatarform {
- > h2 {
- position: relative;
- }
.avatardiv {
margin: 10px auto;
}
+ .federationScopeMenu {
+ /* popover magic fix */
+ margin-right: calc(-50% - 7px);
+ }
.warning {
width: 100%;
}
@@ -117,11 +118,11 @@ input {
}
.icon-federation-menu {
- float: right;
padding-left: 16px;
background-size: 16px;
background-position: left 8px;
opacity: .3;
+ margin-left: 10px;
cursor: pointer;
.icon-triangle-s {
@@ -163,12 +164,18 @@ input {
&:after {
clear: both;
}
- > div {
+ &:not(#personal-settings-avatar-container) > div {
float: left;
width: 300px;
+ }
+ > div {
h2 {
position: relative;
margin-bottom: 5px;
+ display: inline-flex;
+ flex-wrap: nowrap;
+ justify-content: space-between;
+ width: 100%;
}
> form span {
&[class^="icon-checkmark"], &[class^="icon-error"] {