diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.css | 3 | ||||
| -rw-r--r-- | core/css/styles.css | 4 | ||||
| -rw-r--r-- | core/js/share.js | 6 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 8 |
5 files changed, 16 insertions, 9 deletions
diff --git a/core/css/header.css b/core/css/header.css index 02e47ad0966..2ec82ce844a 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -48,9 +48,6 @@ height: 120px; margin: 0 auto; } -#header .logo h1 { - display: none; -} #header .logo-wide { background-image: url(../img/logo-wide.svg); diff --git a/core/css/styles.css b/core/css/styles.css index 12408c2d76c..3996aade6d4 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -193,8 +193,8 @@ input[type="button"]:hover, input[type="button"]:focus, button:hover, button:focus, .button:hover, .button:focus, select:hover, select:focus, select:active { - background-color:rgba(250,250,250,.9); - color:#333; + background-color: rgba(255, 255, 255, .95); + color: #111; } input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; } #header .button { diff --git a/core/js/share.js b/core/js/share.js index bcb604feaa3..5e5b85fb5a7 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -380,6 +380,7 @@ OC.Share={ } }); + html += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>'; html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with user or group …')+'" />'; html += '<span class="shareWithLoading icon-loading-small hidden"></span>'; html += '<ul id="shareWithList">'; @@ -396,9 +397,11 @@ OC.Share={ defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created', {'days': escapeHTML(oc_appconfig.core.defaultExpireDate)}) + '<br/>'; } + html += '<label for="linkText" class="hidden-visually">'+t('core', 'Link')+'</label>'; html += '<input id="linkText" type="text" readonly="readonly" />'; html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>'; html += '<div id="linkPass">'; + html += '<label for="linkPassText" class="hidden-visually">'+t('core', 'Password')+'</label>'; html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Choose a password for the public link')+'" />'; html += '<span class="icon-loading-small hidden"></span>'; html += '</div>'; @@ -422,6 +425,7 @@ OC.Share={ html += '<div id="expiration">'; html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>'; + html += '<label for="expirationDate" class="hidden-visually">'+t('core', 'Expiration')+'</label>'; html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />'; html += '<em id="defaultExpireMessage">'+defaultExpireMessage+'</em>'; html += '</div>'; @@ -636,7 +640,7 @@ OC.Share={ if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) { html += '<input id="canEdit-'+escapeHTML(shareWith)+'" type="checkbox" name="edit" class="permissions" '+editChecked+' /><label for="canEdit-'+escapeHTML(shareWith)+'">'+t('core', 'can edit')+'</label>'; } - showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" title="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>'; + showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>'; html += '<div class="cruds" style="display:none;">'; if (possiblePermissions & OC.PERMISSION_CREATE) { html += '<input id="canCreate-'+escapeHTML(shareWith)+'" type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'"/><label for="canCreate-'+escapeHTML(shareWith)+'">'+t('core', 'create')+'</label>'; diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 34d7a210841..c799205b7cf 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -32,7 +32,9 @@ <header> <div id="header"> <div class="logo svg"> - <h1><?php p($theme->getName()); ?></h1> + <h1 class="hidden-visually"> + <?php p($theme->getName()); ?> + </h1> </div> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> </div> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 2d601b22933..11e2df71458 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -41,7 +41,11 @@ </div> <header><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"> - <div class="logo-icon svg"></div> + <div class="logo-icon svg"> + <h1 class="hidden-visually"> + <?php p($theme->getName()); ?> + </h1> + </div> </a> <a href="#" class="menutoggle" tabindex="1"> <h1 class="header-appname"> @@ -91,7 +95,7 @@ </div> <form class="searchbox" action="#" method="post"> - <label for="query" class="visually-hidden"> + <label for="searchbox" class="hidden-visually"> <?php p($l->t('Search'));?> </label> <input id="searchbox" class="svg" type="search" name="query" |