Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-06 16:46:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move editor.css to theme/icecoder.css and make default

Browse Source
This commit is contained in:
mattpass
2020-07-05 09:25:16 +01:00
parent 5fc797176d
commit d7bb490a50
7 changed files with 43 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/backup-versions.php
View File

@@ -28,10 +28,9 @@ $versions = $fileCountInfo['count'];
.cm-tab {border-left-width: <?php echo $ICEcoder["visibleTabs"] ? "1px" : "0";?>; margin-left: <?php echo $ICEcoder["visibleTabs"] ? "-1px" : "0";?>; border-left-style: solid; border-left-color: rgba(255,255,255,0.15)}
</style>
<link rel="stylesheet" href="<?php
echo ($ICEcoder["theme"] === "default"
? dirname(basename(__DIR__)).'/../assets/css/editor.css'
: '../assets/css/theme/'.$ICEcoder["theme"].'.css'
) . "?microtime=".microtime(true);
echo dirname(basename(__DIR__)) . '/../assets/css/theme/';
echo $ICEcoder["theme"] === "default" ? 'icecoder.css': $ICEcoder["theme"] . '.css';
echo "?microtime=".microtime(true);
?>">
<link rel="stylesheet" href="../assets/css/foldgutter.css?microtime=<?php echo microtime(true);?>">
<link rel="stylesheet" href="../assets/css/simplescrollbars.css?microtime=<?php echo microtime(true);?>">

4
lib/settings-screen.php
View File

@@ -21,12 +21,12 @@ $t = $text['settings-screen'];
.cm-tab {border-left-width: <?php echo $ICEcoder["visibleTabs"] ? "1px" : "0";?>; margin-left: <?php echo $ICEcoder["visibleTabs"] ? "-1px" : "0";?>; border-left-style: solid; border-left-color: rgba(255,255,255,0.2)}
</style>
<link rel="stylesheet" href="../assets/css/editor.css?microtime=<?php echo microtime(true);?>">
<link rel="stylesheet" href="../assets/css/theme/icecoder.css?microtime=<?php echo microtime(true);?>">
<?php
$themeArray = array();
$handle = opendir('../assets/css/theme/');
while (false !== ($file = readdir($handle))) {
if ($file !== "." && $file != "..") {
if ($file !== "." && $file !== ".." && $file !== "icecoder.css") {
array_push($themeArray,basename($file,".css"));
}
}

5
lib/settings-update.php
View File

@@ -105,9 +105,8 @@ if (!$demoMode && true === isset($_SESSION['loggedIn']) && $_SESSION['loggedIn']
}
// Work out the theme to use now
$themeURL = "default" === $ICEcoder["theme"]
? 'assets/css/editor.css'
: 'assets/css/theme/' . $ICEcoder["theme"] . '.css';
$themeURL = 'assets/css/theme/';
$themeURL .= "default" === $ICEcoder["theme"] ? 'icecoder.css' : $ICEcoder["theme"] . '.css';
$themeURL .= "?microtime=" . microtime(true);
// Do we need a file manager refresh?