valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atom-to-html.xsl
View File

@ -9,7 +9,7 @@
<html> <html>
<head> <head>
<title><xsl:value-of select="atom:title"/></title> <title><xsl:value-of select="atom:title"/></title>
<link rel="stylesheet" type="text/css" href="css/default.css"/> <link rel="stylesheet" type="text/css" href="themes/light.css"/>
<script language="javascript" src="lib/xsl_mop-up.js"></script> <script language="javascript" src="lib/xsl_mop-up.js"></script>
</head> </head>

10
classes/handler/public.php
View File

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

2
classes/opml.php
View File

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

6
classes/pref/prefs.php
View File

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

1949
css/default.css
View File

File diff suppressed because it is too large Load Diff

1
css/default.css.map
View File

File diff suppressed because one or more lines are too long

3
include/functions.php
View File

@ -1753,9 +1753,6 @@
} }
function get_theme_path($theme) { function get_theme_path($theme) {
if ($theme == "default.php")
return "css/default.css";
$check = "themes/$theme"; $check = "themes/$theme";
if (file_exists($check)) return $check; if (file_exists($check)) return $check;

2
include/sanity_check.php
View File

@ -207,7 +207,7 @@
<head> <head>
<title>Startup failed</title> <title>Startup failed</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="css/default.css"> <link rel="stylesheet" type="text/css" href="themes/light.css">
</head> </head>
<body class='sanity_failed claro ttrss_utility'> <body class='sanity_failed claro ttrss_utility'>
<div class="content"> <div class="content">

2
install/index.php
View File

@ -31,7 +31,7 @@
textarea { font-size : 12px; } textarea { font-size : 12px; }
</style> </style>
<?php <?php
echo stylesheet_tag("../css/default.css"); echo stylesheet_tag("../themes/light.css");
echo javascript_tag("../lib/prototype.js"); echo javascript_tag("../lib/prototype.js");
echo javascript_tag("../lib/dojo/dojo.js"); echo javascript_tag("../lib/dojo/dojo.js");
echo javascript_tag("../lib/dojo/tt-rss-layer.js"); echo javascript_tag("../lib/dojo/tt-rss-layer.js");

2
js/AppBase.js
View File

@ -20,7 +20,7 @@ define(["dojo/_base/declare"], function (declare) {
console.log("night mode changed to", is_night); console.log("night mode changed to", is_night);
if (link) { if (link) {
const css_override = is_night ? "themes/night.css" : "css/default.css"; const css_override = is_night ? "themes/night.css" : "themes/light.css";
link.setAttribute("href", css_override + "?" + Date.now()); link.setAttribute("href", css_override + "?" + Date.now());
} }
}, },

2
js/utility.js
View File

@ -6,7 +6,7 @@ Event.observe(window, "load", function() {
console.log("night mode changed to", is_night); console.log("night mode changed to", is_night);
if (link) { if (link) {
const css_override = is_night ? "themes/night.css" : "css/default.css"; const css_override = is_night ? "themes/night.css" : "themes/light.css";
link.setAttribute("href", css_override + "?" + Date.now()); link.setAttribute("href", css_override + "?" + Date.now());
} }

2
plugins/auth_internal/init.php
View File

@ -64,7 +64,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
<title>Tiny Tiny RSS</title> <title>Tiny Tiny RSS</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head> </head>
<?php echo stylesheet_tag("css/default.css") ?> <?php echo stylesheet_tag("themes/light.css") ?>
<body class="ttrss_utility otp"> <body class="ttrss_utility otp">
<h1><?php echo __("Authentication") ?></h1> <h1><?php echo __("Authentication") ?></h1>
<div class="content"> <div class="content">

2
register.php
View File

@ -94,7 +94,7 @@
<head> <head>
<title>Create new account</title> <title>Create new account</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <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") ?>
<?php echo javascript_tag("js/common.js") ?> <?php echo javascript_tag("js/common.js") ?>
<?php echo javascript_tag("lib/prototype.js") ?> <?php echo javascript_tag("lib/prototype.js") ?>
<?php echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls") ?> <?php echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls") ?>

2
themes/compact.css
View File

@ -1,5 +1,3 @@
/* we can't simply include default.less here because then phpstorm watcher would consider this the only
master file to generate css for, so it duplicates default.less more or less */
@import "../lib/flat-ttrss/flat_combined.css"; @import "../lib/flat-ttrss/flat_combined.css";
body.ttrss_main, body.ttrss_main,
body.ttrss_prefs, body.ttrss_prefs,

2
themes/compact.css.map
View File

File diff suppressed because one or more lines are too long

8
themes/compact.less
View File

@ -1,10 +1,4 @@
/* we can't simply include default.less here because then phpstorm watcher would consider this the only @import "../css/default.less";
master file to generate css for, so it duplicates default.less more or less */
@import "../css/defines.less";
@import "../css/dijit_light.less";
@import "../css/zoom.less";
@import "../lib/flat-ttrss/flat_combined.css";
/* rules specific to compact.css */ /* rules specific to compact.css */

2
themes/light.css
View File

@ -1,5 +1,3 @@
/* we can't simply include default.less here because then phpstorm watcher would consider this the only
master file to generate css for, so it duplicates default.less more or less */
@import "../lib/flat-ttrss/flat_combined.css"; @import "../lib/flat-ttrss/flat_combined.css";
body.ttrss_main, body.ttrss_main,
body.ttrss_prefs, body.ttrss_prefs,

2
themes/light.css.map
View File

File diff suppressed because one or more lines are too long

8
themes/light.less
View File

@ -1,7 +1 @@
/* we can't simply include default.less here because then phpstorm watcher would consider this the only @import "../css/default.less";
master file to generate css for, so it duplicates default.less more or less */
@import "../css/defines.less";
@import "../css/dijit_light.less";
@import "../css/zoom.less";
@import "../lib/flat-ttrss/flat_combined.css";