diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-03 21:44:32 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-03 21:44:32 +0200 |
| commit | b1d20e04705f97d623d75498014d989ebe1800f8 (patch) | |
| tree | 40c7004f2240ef0b12e75c3441e43d7eb2c457af | |
| parent | 6d42f51d0cf389f746f327bd20374f151f1057cb (diff) | |
| download | nextcloud-server-b1d20e04705f97d623d75498014d989ebe1800f8.tar.gz nextcloud-server-b1d20e04705f97d623d75498014d989ebe1800f8.zip | |
Have the header avatar to the left of the user name
| -rw-r--r-- | core/css/styles.css | 20 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 7 |
2 files changed, 18 insertions, 9 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 43eaea0bcd6..dcdeda8a9c9 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -41,9 +41,9 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari .header-right > * { vertical-align:middle; } #header .avatardiv { - float:right; - margin-top: 6px; - margin-right: 6px; + text-shadow: none; + float: left; + display: inline-block; } /* INPUTS */ @@ -588,8 +588,18 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } /* USER MENU */ -#settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; } -#expand { padding:15px; cursor:pointer; font-weight:bold; } +#settings { + float: right; + margin-top: 7px; + margin-left: 10px; + color: #bbb; + text-shadow: 0 -1px 0 #000; +} +#expand { + padding: 15px 15px 15px 5px; + cursor: pointer; + font-weight: bold; +} #expand:hover, #expand:focus, #expand:active { color:#fff; } #expand img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; margin-bottom:-2px; } #expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 3a46680c3fc..e95d1b1d97d 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -46,14 +46,13 @@ 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 (\OC_Config::getValue('enable_avatars', true) === true): ?> - <div class="avatardiv"></div> - <?php endif; ?> - <ul id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> <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')); ?>" /> + <?php if (\OC_Config::getValue('enable_avatars', true) === true): ?> + <div class="avatardiv"></div> + <?php endif; ?> </span> <div id="expanddiv"> <?php foreach($_['settingsnavigation'] as $entry):?> |