FreshRSS
/
FreshRSS
mirror of https://github.com/FreshRSS/FreshRSS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: dyn. OPML icon (#4810) 

* fix
This commit is contained in:
maTh 2022-11-03 22:36:13 +01:00 committed by GitHub
parent b1f9463673
commit ca6c9345b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Themes.php
View File

@ -144,9 +144,9 @@ class FreshRSS_Themes extends Minz_Model {
}
if ($type == self::ICON_DEFAULT) {
if ((FreshRSS_Context::$user_conf && FreshRSS_Context::$user_conf->icons_as_emojis) ||
if ((FreshRSS_Context::$user_conf && FreshRSS_Context::$user_conf->icons_as_emojis)
// default to emoji alternate for some icons
in_array($name, [ 'opml-dyn' ])) {
) {
$type = self::ICON_EMOJI;
} else {
$type = self::ICON_IMG;

3
app/views/subscription/index.phtml
View File

@ -35,8 +35,7 @@
<div class="box">
<div class="box-title">
<a class="configure open-slider" href="<?= _url('subscription', 'category', 'id', $cat->id()) ?>" data-cat-position="<?= $cat->attributes('position') ?>"><?= _i('configure') ?></a>
<h2><?= $cat->name() ?></h2>
<?php if ($cat->kind() == FreshRSS_Category::KIND_DYNAMIC_OPML) { echo _i('opml-dyn'); } ?>
<h2><?= $cat->name() ?><?php if ($cat->kind() == FreshRSS_Category::KIND_DYNAMIC_OPML) { echo " " . _i('opml-dyn'); } ?></h2>
</div>
<ul class="box-content drop-zone scrollbar-thin" dropzone="move" data-cat-id="<?= $cat->id() ?>">
<?php

6
p/themes/base-theme/frss.css
View File

@ -98,6 +98,12 @@ h2 {
line-height: 1.5;
}
h2 .icon,
legend .icon {
height: 0.8em;
vertical-align: baseline;
}
h3 {
margin: 0.5rem 0 0.25rem;
font-size: 1.2rem;

6
p/themes/base-theme/frss.rtl.css
View File

@ -98,6 +98,12 @@ h2 {
line-height: 1.5;
}
h2 .icon,
legend .icon {
height: 0.8em;
vertical-align: baseline;
}
h3 {
margin: 0.5rem 0 0.25rem;
font-size: 1.2rem;