diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-04 15:27:46 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-04 15:27:46 +0200 |
| commit | d831afc792f2c3e5f97724ecf686262039066237 (patch) | |
| tree | e7f59db4bbf008e5eef36906a40a762447ef3533 /core | |
| parent | 26bf64631d7335093a8e9780e97e8187e76bb14f (diff) | |
| download | nextcloud-server-d831afc792f2c3e5f97724ecf686262039066237.tar.gz nextcloud-server-d831afc792f2c3e5f97724ecf686262039066237.zip | |
move 'add apps' entry into normal navigation instead of a new line
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 11 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 11 |
2 files changed, 5 insertions, 17 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index cc12128abe4..4deabebaa76 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -720,7 +720,6 @@ label.infield { #navigation { position: fixed; top: 0; - bottom: 0; left: 0; width: 80px; margin-top:45px; @@ -780,21 +779,11 @@ label.infield { } /* Apps management as sticky footer, less obtrusive in the list */ -#navigation .wrapper { - min-height: 100%; - margin: 0 auto -82px 0; -} -#apps-management { - height: 72px; -} #apps-management { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter: alpha(opacity=60); opacity: .6; } -#apps-management .icon { - padding-bottom: 0; -} diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 059491abac2..5ecb3d2ed5e 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -93,7 +93,7 @@ <nav><div id="navigation"> <div id="apps" class="svg"> - <ul class="wrapper"><!-- for sticky footer of apps management --> + <ul> <?php foreach($_['navigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>"> <a href="<?php print_unescaped($entry['href']); ?>" title="" @@ -106,12 +106,10 @@ </a> </li> <?php endforeach; ?> - </ul> - <!-- show "More apps" link to app administration directly in app navigation, as sticky footer --> + <!-- show "More apps" link to app administration directly in app navigation, as last entry --> <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> - <ul id="apps-management"> - <li> + <li id="apps-management"> <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title="" <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> <img class="icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/> @@ -120,8 +118,9 @@ </span> </a> </li> - </ul> <?php endif; ?> + + </ul> </div> </div></nav> |