diff options
| author | Robin Appelman <robin@icewind.nl> | 2016-11-15 18:10:28 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-11-21 11:29:58 +0100 |
| commit | f7a4db5040be1682efb5ffb48273a62fc599e1b7 (patch) | |
| tree | a09672c402d576a5c89ea61e85dddd27e60f62a3 | |
| parent | 8f33d9d1c07c164b18be9d36e9e9f79b5bdfa8be (diff) | |
| download | nextcloud-server-f7a4db5040be1682efb5ffb48273a62fc599e1b7.tar.gz nextcloud-server-f7a4db5040be1682efb5ffb48273a62fc599e1b7.zip | |
fix avatar cropper
| -rw-r--r-- | settings/css/settings.css | 10 | ||||
| -rw-r--r-- | settings/templates/personal.php | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 055c11b635c..f73386067a2 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -26,7 +26,7 @@ input#openid, input#webdav { width:20em; } .jcrop-holder { z-index: 500; } -#avatarform #cropper { +#cropper { float: left; z-index: 500; /* float cropper above settings page to prevent unexpected flowing from dynamically sized element */ @@ -38,7 +38,7 @@ input#openid, input#webdav { width:20em; } width: 100%; height: calc(100% - 45px); } -#avatar #cropper .inner-container { +#cropper .inner-container { z-index: 2001; /* above the top bar if needed */ position: absolute; top: 50%; @@ -51,13 +51,13 @@ input#openid, input#webdav { width:20em; } padding: 15px; } -#avatar #cropper .inner-container .jcrop-holder { +#cropper .inner-container .jcrop-holder { box-shadow: 0 0 7px #888; } -#avatar #cropper .inner-container .button { +#cropper .inner-container .button { margin-top: 15px; } -#avatar #cropper .inner-container .primary { +#cropper .inner-container .primary { float: right; } diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 01f114d9e95..cd3093a75ed 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -55,8 +55,10 @@ </div> <div id="cropper" class="hidden"> - <div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div> - <div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile picture')); ?></div> + <div class="inner-container"> + <div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div> + <div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile picture')); ?></div> + </div> </div> <input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>"> </form> |