Compile: dark.css

diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index 9444b295e493174ed0c3b0b27281ddc80f1f62a6..760e874e43916e690b4888758cac807527e22f34 100644 (file)
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -9,6 +9,9 @@ if ($_GET["file"] == "favicon.ico") {
 } elseif ($_GET["file"] == "default.css") {
        header("Content-Type: text/css; charset=utf-8");
        echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css'));
+} elseif ($_GET["file"] == "dark.css") {
+       header("Content-Type: text/css; charset=utf-8");
+       echo lzw_decompress(compile_file('../adminer/static/dark.css', 'minify_css'));
 } elseif ($_GET["file"] == "functions.js") {
        header("Content-Type: text/javascript; charset=utf-8");
        echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 02e634c1722e60d9bd6bc6ff57a0068869458d2a..d0696b9d050ecb6a117fed35e892ef7970ae47b7 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -98,7 +98,7 @@ class Adminer {
        */
        function head() {
                ?>
-<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
+<link rel="stylesheet" href="../externals/jush/jush.css">
 <?php
                return true;
        }

diff --git a/compile.php b/compile.php
index 0dcfc0f042ba7412ab1afe3650234a4d092b63e2..45b36021d908ddcaf6403d43d0fb2ec11261df1f 100755 (executable)
--- a/compile.php
+++ b/compile.php
@@ -341,9 +341,9 @@ if ($_SESSION["lang"]) {
        $file = str_replace("switch_lang();", "", $file);
        $file = str_replace('<?php echo $LANG; ?>', $_SESSION["lang"], $file);
 }
-$file = str_replace('<?php echo script_src("static/editing.js"); ?>' . "\n", "", $file);
-$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|" \. JUSH \. ")\.js"\);~', '', $file);
-$file = str_replace('<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">' . "\n", "", $file);
+$file = str_replace('echo script_src("static/editing.js");' . "\n", "", $file); // merged into functions.js
+$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|" \. JUSH \. ")\.js"\);~', '', $file); // merged into jush.js
+$file = str_replace('<link rel="stylesheet" href="../externals/jush/jush.css">' . "\n", "", $file); // merged into default.css
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
 $replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\1&version=' . $VERSION . '"';
 $file = preg_replace('~\.\./adminer/static/(default\.css|favicon\.ico)~', '<?php echo h(' . $replace . '); ?>', $file);