night.css: do not import default less theme statically

remove themes/default.php (not needed)
compact.css: fixes
master
Andrew Dolgov 6 years ago
parent d2d2cb7e7d
commit 15d05e8a26

@ -554,8 +554,17 @@ class Pref_Prefs extends Handler_Protected {
if (!theme_valid($value)) $value = "default.php"; if (!theme_valid($value)) $value = "default.php";
print_select($pref_name, $value, $themes, print "<select name='$pref_name' id='$pref_name' dojoType='dijit.form.Select'>";
'dojoType="dijit.form.Select"');
$issel = $value == "default.php" ? "selected='selected'" : "";
print "<option $issel value='default.php'>".__("default")."</option>";
foreach ($themes as $theme) {
$issel = $value == $theme ? "selected='selected'" : "";
print "<option $issel value='$theme'>$theme</option>";
}
print "</select>";
} else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") { } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") {

@ -2445,7 +2445,7 @@
} }
function theme_valid($theme) { function theme_valid($theme) {
$bundled_themes = [ "default.php", "night.css", "compact.css" ]; $bundled_themes = [ "night.css", "compact.css" ];
if (in_array($theme, $bundled_themes)) return true; if (in_array($theme, $bundled_themes)) return true;

@ -1,17 +1,18 @@
@import "default.php"; @import "../css/default.css";
body.ttrss_main.ttrss_index.flat .dijitMenu .dijitMenuItemLabel,
body, body.ttrss_main.ttrss_index.flat .content-inner,
.claro .dijitMenu .dijitMenuItemLabel, body.ttrss_main.ttrss_index.flat #content-insert,
.claro .content-inner, body.ttrss_main.ttrss_index.flat .cdm .content,
.claro #content-insert, body.ttrss_main.ttrss_index.flat .post .content {
.claro .cdm .content, font-size: 12px ! important;
.claro .post .content {
font-size : 12px ! important;
} }
body.ttrss_main.ttrss_index.flat div[id*=RROW] i {
.claro .post .header, font-size: 18px;
.claro #floatingTitle a.title,
.claro .cdm .title {
font-size : 13px ! important;
} }
body.ttrss_main.ttrss_index.flat .hl,
body.ttrss_main.ttrss_index.flat .post .header .title,
body.ttrss_main.ttrss_index.flat #floatingTitle a.title,
body.ttrss_main.ttrss_index.flat .cdm .title {
font-size: 13px ! important;
}
/*# sourceMappingURL=compact.css.map */

@ -0,0 +1 @@
{"version":3,"sources":["compact.less"],"names":[],"mappings":"QAAQ;AAER,IAAI,WAAW,YAAY,KAEzB,WAAW;AAFb,IAAI,WAAW,YAAY,KAGzB;AAHF,IAAI,WAAW,YAAY,KAIzB;AAJF,IAAI,WAAW,YAAY,KAKzB,KAAK;AALP,IAAI,WAAW,YAAY,KAMzB,MAAM;EACJ,2BAAA;;AAPJ,IAAI,WAAW,YAAY,KAUzB,IAAG,UACD;EACE,eAAA;;AAZN,IAAI,WAAW,YAAY,KAgBzB;AAhBF,IAAI,WAAW,YAAY,KAiBzB,MAAM,QAAQ;AAjBhB,IAAI,WAAW,YAAY,KAkBzB,eAAe,EAAC;AAlBlB,IAAI,WAAW,YAAY,KAmBzB,KAAK;EACH,2BAAA","file":"compact.css"}

@ -0,0 +1,27 @@
@import "../css/default.css";
body.ttrss_main.ttrss_index.flat {
.dijitMenu .dijitMenuItemLabel,
.content-inner,
#content-insert,
.cdm .content,
.post .content {
font-size : 12px ! important;
}
div[id*=RROW] {
i {
font-size: 18px;
}
}
.hl,
.post .header .title,
#floatingTitle a.title,
.cdm .title {
font-size : 13px ! important;
}
}

@ -1,10 +0,0 @@
<?php
header("Content-type: text/css");
function import_tag($filename) {
return "@import \"$filename?".filemtime($filename)."\";";
}
print import_tag("../css/default.css") . "\n";
?>

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

@ -1,4 +1,4 @@
@import "../css/defines.less"; @import "../css/default.css";
:root { :root {
--bg-main : #333; --bg-main : #333;

Loading…
Cancel
Save