Przeglądaj źródła

fix: dyn. OPML icon (#4810)

* fix
maTh 3 lat temu
rodzic
commit
ca6c9345b2

+ 2 - 2
app/Models/Themes.php

@@ -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;

+ 1 - 2
app/views/subscription/index.phtml

@@ -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 - 0
p/themes/base-theme/frss.css

@@ -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 - 0
p/themes/base-theme/frss.rtl.css

@@ -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;