From 67fa4c2a6fb90c4859be1f4d9640e0314d392c97 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 25 Mar 2025 22:35:31 +0100 Subject: [PATCH] Schema: Move style to CSS --- adminer/file.inc.php | 3 --- adminer/schema.inc.php | 3 +-- adminer/static/default.css | 1 + compile.php | 3 +++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adminer/file.inc.php b/adminer/file.inc.php index 706030a2..d468b77f 100644 --- a/adminer/file.inc.php +++ b/adminer/file.inc.php @@ -50,9 +50,6 @@ if ($_GET["file"] == "favicon.ico") { case "down.gif": echo compile_file('../adminer/static/down.gif'); break; - case "arrow.gif": - echo compile_file('../adminer/static/arrow.gif'); - break; } } exit; diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php index fb453388..f361f0fb 100644 --- a/adminer/schema.inc.php +++ b/adminer/schema.inc.php @@ -86,8 +86,7 @@ foreach ($schema as $name => $table) { $left1 = $left - $table_pos[$name][1]; $i = 0; foreach ($columns as $target) { - echo "\n
" + echo "\n
" . "
" . "
" ; diff --git a/adminer/static/default.css b/adminer/static/default.css index fe333ade..8a748078 100644 --- a/adminer/static/default.css +++ b/adminer/static/default.css @@ -86,6 +86,7 @@ input.wayoff { left: -1000px; position: absolute; } #schema { margin-left: 60px; position: relative; user-select: none; -webkit-user-select: none; } #schema .table { border: 1px solid silver; padding: 0 2px; cursor: move; position: absolute; } #schema .references { position: absolute; } +#schema .arrow { height: 1.25em; background: url(arrow.gif) no-repeat right center; } #help { position: absolute; border: 1px solid #999; background: #eee; padding: 5px; font-family: monospace; z-index: 1; } .rtl h2 { margin: 0 -18px 20px 0; } diff --git a/compile.php b/compile.php index 7425f4ca..6d127f36 100755 --- a/compile.php +++ b/compile.php @@ -202,6 +202,9 @@ if (!$translations) { } function minify_css($file) { + $file = preg_replace_callback('~url\((\w+\.(gif))\)~', function ($match) { + return "url(data:image/$match[2];base64," . base64_encode(file_get_contents(__DIR__ . "/adminer/static/$match[1]")) . ")"; + }, $file); return lzw_compress(preg_replace('~\s*([:;{},])\s*~', '\1', preg_replace('~/\*.*?\*/\s*~s', '', $file))); }