diff options
| -rw-r--r-- | core/css/header.css | 12 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 16 | ||||
| -rw-r--r-- | settings/templates/apps.php | 4 |
3 files changed, 23 insertions, 9 deletions
diff --git a/core/css/header.css b/core/css/header.css index 5a8d0920438..6fd30f657b7 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -56,6 +56,17 @@ height: 45px; /* header height */ -moz-box-sizing: border-box; box-sizing: border-box; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + opacity: 1; +} +#owncloud:focus { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)"; + opacity: .75; +} +#owncloud:hover, +#owncloud:active { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + opacity: 1; } #header .logo { @@ -169,6 +180,7 @@ border-width: 10px; margin-left: -10px; } +/* position of dropdown arrow */ #navigation:after { left: 47%; } diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 138545f2ccc..87342aca570 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -37,7 +37,7 @@ </div> <header role="banner"><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" - title="" id="owncloud" tabindex="-1"> + title="" id="owncloud" tabindex="1"> <div class="logo-icon svg"> <h1 class="hidden-visually"> <?php p($theme->getName()); ?> @@ -60,9 +60,9 @@ <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div id="settings" class="svg"> - <div id="expand" tabindex="4" role="link"> + <div id="expand" tabindex="6" role="link"> <?php if ($_['enableAvatars']): ?> - <div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown"'); } else { print_unescaped('" style="display: none"'); } ?>> + <div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>"> <?php if ($_['userAvatarSet']): ?> <img src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32]));?>?requesttoken=<?php p(urlencode($_['requesttoken'])); ?>" alt=""> @@ -99,7 +99,7 @@ </label> <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {p($_POST['query']);};?>" - autocomplete="off" tabindex="3"> + autocomplete="off" tabindex="5"> </form> </div></header> @@ -108,7 +108,7 @@ <ul> <?php foreach($_['navigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>"> - <a href="<?php print_unescaped($entry['href']); ?>" title="" + <a href="<?php print_unescaped($entry['href']); ?>" title="" tabindex="3" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> <img class="app-icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>"> <div class="icon-loading-dark" style="display:none;"></div> @@ -118,12 +118,12 @@ </a> </li> <?php endforeach; ?> - <?php + <?php /* show "More apps" link to app administration directly in app navigation, as last entry */ - if(OC_User::isAdminUser(OC_User::getUser())): + if(OC_User::isAdminUser(OC_User::getUser())): ?> <li id="apps-management"> - <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps')); ?>" title="" + <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps')); ?>" title="" tabindex="4" <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> <img class="app-icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"> <div class="icon-loading-dark" style="display:none;"></div> diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 1d059d4f77f..a2fe5d9b63a 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -1,6 +1,8 @@ <script id="categories-template" type="text/x-handlebars-template"> {{#each this}} - <li id="app-category-{{id}}" data-category-id="{{id}}"><a>{{displayName}}</a></li> + <li id="app-category-{{id}}" data-category-id="{{id}}" tabindex="0"> + <a>{{displayName}}</a> + </li> {{/each}} <?php if(OC_Config::getValue('appstoreenabled', true) === true): ?> |