1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 02:05:56 +00:00

don't generate default.css, replace with themes/light.css as a default root CSS file

This commit is contained in:
Andrew Dolgov
2020-02-22 16:22:44 +03:00
parent 84b847074e
commit 4ab3854aed
19 changed files with 20 additions and 1989 deletions

View File

@@ -523,7 +523,7 @@ class Handler_Public extends Handler {
<head>
<title><?php echo __("Share with Tiny Tiny RSS") ?></title>
<?php
echo stylesheet_tag("css/default.css");
echo stylesheet_tag("themes/light.css");
echo javascript_tag("lib/prototype.js");
echo javascript_tag("lib/dojo/dojo.js");
echo javascript_tag("lib/dojo/tt-rss-layer.js");
@@ -731,7 +731,7 @@ class Handler_Public extends Handler {
<head>
<title>Tiny Tiny RSS</title>
<?php
echo stylesheet_tag("css/default.css");
echo stylesheet_tag("themes/light.css");
echo javascript_tag("lib/prototype.js");
echo javascript_tag("lib/dojo/dojo.js");
echo javascript_tag("lib/dojo/tt-rss-layer.js");
@@ -873,7 +873,7 @@ class Handler_Public extends Handler {
<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<?php
echo stylesheet_tag("css/default.css");
echo stylesheet_tag("themes/light.css");
echo javascript_tag("lib/prototype.js");
echo javascript_tag("lib/dojo/dojo.js");
echo javascript_tag("lib/dojo/tt-rss-layer.js");
@@ -1074,11 +1074,11 @@ class Handler_Public extends Handler {
<head>
<title>Database Updater</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<?php echo stylesheet_tag("css/default.css") ?>
<?php echo stylesheet_tag("themes/light.css") ?>
<link rel="shortcut icon" type="image/png" href="images/favicon.png">
<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
<?php
echo stylesheet_tag("css/default.css");
echo stylesheet_tag("themes/light.css");
echo javascript_tag("lib/prototype.js");
echo javascript_tag("lib/dojo/dojo.js");
echo javascript_tag("lib/dojo/tt-rss-layer.js");

View File

@@ -24,7 +24,7 @@ class Opml extends Handler_Protected {
print "<html>
<head>
".stylesheet_tag("css/default.css")."
".stylesheet_tag("themes/light.css")."
<title>".__("OPML Utility")."</title>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head>

View File

@@ -674,12 +674,12 @@ class Pref_Prefs extends Handler_Protected {
$themes = array_filter($themes, "theme_exists");
asort($themes);
if (!theme_exists($value)) $value = "default.php";
if (!theme_exists($value)) $value = "";
print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>";
$issel = $value == "default.php" ? "selected='selected'" : "";
print "<option $issel value='default.php'>".__("default")."</option>";
$issel = $value == "" ? "selected='selected'" : "";
print "<option $issel value=''>".__("default")."</option>";
foreach ($themes as $theme) {
$issel = $value == $theme ? "selected='selected'" : "";