diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2018-05-11 16:57:32 +0300 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2018-05-11 16:57:32 +0300 |
| commit | 84ab102146f4a9443ef1b6382f049eac99b85c6b (patch) | |
| tree | 84cd381ab267f0ccdea30766eb888be0d7749b93 | |
| parent | 850e2256f3dee5f94b407ea6b8d85fb84d170eb5 (diff) | |
fix undo for url-typed inputs
and minor adjustments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| -rw-r--r-- | apps/theming/css/settings-admin.scss | 6 | ||||
| -rw-r--r-- | apps/theming/js/settings-admin.js | 3 | ||||
| -rw-r--r-- | apps/theming/templates/settings-admin.php | 4 | ||||
| -rw-r--r-- | core/css/guest.css | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss index 00d1cb96fc6..7753540ccd2 100644 --- a/apps/theming/css/settings-admin.scss +++ b/apps/theming/css/settings-admin.scss @@ -46,7 +46,11 @@ input[type='text']:hover + .theme-undo, input[type='text'] + .theme-undo:hover, input[type='text']:focus + .theme-undo, - input[type='text']:active + .theme-undo { + input[type='text']:active + .theme-undo, + input[type='url']:hover + .theme-undo, + input[type='url'] + .theme-undo:hover, + input[type='url']:focus + .theme-undo, + input[type='url']:active + .theme-undo{ visibility: visible; } diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index 028d08c151a..76d9fb965ca 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -83,7 +83,8 @@ function hideUndoButton(setting, value) { url: 'https://nextcloud.com', color: '#0082c9', logoMime: '', - backgroundMime: '' + backgroundMime: '', + imprintUrl: '' }; if (value === themingDefaults[setting] || value === '') { diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php index 9fccd2f1e0e..7df92c335c2 100644 --- a/apps/theming/templates/settings-admin.php +++ b/apps/theming/templates/settings-admin.php @@ -48,7 +48,7 @@ style('theming', 'settings-admin'); <div> <label> <span><?php p($l->t('Web address')) ?></span> - <input id="theming-url" type="url" placeholder="<?php p($l->t('Web address https://…')); ?>" value="<?php p($_['url']) ?>" maxlength="500" /> + <input id="theming-url" type="url" placeholder="<?php p($l->t('https://…')); ?>" value="<?php p($_['url']) ?>" maxlength="500" /> <div data-setting="url" data-toggle="tooltip" data-original-title="<?php p($l->t('Reset to default')); ?>" class="theme-undo icon icon-history"></div> </label> </div> @@ -97,7 +97,7 @@ style('theming', 'settings-admin'); <div> <label> <span><?php p($l->t('Legal notice address')) ?></span> - <input id="theming-imprintUrl" type="url" placeholder="<?php p($l->t('Legal notice address https://…')); ?>" value="<?php p($_['imprintUrl']) ?>" maxlength="500" /> + <input id="theming-imprintUrl" type="url" placeholder="<?php p($l->t('https://…')); ?>" value="<?php p($_['imprintUrl']) ?>" maxlength="500" /> <div data-setting="imprintUrl" data-toggle="tooltip" data-original-title="<?php p($l->t('Reset to default')); ?>" class="theme-undo icon icon-history"></div> </label> </div> diff --git a/core/css/guest.css b/core/css/guest.css index 04d19bccf08..88341fb903a 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -746,7 +746,6 @@ footer .info a { a.legal { font-size: smaller; - text-decoration: underline; } /* for low-res screens, use Regular font-weight instead of Light */ |