diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-02 08:03:51 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-25 21:04:45 +0200 |
| commit | 252548c62cf099e5186ffc323e3cf9494fae3768 (patch) | |
| tree | 9336f2a84a7059e98385e13080485d43fe46f461 /core | |
| parent | a58d270684110334aab1b296b69e98def6cc6558 (diff) | |
| download | nextcloud-server-252548c62cf099e5186ffc323e3cf9494fae3768.tar.gz nextcloud-server-252548c62cf099e5186ffc323e3cf9494fae3768.zip | |
Improve styling & enable avatar-upload at personal page
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 5 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 367f3f7ca41..792ccb08329 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -40,6 +40,11 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari .header-right { float:right; vertical-align:middle; padding:0.5em; } .header-right > * { vertical-align:middle; } +header .avatar { + float:right; + margin-top: 6px; + margin-right: 6px; +} /* INPUTS */ input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 038264bd064..0ab6a4dc08b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -45,9 +45,11 @@ <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> + + <?php if (isset($_['avatar'])) { print_unescaped($_['avatar']); } ?> + <ul id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> - <?php if (isset($_['avatar'])) { print_unescaped($_['avatar']); } ?> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /> </span> |