diff options
| author |  maTh <math-home@web.de>
| 2021-09-11 18:22:26 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-09-11 18:22:26 +0200 |
| commit | 9712e4d888420a348c10157b2d3293848c02fde8 (patch) | |
| tree | b81fe8fcd5d8f768e0a42c7d94643b808dddab14 | |
| parent | 42a9383fe6dc4765ec4267e44913366206162116 (diff) | |
Headline structure improvement (#3830)
* header: h1 deleted - full logo included
* template: config - display
* WIP
* shortcut configs. added fieldset. do not display the border by default
* system.phtml
* subscription: add feed or category
* wip
* wip
* Update bookmarklet.phtml
* Update archiving.phtml
* Update queries.phtml
* Update profile.phtml
* Update manage.phtml
* auth+update
* Update template.rtl.css
* fixed FreshRSS logo (Theme: Mapco)
* Update mapco.rtl.css
* Update _layout.scss
* fixed FreshRSS logo (theme: Dark)
* fix: FreshRSS logo (Theme: BlueLagoon)
* fix: FreshRSS logo (Theme: Ansum)
* fixed: FreshRSS logo (Theme: Alternative Dark)
* fix: FreshRSS logo (Theme: Pafat)
* fix: FreshRSS logo (Theme: Screwdriver)
* fix: FreshRSS logo (theme: Swage)
* Minor lint
* little fix: FreshRSS logo (Theme: Origine)
* Fix: FreshRSS logo (Theme: Origine Compact)
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
43 files changed, 264 insertions, 382 deletions
diff --git a/app/Models/Themes.php b/app/Models/Themes.php index 4236a8b27..61d62cd1b 100644 --- a/app/Models/Themes.php +++ b/app/Models/Themes.php @@ -81,6 +81,7 @@ class FreshRSS_Themes extends Minz_Model { 'configure' => '⚙', 'down' => '▽', 'favorite' => '★', + 'FreshRSS-logo' => '⊚', 'help' => 'ⓘ', 'icon' => '⊚', 'import' => '⤓', diff --git a/app/layout/header.phtml b/app/layout/header.phtml index cf7e4d20e..17e290417 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -14,12 +14,9 @@ if (FreshRSS_Auth::accessNeedsAction()) { <header class="header"> <div class="item title"> - <h1> - <a href="<?= _url('index', 'index') ?>"> - <img class="logo" src="<?= _i('icon', true) ?>" alt="" /> - <?= FreshRSS_Context::$system_conf->title ?> - </a> - </h1> + <a href="<?= _url('index', 'index') ?>"> + <img class="logo" src="<?= _i('FreshRSS-logo', true) ?>" alt="" /> + </a> </div> <div class="item search"> diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml index cf95e21f6..0c7b0a816 100644 --- a/app/views/auth/index.phtml +++ b/app/views/auth/index.phtml @@ -5,9 +5,9 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + <h1><?= _t('gen.menu.authentication') ?></h1> <form method="post" action="<?= _url('auth', 'index') ?>"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('admin.auth.type') ?></legend> <div class="form-group"> <label class="group-name" for="auth_type"><?= _t('admin.auth.type') ?></label> diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml index 9d091abf6..88b980cd4 100644 --- a/app/views/configure/archiving.phtml +++ b/app/views/configure/archiving.phtml @@ -4,11 +4,12 @@ <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + + <h1><?= _t('conf.archiving') ?></h1> + <p class="help"><?= _i('help') ?> <?= _t('conf.archiving.help') ?></p> <form method="post" action="<?= _url('configure', 'archiving') ?>"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('conf.archiving') ?></legend> - <p class="help"><?= _i('help') ?> <?= _t('conf.archiving.help') ?></p> <div class="form-group"> <label class="group-name" for="ttl_default"><?= _t('conf.archiving.ttl') ?></label> @@ -124,7 +125,7 @@ </div> </form> - <legend><?= _t('conf.archiving.maintenance') ?></legend> + <h2><?= _t('conf.archiving.maintenance') ?></h2> <form method="post" action="<?= _url('entry', 'purge') ?>"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index efeb189aa..efc15fdd1 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -4,10 +4,11 @@ <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + + <h1><?= _t('conf.display') ?></h1> <form method="post" action="<?= _url('configure', 'display') ?>"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('conf.display') ?></legend> <div class="form-group"> <label class="group-name" for="language"><?= _t('conf.display.language') ?></label> diff --git a/app/views/configure/integration.phtml b/app/views/configure/integration.phtml index 278265aed..02a0b6f32 100644 --- a/app/views/configure/integration.phtml +++ b/app/views/configure/integration.phtml @@ -5,6 +5,8 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + <h1><?= _t('conf.sharing') ?></h1> + <form method="post" action="<?= _url('configure', 'integration') ?>" data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><div class="stick"> <input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="##label##" placeholder="<?= _t('conf.sharing.share_name') ?>" size="64" /> @@ -22,7 +24,7 @@ <a target="_blank" rel="noreferrer" class="btn" title="<?= _t('conf.sharing.more_information') ?>" href="##help##"><?= _i('help') ?></a> </div></div>' class="draggableList"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('conf.sharing') ?></legend> + <?php foreach (FreshRSS_Context::$user_conf->sharing as $key => $share_options) { $share = FreshRSS_Share::get($share_options['type']); diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml index 6402d63fb..b79f5fe5a 100644 --- a/app/views/configure/queries.phtml +++ b/app/views/configure/queries.phtml @@ -7,7 +7,7 @@ <form method="post" action="<?= _url('configure', 'queries') ?>" class="draggableList"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('conf.query') ?></legend> + <h1><?= _t('conf.query') ?></h1> <?php foreach ($this->queries as $key => $query) { ?> <div class="form-group" id="query-group-<?= $key ?>" draggable="true"> diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml index c73866486..68d878eb0 100644 --- a/app/views/configure/reading.phtml +++ b/app/views/configure/reading.phtml @@ -4,11 +4,12 @@ <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + + <h1><?= _t('conf.reading') ?></h1> <form method="post" action="<?= _url('configure', 'reading') ?>"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('conf.reading') ?></legend> - + <div class="form-group"> <label class="group-name" for="posts_per_page"><?= _t('conf.reading.articles_per_page') ?></label> <div class="group-controls"> diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index 49b7fd6ee..f8eb469e8 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -5,6 +5,8 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + <h1><?= _t('conf.shortcut') ?></h1> + <datalist id="keys"> <?php foreach ($this->list_keys as $key) { ?> <option value="<?= $key ?>"> @@ -13,7 +15,6 @@ <?php $s = FreshRSS_Context::$user_conf->shortcuts; ?> - <h2><?= _t('conf.shortcut') ?></h2> <?php if ([] !== $nonStandard = getNonStandardShortcuts($s)): ?> <p class="alert alert-error"> <?= _t('conf.shortcut.non_standard', implode('</kbd>, <kbd>', $nonStandard)) ?> @@ -24,191 +25,199 @@ <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <noscript><p class="alert alert-error"><?= _t('conf.shortcut.javascript') ?></p></noscript> + + <fieldset> + <legend><?= _t('conf.shortcut.views') ?></legend> - <legend><?= _t('conf.shortcut.views') ?></legend> - - <div class="form-group"> - <label class="group-name" for="normal_view_shortcut"><?= _t('conf.shortcut.normal_view') ?></label> - <div class="group-controls"> - <input type="text" id="normal_view_shortcut" name="shortcuts[normal_view]" list="keys" value="<?= $s['normal_view'] ?>" - data-leave-validation="<?= $s['normal_view'] ?>"/> + <div class="form-group"> + <label class="group-name" for="normal_view_shortcut"><?= _t('conf.shortcut.normal_view') ?></label> + <div class="group-controls"> + <input type="text" id="normal_view_shortcut" name="shortcuts[normal_view]" list="keys" value="<?= $s['normal_view'] ?>" + data-leave-validation="<?= $s['normal_view'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="global_view_shortcut"><?= _t('conf.shortcut.global_view') ?></label> - <div class="group-controls"> - <input type="text" id="global_view_shortcut" name="shortcuts[global_view]" list="keys" value="<?= $s['global_view'] ?>" - data-leave-validation="<?= $s['global_view'] ?>"/> + <div class="form-group"> + <label class="group-name" for="global_view_shortcut"><?= _t('conf.shortcut.global_view') ?></label> + <div class="group-controls"> + <input type="text" id="global_view_shortcut" name="shortcuts[global_view]" list="keys" value="<?= $s['global_view'] ?>" + data-leave-validation="<?= $s['global_view'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="reading_view_shortcut"><?= _t('conf.shortcut.reading_view') ?></label> - <div class="group-controls"> - <input type="text" id="reading_view_shortcut" name="shortcuts[reading_view]" list="keys" value="<?= $s['reading_view'] ?>" - data-leave-validation="<?= $s['reading_view'] ?>"/> + <div class="form-group"> + <label class="group-name" for="reading_view_shortcut"><?= _t('conf.shortcut.reading_view') ?></label> + <div class="group-controls"> + <input type="text" id="reading_view_shortcut" name="shortcuts[reading_view]" list="keys" value="<?= $s['reading_view'] ?>" + data-leave-validation="<?= $s['reading_view'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="rss_view_shortcut"><?= _t('conf.shortcut.rss_view') ?></label> - <div class="group-controls"> - <input type="text" id="rss_view_shortcut" name="shortcuts[rss_view]" list="keys" value="<?= $s['rss_view'] ?>" - data-leave-validation="<?= $s['rss_view'] ?>"/> + <div class="form-group"> + <label class="group-name" for="rss_view_shortcut"><?= _t('conf.shortcut.rss_view') ?></label> + <div class="group-controls"> + <input type="text" id="rss_view_shortcut" name="shortcuts[rss_view]" list="keys" value="<?= $s['rss_view'] ?>" + data-leave-validation="<?= $s['rss_view'] ?>"/> + </div> </div> - </div> + </fieldset> - <legend><?= _t('conf.shortcut.navigation') ?></legend> + <fieldset> + <legend><?= _t('conf.shortcut.navigation') ?></legend> - <p class="alert alert-warn"><?= _t('conf.shortcut.navigation_help') ?></p> + <p class="alert alert-warn"><?= _t('conf.shortcut.navigation_help') ?></p> - <div class="form-group"> - <label class="group-name" for="next_entry"><?= _t('conf.shortcut.next_article') ?></label> - <div class="group-controls"> - <input type="text" id="next_entry" name="shortcuts[next_entry]" list="keys" value="<?= $s['next_entry'] ?>" - data-leave-validation="<?= $s['next_entry'] ?>"/> + <div class="form-group"> + <label class="group-name" for="next_entry"><?= _t('conf.shortcut.next_article') ?></label> + <div class="group-controls"> + <input type="text" id="next_entry" name="shortcuts[next_entry]" list="keys" value="<?= $s['next_entry'] ?>" + data-leave-validation="<?= $s['next_entry'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="prev_entry"><?= _t('conf.shortcut.previous_article') ?></label> - <div class="group-controls"> - <input type="text" id="prev_entry" name="shortcuts[prev_entry]" list="keys" value="<?= $s['prev_entry'] ?>" - data-leave-validation="<?= $s['prev_entry'] ?>"/> + <div class="form-group"> + <label class="group-name" for="prev_entry"><?= _t('conf.shortcut.previous_article') ?></label> + <div class="group-controls"> + <input type="text" id="prev_entry" name="shortcuts[prev_entry]" list="keys" value="<?= $s['prev_entry'] ?>" + data-leave-validation="<?= $s['prev_entry'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="first_entry"><?= _t('conf.shortcut.first_article') ?></label> - <div class="group-controls"> - <input type="text" id="first_entry" name="shortcuts[first_entry]" list="keys" value="<?= $s['first_entry'] ?>" - data-leave-validation="<?= $s['first_entry'] ?>"/> + <div class="form-group"> + <label class="group-name" for="first_entry"><?= _t('conf.shortcut.first_article') ?></label> + <div class="group-controls"> + <input type="text" id="first_entry" name="shortcuts[first_entry]" list="keys" value="<?= $s['first_entry'] ?>" + data-leave-validation="<?= $s['first_entry'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="last_entry"><?= _t('conf.shortcut.last_article') ?></label> - <div class="group-controls"> - <input type="text" id="last_entry" name="shortcuts[last_entry]" list="keys" value="<?= $s['last_entry'] ?>" - data-leave-validation="<?= $s['last_entry'] ?>"/> + <div class="form-group"> + <label class="group-name" for="last_entry"><?= _t('conf.shortcut.last_article') ?></label> + <div class="group-controls"> + <input type="text" id="last_entry" name="shortcuts[last_entry]" list="keys" value="<?= $s['last_entry'] ?>" + data-leave-validation="<?= $s['last_entry'] ?>"/> + </div> </div> - </div> - <p class="alert alert-warn"><?= _t('conf.shortcut.navigation_no_mod_help') ?></p> + <p class="alert alert-warn"><?= _t('conf.shortcut.navigation_no_mod_help') ?></p> - <div class="form-group"> - <label class="group-name" for="skip_next_entry"><?= _t('conf.shortcut.skip_next_article') ?></label> - <div class="group-controls"> - <input type="text" id="skip_next_entry" name="shortcuts[skip_next_entry]" list="keys" value="<?= $s['skip_next_entry'] ?>" - data-leave-validation="<?= $s['skip_next_entry'] ?>"/> + <div class="form-group"> + <label class="group-name" for="skip_next_entry"><?= _t('conf.shortcut.skip_next_article') ?></label> + <div class="group-controls"> + <input type="text" id="skip_next_entry" name="shortcuts[skip_next_entry]" list="keys" value="<?= $s['skip_next_entry'] ?>" + data-leave-validation="<?= $s['skip_next_entry'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="skip_prev_entry"><?= _t('conf.shortcut.skip_previous_article') ?></label> - <div class="group-controls"> - <input type="text" id="skip_prev_entry" name="shortcuts[skip_prev_entry]" list="keys" value="<?= $s['skip_prev_entry'] ?>" - data-leave-validation="<?= $s['skip_prev_entry'] ?>"/> + <div class="form-group"> + <label class="group-name" for="skip_prev_entry"><?= _t('conf.shortcut.skip_previous_article') ?></label> + <div class="group-controls"> + <input type="text" id="skip_prev_entry" name="shortcuts[skip_prev_entry]" list="keys" value="<?= $s['skip_prev_entry'] ?>" + data-leave-validation="<?= $s['skip_prev_entry'] ?>"/> + </div> </div> - </div> + </fieldset> - <legend><?= _t('conf.shortcut.article_action') ?></legend> + <fieldset> + <legend><?= _t('conf.shortcut.article_action') ?></legend> - <div class="form-group"> - <p class="alert alert-warn"><?= _t('conf.shortcut.shift_for_all_read') ?></p> - <label class="group-name" for="mark_read"><?= _t('conf.shortcut.mark_read') ?></label> - <div class="group-controls"> - <input type="text" id="mark_read" name="shortcuts[mark_read]" list="keys" value="<?= $s['mark_read'] ?>" - data-leave-validation="<?= $s['mark_read'] ?>"/> + <div class="form-group"> + <p class="alert alert-warn"><?= _t('conf.shortcut.shift_for_all_read') ?></p> + <label class="group-name" for="mark_read"><?= _t('conf.shortcut.mark_read') ?></label> + <div class="group-controls"> + <input type="text" id="mark_read" name="shortcuts[mark_read]" list="keys" value="<?= $s['mark_read'] ?>" + data-leave-validation="<?= $s['mark_read'] ?>"/> + </div> </div> - </div> - <p class="alert alert-warn"><?= _t('conf.shortcut.navigation_no_mod_help') ?></p> + <p class="alert alert-warn"><?= _t('conf.shortcut.navigation_no_mod_help') ?></p> - <div class="form-group"> - <label class="group-name" for="mark_favorite"><?= _t('conf.shortcut.mark_favorite') ?></label> - <div class="group-controls"> - <input type="text" id="mark_favorite" name="shortcuts[mark_favorite]" list="keys" value="<?= $s['mark_favorite'] ?>" - data-leave-validation="<?= $s['mark_favorite'] ?>"/> + <div class="form-group"> + <label class="group-name" for="mark_favorite"><?= _t('conf.shortcut.mark_favorite') ?></label> + <div class="group-controls"> + <input type="text" id="mark_favorite" name="shortcuts[mark_favorite]" list="keys" value="<?= $s['mark_favorite'] ?>" + data-leave-validation="<?= $s['mark_favorite'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="go_website"><?= _t('conf.shortcut.see_on_website') ?></label> - <div class="group-controls"> - <input type="text" id="go_website" name="shortcuts[go_website]" list="keys" value="<?= $s['go_website'] ?>" - data-leave-validation="<?= $s['go_website'] ?>"/> + <div class="form-group"> + <label class="group-name" for="go_website"><?= _t('conf.shortcut.see_on_website') ?></label> + <div class="group-controls"> + <input type="text" id="go_website" name="shortcuts[go_website]" list="keys" value="<?= $s['go_website'] ?>" + data-leave-validation="<?= $s['go_website'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="auto_share_shortcut"><?= _t('conf.shortcut.auto_share') ?></label> - <div class="group-controls"> - <input type="text" id="auto_share_shortcut" name="shortcuts[auto_share]" list="keys" value="<?= $s['auto_share'] ?>" - data-leave-validation="<?= $s['auto_share'] ?>"/> - <?= _t('conf.shortcut.auto_share_help') ?> + <div class="form-group"> + <label class="group-name" for="auto_share_shortcut"><?= _t('conf.shortcut.auto_share') ?></label> + <div class="group-controls"> + <input type="text" id="auto_share_shortcut" name="shortcuts[auto_share]" list="keys" value="<?= $s['auto_share'] ?>" + data-leave-validation="<?= $s['auto_share'] ?>"/> + <p class="help"><?= _i('help') ?> <?= _t('conf.shortcut.auto_share_help') ?></p> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="collapse_entry"><?= _t('conf.shortcut.collapse_article') ?></label> - <div class="group-controls"> - <input type="text" id="collapse_entry" name="shortcuts[collapse_entry]" list="keys" value="<?= $s['collapse_entry'] ?>" - data-leave-validation="<?= $s['collapse_entry'] ?>"/> + <div class="form-group"> + <label class="group-name" for="collapse_entry"><?= _t('conf.shortcut.collapse_article') ?></label> + <div class="group-controls"> + <input type="text" id="collapse_entry" name="shortcuts[collapse_entry]" list="keys" value="<?= $s['collapse_entry'] ?>" + data-leave-validation="<?= $s['collapse_entry'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="toggle_media"><?= _t('conf.shortcut.toggle_media') ?></label> - <div class="group-controls"> - <input type="text" id="toggle_media" name="shortcuts[toggle_media]" list="keys" value="<?= $s['toggle_media'] ?>" - data-leave-validation="<?= $s['toggle_media'] ?>"/> + <div class="form-group"> + <label class="group-name" for="toggle_media"><?= _t('conf.shortcut.toggle_media') ?></label> + <div class="group-controls"> + <input type="text" id="toggle_media" name="shortcuts[toggle_media]" list="keys" value="<?= $s['toggle_media'] ?>" + data-leave-validation="<?= $s['toggle_media'] ?>"/> + </div> </div> - </div> + </fieldset> - <legend><?= _t('conf.shortcut.other_action') ?></legend> + <fieldset> + <legend><?= _t('conf.shortcut.other_action') ?></legend> - <div class="form-group"> - <label class="group-name" for="load_more_shortcut"><?= _t('conf.shortcut.load_more') ?></label> - <div class="group-controls"> - <input type="text" id="load_more_shortcut" name="shortcuts[load_more]" list="keys" value="<?= $s['load_more'] ?>" - data-leave-validation="<?= $s['load_more'] ?>"/> + <div class="form-group"> + <label class="group-name" for="load_more_shortcut"><?= _t('conf.shortcut.load_more') ?></label> + <div class="group-controls"> + <input type="text" id="load_more_shortcut" name="shortcuts[load_more]" list="keys" value="<?= $s['load_more'] ?>" + data-leave-validation="<?= $s['load_more'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="focus_search_shortcut"><?= _t('conf.shortcut.focus_search') ?></label> - <div class="group-controls"> - <input type="text" id="focus_search_shortcut" name="shortcuts[focus_search]" list="keys" value="<?= $s['focus_search'] ?>" - data-leave-validation="<?= $s['focus_search'] ?>"/> + <div class="form-group"> + <label class="group-name" for="focus_search_shortcut"><?= _t('conf.shortcut.focus_search') ?></label> + <div class="group-controls"> + <input type="text" id="focus_search_shortcut" name="shortcuts[focus_search]" list="keys" value="<?= $s['focus_search'] ?>" + data-leave-validation="<?= $s['focus_search'] ?>"/> + </div> </div> - </div> - <div class="form-group"> - <label class="group-name" for="user_filter_shortcut"><?= _t('conf.shortcut.user_filter') ?></label> - <div class="group-controls"> - <input type="text" id="user_filter_shortcut" name="shortcuts[user_filter]" list="keys" value="<?= $s['user_filter'] ?>" - data-leave-validation="<?= $s['user_filter'] ?>"/> - <?= _t('conf.shortcut.user_filter_help') ?> + <div class="form-group"> + <label class="group-name" for="user_filter_shortcut"><?= _t('conf.shortcut.user_filter') ?></label> + <div class="group-controls"> + <input type="text" id="user_filter_shortcut" name="shortcuts[user_filter]" list="keys" value="<?= $s['user_filter'] ?>" + data-leave-validation="<?= $s['user_filter'] ?>"/> + <p class="help"><?= _i('help') ?> <?= _t('conf.shortcut.user_filter_help') ?></p> + </div> </div> - </div> - - <div class="form-group"> - <label class="group-name" for="close_dropdown_shortcut"><?= _t('conf.shortcut.close_dropdown') ?></label> - <div class="group-controls"> - <input type="text" id="close_dropdown" name="shortcuts[close_dropdown]" list="keys" value="<?= $s['close_dropdown'] ?>" - data-leave-validation="<?= $s['close_dropdown'] ?>"/> + + <div class="form-group"> + <label class="group-name" for="close_dropdown_shortcut"><?= _t('conf.shortcut.close_dropdown') ?></label> + <div class="group-controls"> + <input type="text" id="close_dropdown" name="shortcuts[close_dropdown]" list="keys" value="<?= $s['close_dropdown'] ?>" + data-leave-validation="<?= $s['close_dropdown'] ?>"/> + </div> </div> - </div> - - <div class="form-group"> - <label class="group-name" for="help_shortcut"><?= _t('conf.shortcut.help') ?></label> - <div class="group-controls"> - <input type="text" id="help_shortcut" name="shortcuts[help]" list="keys" value="<?= $s['help'] ?>" - data-leave-validation="<?= $s['help'] ?>"/> + + <div class="form-group"> + <label class="group-name" for="help_shortcut"><?= _t('conf.shortcut.help') ?></label> + <div class="group-controls"> + <input type="text" id="help_shortcut" name="shortcuts[help]" list="keys" value="<?= $s['help'] ?>" + data-leave-validation="<?= $s['help'] ?>"/> + </div> </div> - </div> + </fieldset> <div class="form-group form-actions"> <div class="group-controls"> diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index d3ead87a8..251ffa03a 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -5,9 +5,10 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + <h1><?= _t('admin.system') ?></h1> + <form method="post" action="<?= _url('configure', 'system') ?>"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('admin.system') ?></legend> <div class="form-group"> <label class="group-name" for="instance-name"><?= _t('admin.system.instance-name') ?></label> diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml index c16f4272f..9e852996f 100644 --- a/app/views/importExport/index.phtml +++ b/app/views/importExport/index.phtml @@ -5,9 +5,11 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + <h1><?= _t('sub.menu.import_export') ?></h1> + + <h2><?= _t('sub.import_export.import') ?></h2> <form method="post" action="<?= _url('importExport', 'import') ?>" enctype="multipart/form-data"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('sub.import_export.import') ?></legend> <div class="form-group"> <label class="group-name" for="file"> <?= extension_loaded('zip') ? _t('sub.import_export.file_to_import') : _t('sub.import_export.file_to_import_no_zip') ?> @@ -24,10 +26,10 @@ </div> </form> + <h2><?= _t('sub.import_export.export') ?></h2> <?php if (count($this->feeds) > 0) { ?> <form method="post" action="<?= _url('importExport', 'export') ?>"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('sub.import_export.export') ?></legend> <div class="form-group"> <div class="group-controls"> <label class="checkbox" for="export_opml"> diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml index 70b9267aa..65279bfc5 100644 --- a/app/views/subscription/add.phtml +++ b/app/views/subscription/add.phtml @@ -5,9 +5,9 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> - + <h1><?= _t('sub.menu.add') ?></h1> + <h2><?= _t('sub.title.add_category') ?></h2> <form action="<?= _url('category', 'create') ?>" method="post"> - <legend><?= _t('sub.title.add_category') ?></legend> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <div class="form-group"> <label class="group-name" for="new-category"><?= _t('sub.category') ?></label> @@ -23,9 +23,9 @@ </div> </form> - + <h2><?= _t('sub.title.add_feed') ?></h2> <form id="add_rss" method="post" action="<?= _url('feed', 'add') ?>" autocomplete="off"> - <legend><?= _t('sub.title.add_feed') ?></legend> + <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <div class="form-group"> diff --git a/app/views/subscription/bookmarklet.phtml b/app/views/subscription/bookmarklet.phtml index 8fd55de31..8d00a29b5 100644 --- a/app/views/subscription/bookmarklet.phtml +++ b/app/views/subscription/bookmarklet.phtml @@ -5,6 +5,7 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + <h1><?= _t('sub.menu.subscription_tools') ?></h1> <h2><?= _t('sub.bookmarklet.title') ?></h2> <p><a class="btn btn-important" href="javascript:(function(){var%20url%20=%20location.href;var%20otherWindow=window.open('about:blank','_blank');otherWindow.opener=null;otherWindow.location='<?= diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index ff0684a9f..9cbac1bbb 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -5,7 +5,7 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> - <h2><?= _t('sub.title') ?></h2> + <h1><?= _t('sub.title') ?></h1> <p class="alert alert-warn"> <?= _t('sub.feed.moved_category_deleted', $this->default_category->name()) ?> diff --git a/app/views/tag/index.phtml b/app/views/tag/index.phtml index 97570ede2..55db61b67 100644 --- a/app/views/tag/index.phtml +++ b/app/views/tag/index.phtml @@ -4,9 +4,11 @@ <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + + <h1><?= _t('sub.menu.label_management') ?></h1> + <h2><?= _t('sub.title.add_label') ?></h2> <form id="add_tag" method="post" action="<?= _url('tag', 'add') ?>" autocomplete="off"> - <legend><?= _t('sub.title.add_label') ?></legend> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <div class="form-group"> <label class="group-name" for="new_label_name"><?= _t('sub.tag.name') ?></label> @@ -22,9 +24,8 @@ </div> </form> - + <h2><?= _t('sub.title.rename_label') ?></h2> <form id="rename_tag" method="post" action="<?= _url('tag', 'rename') ?>" autocomplete="off"> - <legend><?= _t('sub.title.rename_label') ?></legend> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <div class="form-group"> <label class="group-name" for="id_tag"><?= _t('sub.tag.old_name') ?></label> @@ -50,8 +51,8 @@ </div> </form> + <h2><?= _t('sub.title.delete_label') ?></h2> <form id="delete_tag" method="post" action="<?= _url('tag', 'delete') ?>" autocomplete="off"> - <legend><?= _t('sub.title.delete_label') ?></legend> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <div class="form-group"> <label class="group-name" for="id_tag_delete"><?= _t('sub.tag.name') ?></label> diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml index 313dc5f24..8bca4cace 100644 --- a/app/views/update/checkInstall.phtml +++ b/app/views/update/checkInstall.phtml @@ -5,6 +5,7 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + <h1><?= _t('gen.menu.check_install') ?></h1> <h2><?= _t('admin.check_install.php') ?></h2> <?php foreach ($this->status_php as $key => $status) { ?> diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml index 7756ab60d..0c796b63f 100644 --- a/app/views/user/manage.phtml +++ b/app/views/user/manage.phtml @@ -5,12 +5,14 @@ <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> + <h1><?= _t('gen.menu.user_management') ?></h1> + <h2><?= _t('admin.user.create') ?></h2> <form method="post" action="<?= _url('user', 'create') ?>" autocomplete="off"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <input type="hidden" name="originController" value="<?= Minz_Request::controllerName() ?>" /> <input type="hidden" name="originAction" value="<?= Minz_Request::actionName() ?>" /> - <legend><?= _t('admin.user.create') ?></legend> + <div class="form-group"> <label class="group-name" for="new_user_language"><?= _t('admin.user.language') ?></label> @@ -73,7 +75,7 @@ </div> </form> - <legend><?= _t('admin.user.list'); ?></legend> + <h2><?= _t('admin.user.list'); ?></h2> <div class="table-wrapper"> <table id="user-list"> <thead> diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml index ae930a957..bc8fc2d0e 100644 --- a/app/views/user/profile.phtml +++ b/app/views/user/profile.phtml @@ -11,7 +11,7 @@ <form method="post" action="<?= _url('user', 'profile') ?>"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> - <legend><?= _t('conf.profile') ?></legend> + <h1><?= _t('conf.profile') ?></h1> <div class="form-group"> <label class="group-name" for="current_user"><?= _t('conf.user.current') ?></label> diff --git a/p/themes/Alternative-Dark/adark.css b/p/themes/Alternative-Dark/adark.css index 3fcf75a3c..f95f3d637 100644 --- a/p/themes/Alternative-Dark/adark.css +++ b/p/themes/Alternative-Dark/adark.css @@ -550,12 +550,9 @@ a.btn { width: 230px; } -.header > .item.title h1 { +.header > .item.title .logo { margin: 0.5em 0; -} - -.header > .item.title h1 a { - text-decoration: none; + filter: grayscale(100%) brightness(2.5); } .header > .item.search input { diff --git a/p/themes/Alternative-Dark/adark.rtl.css b/p/themes/Alternative-Dark/adark.rtl.css index d9b34af97..4d101e7f9 100644 --- a/p/themes/Alternative-Dark/adark.rtl.css +++ b/p/themes/Alternative-Dark/adark.rtl.css @@ -550,12 +550,9 @@ a.btn { width: 230px; } -.header > .item.title h1 { +.header > .item.title .logo { margin: 0.5em 0; -} - -.header > .item.title h1 a { - text-decoration: none; + filter: grayscale(100%) brightness(2.5); } .header > .item.search input { diff --git a/p/themes/Ansum/_layout.scss b/p/themes/Ansum/_layout.scss index a75601d06..56fe97a54 100644 --- a/p/themes/Ansum/_layout.scss +++ b/p/themes/Ansum/_layout.scss @@ -16,21 +16,12 @@ // flex-direction: row; &.title { width: 280px; - font-weight: 400; - h1 { - a { - text-decoration: none; - color: $sid-font-color; - font-size: 1rem; - text-transform: uppercase; - letter-spacing: 1px; - - img { - margin-right: 0.5rem; - - } + a { + img { + margin: 0.6em 0 0.3em; + filter: invert(80%); } } } diff --git a/p/themes/Ansum/ansum.css b/p/themes/Ansum/ansum.css index ec78db32f..3843b6369 100644 --- a/p/themes/Ansum/ansum.css +++ b/p/themes/Ansum/ansum.css @@ -805,15 +805,9 @@ form th { width: 280px; font-weight: 400; } -.header .item.title h1 a { - text-decoration: none; - color: #363330; - font-size: 1rem; - text-transform: uppercase; - letter-spacing: 1px; -} -.header .item.title h1 a img { - margin-right: 0.5rem; +.header .item.title a img { + margin: 0.6em 0 0.3em; + filter: invert(80%); } .header .item.search input { width: 230px; diff --git a/p/themes/Ansum/ansum.rtl.css b/p/themes/Ansum/ansum.rtl.css index 7931391d2..e78a04795 100644 --- a/p/themes/Ansum/ansum.rtl.css +++ b/p/themes/Ansum/ansum.rtl.css @@ -805,15 +805,9 @@ form th { width: 280px; font-weight: 400; } -.header .item.title h1 a { - text-decoration: none; - color: #363330; - font-size: 1rem; - text-transform: uppercase; - letter-spacing: 1px; -} -.header .item.title h1 a img { - margin-left: 0.5rem; +.header .item.title a img { + margin: 0.6em 0 0.3em; + filter: invert(80%); } .header .item.search input { width: 230px; diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css index 1fd651c78..ed3980eb3 100644 --- a/p/themes/BlueLagoon/BlueLagoon.css +++ b/p/themes/BlueLagoon/BlueLagoon.css @@ -650,22 +650,16 @@ a.btn { } .header > .item.title .logo { - width: 40px; + margin: 10px 0; height: 40px; + filter: grayscale(100%) brightness(0%); } .header > .item.title { width: 250px; } -.header > .item.title h1 { - margin: 10px 0; -} - -.header > .item.title h1 a { - color: #222; - font-size: 28px; - text-decoration: none; +.header > .item.title a { text-shadow: 0 1px #fff; } diff --git a/p/themes/BlueLagoon/BlueLagoon.rtl.css b/p/themes/BlueLagoon/BlueLagoon.rtl.css index 091b3e27b..cba668219 100644 --- a/p/themes/BlueLagoon/BlueLagoon.rtl.css +++ b/p/themes/BlueLagoon/BlueLagoon.rtl.css @@ -650,22 +650,16 @@ a.btn { } .header > .item.title .logo { - width: 40px; + margin: 10px 0; height: 40px; + filter: grayscale(100%) brightness(0%); } .header > .item.title { width: 250px; } -.header > .item.title h1 { - margin: 10px 0; -} - -.header > .item.title h1 a { - color: #222; - font-size: 28px; - text-decoration: none; +.header > .item.title a { text-shadow: 0 1px #fff; } diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index 5bbae4fd4..dda0278e5 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -590,12 +590,9 @@ a.btn { width: 230px; } -.header > .item.title h1 { +.header > .item.title .logo { margin: 0.5em 0; -} - -.header > .item.title h1 a { - text-decoration: none; + filter: grayscale(60%) brightness(1.1); } .header > .item.search input { diff --git a/p/themes/Dark/dark.rtl.css b/p/themes/Dark/dark.rtl.css index c08afe183..4de7188dd 100644 --- a/p/themes/Dark/dark.rtl.css +++ b/p/themes/Dark/dark.rtl.css @@ -590,12 +590,9 @@ a.btn { width: 230px; } -.header > .item.title h1 { +.header > .item.title .logo { margin: 0.5em 0; -} - -.header > .item.title h1 a { - text-decoration: none; + filter: grayscale(60%) brightness(1.1); } .header > .item.search input { diff --git a/p/themes/Mapco/_layout.scss b/p/themes/Mapco/_layout.scss index c7c0849b4..10c572956 100644 --- a/p/themes/Mapco/_layout.scss +++ b/p/themes/Mapco/_layout.scss @@ -19,18 +19,9 @@ font-weight: 400; - h1 { - a { - text-decoration: none; - color: $sid-font-color; - font-size: 1rem; - text-transform: uppercase; - letter-spacing: 1px; - - img { - margin-right: 0.5rem; - - } + a { + img { + margin-right: 0.5rem; } } } @@ -107,6 +98,10 @@ } } + .logo { + margin: 11px 0 5px; + filter: grayscale(100%) brightness(100); + } } diff --git a/p/themes/Mapco/mapco.css b/p/themes/Mapco/mapco.css index 7f5c689ec..e8dffb43d 100644 --- a/p/themes/Mapco/mapco.css +++ b/p/themes/Mapco/mapco.css @@ -808,14 +808,11 @@ form th { width: 280px; font-weight: 400; } -.header .item.title h1 a { - text-decoration: none; - color: #fff; - font-size: 1rem; - text-transform: uppercase; - letter-spacing: 1px; +.header .logo { + margin: 11px 0 5px; + filter: grayscale(100%) brightness(100); } -.header .item.title h1 a img { +.header .item.title a img { margin-right: 0.5rem; } .header .item.search input { diff --git a/p/themes/Mapco/mapco.rtl.css b/p/themes/Mapco/mapco.rtl.css index 9f5ba3cfd..09ff43f5c 100644 --- a/p/themes/Mapco/mapco.rtl.css +++ b/p/themes/Mapco/mapco.rtl.css @@ -808,14 +808,11 @@ form th { width: 280px; font-weight: 400; } -.header .item.title h1 a { - text-decoration: none; - color: #fff; - font-size: 1rem; - text-transform: uppercase; - letter-spacing: 1px; +.header .logo { + margin: 11px 0 5px; + filter: grayscale(100%) brightness(100); } -.header .item.title h1 a img { +.header .item.title a img { margin-left: 0.5rem; } .header .item.search input { diff --git a/p/themes/Origine-compact/origine-compact.css b/p/themes/Origine-compact/origine-compact.css index cd42eb2f1..1e82870b6 100644 --- a/p/themes/Origine-compact/origine-compact.css +++ b/p/themes/Origine-compact/origine-compact.css @@ -608,15 +608,6 @@ a.btn, width: 230px; } -.header > .item.title h1 { - margin: 0; - font-size: 1em; -} - -.header > .item.title h1 a { - text-decoration: none; -} - .header .item.configure .btn, .header .item.search .btn { min-height: 18px; @@ -625,7 +616,6 @@ a.btn, } .header > .item.title .logo { - width: 25px; height: 25px; } diff --git a/p/themes/Origine-compact/origine-compact.rtl.css b/p/themes/Origine-compact/origine-compact.rtl.css index e9e4424d3..f3c5263c0 100644 --- a/p/themes/Origine-compact/origine-compact.rtl.css +++ b/p/themes/Origine-compact/origine-compact.rtl.css @@ -608,15 +608,6 @@ a.btn, width: 230px; } -.header > .item.title h1 { - margin: 0; - font-size: 1em; -} - -.header > .item.title h1 a { - text-decoration: none; -} - .header .item.configure .btn, .header .item.search .btn { min-height: 18px; @@ -625,7 +616,6 @@ a.btn, } .header > .item.title .logo { - width: 25px; height: 25px; } diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 2c77e56d7..6eb3606bc 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -593,13 +593,8 @@ a.btn { width: 230px; } -.header > .item.title h1 { +.header > .item.title .logo { margin: 0.5em 0; - text-shadow: 1px -1px 0 #ccc; -} - -.header > .item.title h1 a { - text-decoration: none; } .header > .item.search input { diff --git a/p/themes/Origine/origine.rtl.css b/p/themes/Origine/origine.rtl.css index b0bee6831..97b304161 100644 --- a/p/themes/Origine/origine.rtl.css +++ b/p/themes/Origine/origine.rtl.css @@ -593,13 +593,8 @@ a.btn { width: 230px; } -.header > .item.title h1 { +.header > .item.title .logo { margin: 0.5em 0; - text-shadow: -1px -1px 0 #ccc; -} - -.header > .item.title h1 a { - text-decoration: none; } .header > .item.search input { diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index 47229be5e..0deac1a33 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -563,11 +563,12 @@ a.btn { width: 230px; } -.header > .item.title h1 { +.header > .item.title .logo { margin: 0.5em 0; + filter: grayscale(100%) brightness(2.5); } -.header > .item.title h1 a, a.signin { +a.signin { text-decoration: none; color: #c5c6ca; } diff --git a/p/themes/Pafat/pafat.rtl.css b/p/themes/Pafat/pafat.rtl.css index f5d1cbc6b..e820459d0 100644 --- a/p/themes/Pafat/pafat.rtl.css +++ b/p/themes/Pafat/pafat.rtl.css @@ -563,11 +563,12 @@ a.btn { width: 230px; } -.header > .item.title h1 { +.header > .item.title .logo { margin: 0.5em 0; + filter: grayscale(100%) brightness(2.5); } -.header > .item.title h1 a, a.signin { +a.signin { text-decoration: none; color: #c5c6ca; } diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index aad9d963b..d01e30ec0 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -638,25 +638,15 @@ a.btn { } .header > .item.title .logo { - width: 60px; - height: 60px; + margin: 0.5em 0; + height: 35px; + filter: invert(80%); } .header > .item.title { width: 250px; } -.header > .item.title h1 { - margin: 0.5em 0; -} - -.header > .item.title h1 a { - color: #222; - font-size: 28px; - text-decoration: none; - text-shadow: 0 1px #fff; -} - .header > .item.search input { width: 230px; } diff --git a/p/themes/Screwdriver/screwdriver.rtl.css b/p/themes/Screwdriver/screwdriver.rtl.css index 18fe7996d..1cbc9e604 100644 --- a/p/themes/Screwdriver/screwdriver.rtl.css +++ b/p/themes/Screwdriver/screwdriver.rtl.css @@ -638,25 +638,15 @@ a.btn { } .header > .item.title .logo { - width: 60px; - height: 60px; + margin: 0.5em 0; + height: 35px; + filter: invert(80%); } .header > .item.title { width: 250px; } -.header > .item.title h1 { - margin: 0.5em 0; -} - -.header > .item.title h1 a { - color: #222; - font-size: 28px; - text-decoration: none; - text-shadow: 0 1px #fff; -} - .header > .item.search input { width: 230px; } diff --git a/p/themes/Swage/swage.css b/p/themes/Swage/swage.css index 56d50b202..b7f88bf9c 100644 --- a/p/themes/Swage/swage.css +++ b/p/themes/Swage/swage.css @@ -562,14 +562,7 @@ form th { } .header > .item.title { position: absolute; -} -.header > .item.title h1 { - margin: 0; - display: block; -} -.header > .item.title h1 a { - text-decoration: none; - color: #fcfcfc; + text-align: center; } .header > .item.title .logo { display: inline-block; @@ -577,6 +570,7 @@ form th { vertical-align: top; position: relative; top: 5px; + filter: grayscale(100%) brightness(100); } .header > .item.search input { width: 230px; @@ -593,10 +587,6 @@ form th { z-index: 1000; width: 35px; } -.header h1 { - text-align: center; - font-size: 1.5em; -} .aside { padding: 35px 0; @@ -859,9 +849,6 @@ form th { width: 200px; position: unset; } -.formLogin .header > .item.title h1 { - display: unset; -} .formLogin a.signin { color: #fcfcfc; padding-left: 5px; @@ -932,12 +919,11 @@ form th { display: none; } - .header > .item.title h1 a { + .header > .item.title a { display: block; position: absolute; top: -35px; left: 10px; - font-size: 0.6em; } .header .item.configure, diff --git a/p/themes/Swage/swage.rtl.css b/p/themes/Swage/swage.rtl.css index 87bc3d12b..5713afd06 100644 --- a/p/themes/Swage/swage.rtl.css +++ b/p/themes/Swage/swage.rtl.css @@ -562,14 +562,7 @@ form th { } .header > .item.title { position: absolute; -} -.header > .item.title h1 { - margin: 0; - display: block; -} -.header > .item.title h1 a { - text-decoration: none; - color: #fcfcfc; + text-align: center; } .header > .item.title .logo { display: inline-block; @@ -577,6 +570,7 @@ form th { vertical-align: top; position: relative; top: 5px; + filter: grayscale(100%) brightness(100); } .header > .item.search input { width: 230px; @@ -593,10 +587,6 @@ form th { z-index: 1000; width: 35px; } -.header h1 { - text-align: center; - font-size: 1.5em; -} .aside { padding: 35px 0; @@ -859,9 +849,6 @@ form th { width: 200px; position: unset; } -.formLogin .header > .item.title h1 { - display: unset; -} .formLogin a.signin { color: #fcfcfc; padding-right: 5px; @@ -932,12 +919,11 @@ form th { display: none; } - .header > .item.title h1 a { + .header > .item.title a { display: block; position: absolute; top: -35px; right: 10px; - font-size: 0.6em; } .header .item.configure, diff --git a/p/themes/Swage/swage.scss b/p/themes/Swage/swage.scss index 8a21584fd..44db6fa4d 100644 --- a/p/themes/Swage/swage.scss +++ b/p/themes/Swage/swage.scss @@ -702,16 +702,7 @@ form { @extend %aside-width; position: absolute; - - h1 { - margin: 0; - display: block; - - a { - text-decoration: none; - color: $color_light; - } - } + text-align: center; .logo { display: inline-block; @@ -719,6 +710,7 @@ form { vertical-align: top; position: relative; top: 5px; + filter: grayscale(100%) brightness(100); } } @@ -741,11 +733,6 @@ form { z-index: 1000; width: 35px; } - - h1 { - text-align: center; - font-size: 1.5em; - } } .aside { @@ -1077,10 +1064,6 @@ form { width: 200px; position: unset; } - - &.title h1 { - display: unset; - } } } @@ -1162,12 +1145,11 @@ form { } } - .header > .item.title h1 a { + .header > .item.title a { display: block; position: absolute; top: -35px; left: 10px; - font-size: 0.6em; } .header .item.configure, diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 6502747b6..b39830319 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -119,6 +119,12 @@ audio { } /*=== Forms */ +fieldset { + margin: 0; + padding: 0; + border: 0; +} + legend { display: block; width: 100%; diff --git a/p/themes/base-theme/template.rtl.css b/p/themes/base-theme/template.rtl.css index cd0371d92..fc83ae5f2 100644 --- a/p/themes/base-theme/template.rtl.css +++ b/p/themes/base-theme/template.rtl.css @@ -119,6 +119,12 @@ audio { } /*=== Forms */ +fieldset { + margin: 0; + padding: 0; + border: 0; +} + legend { display: block; width: 100%; |