fix avatar cropper

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 055c11b635c0a7f0f11bfc5cbd8f0f08f6cc2670..f73386067a26f5d06653add777181d9a95180c8a 100644 (file)
--- 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 01f114d9e956b60e4e6751efa5277c88880afa38..cd3093a75edbbe033252b83a8665b26bdfdd8bda 100644 (file)
--- 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>