diff --git a/assets/css/files.css b/assets/css/files.css index 98ab7bc..ae16cf1 100644 --- a/assets/css/files.css +++ b/assets/css/files.css @@ -10,9 +10,12 @@ body {margin: 0; overflow: auto; user-select: none; } -.lock {position: fixed; display: inline-block; width: 12px; height: 16px; background: url('../images/file-manager-icons.png') 0 0 no-repeat; right: 0; margin-right: 16px; top: 0; cursor: pointer} -.refresh {position: fixed; display: inline-block; width: 14px; height: 14px; background: url('../images/file-manager-icons.png') -32px 0 no-repeat; right: 0; margin-right: 15px; top: 25px; cursor: pointer} -.plugins {position: fixed; display: inline-block; width: 16px; height: 16px; background: url('../images/file-manager-icons.png') -64px 0 no-repeat; right: 0; margin-right: 15px; top: 47px; cursor: pointer} +.lock {position: fixed; display: inline-block; width: 12px; height: 16px; right: 0; margin-right: 16px; top: 0; color: #666; cursor: pointer} +.lock .icon-tabler {width: 22px; height: 22px; margin-left: -5px; margin-top: 0; stroke-width: 1.25; pointer-events: none} +.refresh {position: fixed; display: inline-block; width: 14px; height: 14px; right: 0; margin-right: 15px; top: 34px; color: #666; cursor: pointer} +.refresh .icon-tabler {width: 20px; height: 20px; margin-left: -3px; margin-top: -3px; stroke-width: 1.25; transform: rotate(180deg); pointer-events: none} +.plugins {position: fixed; display: inline-block; width: 16px; height: 16px; right: 0; margin-right: 15px; top: 61px; color: #666; cursor: pointer} +.plugins .icon-tabler {width: 24px; height: 24px; margin-left: -3px; margin-top: -3px; stroke-width: 1.25; pointer-events: none} .fmDragBox {position: absolute; display: inline-block; width: 0; height: 0; top: 0; left: 0; background: rgba(0,198,255,0.3); -webkit-user-select: none; -moz-user-select: none; diff --git a/assets/css/icecoder.css b/assets/css/icecoder.css index 6d4c7a8..f45f795 100644 --- a/assets/css/icecoder.css +++ b/assets/css/icecoder.css @@ -118,8 +118,10 @@ h2 {font-size: 18px; font-weight: normal; color: #fff} .findBar .goLine {position: fixed; display: inline-block; width: 120px; right: 65px; top: 49px; height: 21px; font-size: 10px; color: #eee; cursor: default; z-index: 1} .goLine .goToLine {width: 50px; height: 28px; border: 0; font-size: 12px; margin: -7px 0 0 3px; padding-left: 4px; background: #333; color: #eee} .findReplace input:focus, .goLine .goToLine:focus {outline: none; background: rgba(0,198,255,0.5); color: #fff} -.findBar .view {position: fixed; display: inline-block; width: 16px; height: 16px; right: 40px; top: 49px; background: url('../images/file-manager-icons.png') 0 0 no-repeat; cursor: pointer; background-position: -48px 0; opacity: 0.3} -.findBar .bug {position: fixed; display: inline-block; width: 16px; height: 16px; right: 15px; top: 48px; background: url('../images/bug-reporting-icons.png') 0 0 no-repeat; cursor: pointer; background-position: 0 0} +.findBar .view {position: fixed; display: inline-block; width: 16px; height: 16px; right: 40px; top: 49px; color: #888; cursor: pointer; opacity: 0.3} +.findBar .view .icon-tabler {width: 22px; height: 22px; margin-left: -3px; margin-top: -3px; stroke-width: 1.25; pointer-events: none} +.findBar .bug {position: fixed; display: inline-block; width: 16px; height: 16px; right: 15px; top: 49px; color: #404040; cursor: pointer} +.findBar .bug .icon-tabler {width: 23px; height: 23px; margin-left: -3px; margin-top: -4px; stroke-width: 1.25; pointer-events: none} .editor .terminal {position: fixed; top: 10000px; transition: top 0.2s ease; z-index: 2} .editor .output {position: fixed; top: 10000px; padding: 15px 18px 8px 13px; transition: top 0.2s ease; background: rgba(0,0,0,0.92); z-index: 2} .editor .database {position: fixed; top: 10000px; transition: top 0.2s ease; z-index: 2} @@ -136,8 +138,10 @@ h2 {font-size: 18px; font-weight: normal; color: #fff} .footer .versionsDisplay {position: absolute; display: inline-block; padding: 5px; margin-top: 3px; left: 275px; color: #fff; transition: opacity 0.2s; z-index: 2; cursor: pointer} .footer .serverMessage {position: absolute; display: inline-block; padding: 5px; margin-top: 3px; left: 275px; color: #fff; transition: opacity 0.2s; z-index: 1} .footer .splitPaneControls {position: absolute; display: inline-block; width: 50px; text-align: center; padding: 6px} -.footer .splitPaneControls .off {display: inline-block; width: 18px; height: 18px; margin-right: 10px; background: url('../images/split-pane-controls.gif') no-repeat 0 0; cursor: pointer} -.footer .splitPaneControls .on {display: inline-block; width: 19px; height: 18px; background: url('../images/split-pane-controls.gif') no-repeat -18px 0; cursor: pointer} +.footer .splitPaneControls .off {display: inline-block; width: 18px; height: 18px; margin-right: 10px; color: #888; cursor: pointer} +.footer .splitPaneControls .off .icon-tabler {margin-left: -3px; margin-top: -3px; stroke-width: 1.25; pointer-events: none} +.footer .splitPaneControls .on {display: inline-block; width: 19px; height: 18px; color: #888; cursor: pointer} +.footer .splitPaneControls .on .icon-tabler {margin-left: -3px; margin-top: -3px; stroke-width: 1.25; pointer-events: none} .footer .splitPaneNames {position: absolute; display: inline-block; width: 100px; text-align: center; margin-top: 9px; color: #555; opacity: 0; transition: opacity 0.3s ease-in-out} .footer .charDisplay, .footer .byteDisplay {position: absolute; display: inline-block; padding: 5px 0 0 8px; margin-top: 3px; margin-right: 10px; right: 0; font-size: 12px; color: #fff; text-align: right; text-align: right; cursor: pointer} diff --git a/assets/images/bug-reporting-icons.png b/assets/images/bug-reporting-icons.png deleted file mode 100644 index e40d8d2..0000000 Binary files a/assets/images/bug-reporting-icons.png and /dev/null differ diff --git a/assets/images/file-manager-icons.png b/assets/images/file-manager-icons.png deleted file mode 100644 index 928e213..0000000 Binary files a/assets/images/file-manager-icons.png and /dev/null differ diff --git a/assets/images/files-arrow.png b/assets/images/files-arrow.png deleted file mode 100644 index c5db24e..0000000 Binary files a/assets/images/files-arrow.png and /dev/null differ diff --git a/assets/images/icons/alert-triangle.svg b/assets/images/icons/alert-triangle.svg index c274588..2077aca 100644 --- a/assets/images/icons/alert-triangle.svg +++ b/assets/images/icons/alert-triangle.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/images/icons/browser.svg b/assets/images/icons/browser.svg new file mode 100644 index 0000000..94ad009 --- /dev/null +++ b/assets/images/icons/browser.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/icons/bug.svg b/assets/images/icons/bug.svg new file mode 100644 index 0000000..f660fea --- /dev/null +++ b/assets/images/icons/bug.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/images/icons/layout-columns.svg b/assets/images/icons/layout-columns.svg new file mode 100644 index 0000000..d6d111c --- /dev/null +++ b/assets/images/icons/layout-columns.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/icons/lock-open.svg b/assets/images/icons/lock-open.svg new file mode 100644 index 0000000..9ba4e14 --- /dev/null +++ b/assets/images/icons/lock-open.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/icons/lock.svg b/assets/images/icons/lock.svg new file mode 100644 index 0000000..e3de508 --- /dev/null +++ b/assets/images/icons/lock.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/icons/plug.svg b/assets/images/icons/plug.svg new file mode 100644 index 0000000..b1b8c0d --- /dev/null +++ b/assets/images/icons/plug.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/icons/plus.svg b/assets/images/icons/plus.svg new file mode 100644 index 0000000..3073610 --- /dev/null +++ b/assets/images/icons/plus.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/icons/rotate-clockwise.svg b/assets/images/icons/rotate-clockwise.svg new file mode 100644 index 0000000..f09329c --- /dev/null +++ b/assets/images/icons/rotate-clockwise.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/icons/square.svg b/assets/images/icons/square.svg new file mode 100644 index 0000000..c3e0ca5 --- /dev/null +++ b/assets/images/icons/square.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/split-pane-controls.gif b/assets/images/split-pane-controls.gif deleted file mode 100644 index 2e5a844..0000000 Binary files a/assets/images/split-pane-controls.gif and /dev/null differ diff --git a/assets/js/icecoder.js b/assets/js/icecoder.js index cfc9277..4fa87c1 100644 --- a/assets/js/icecoder.js +++ b/assets/js/icecoder.js @@ -255,8 +255,8 @@ var ICEcoder = { let cM, cMdiff; this.splitPane = "on" === onOff ? true : false; - get('splitPaneControlsOff').style.opacity = this.splitPane ? 0.2 : 0.5; - get('splitPaneControlsOn').style.opacity = this.splitPane ? 0.5 : 0.2; + get('splitPaneControlsOff').style.opacity = this.splitPane ? 0.2 : 0.8; + get('splitPaneControlsOn').style.opacity = this.splitPane ? 0.8 : 0.2; get('splitPaneNamesMain').style.opacity = get('splitPaneNamesDiff').style.opacity = this.splitPane ? 1 : 0; this.setLayout(); @@ -385,11 +385,12 @@ var ICEcoder = { // Lock & unlock the file manager navigation on demand lockUnlockNav: function() { - let lockIcon; - - lockIcon = this.filesFrame.contentWindow.document.getElementById('fmLock'); + let lockIconOpen, lockIconClosed; + lockIconOpen = this.filesFrame.contentWindow.document.getElementById('fmLockOpen'); + lockIconClosed = this.filesFrame.contentWindow.document.getElementById('fmLockClosed'); this.lockedNav = false === this.lockedNav; - lockIcon.style.backgroundPosition = this.lockedNav ? "0 0" : "-16px 0"; + lockIconOpen.style.display = this.lockedNav ? "none" : "inline-block"; + lockIconClosed.style.display = this.lockedNav ? "inline-block" : "none"; }, // Show/hide the plugins on demand @@ -3950,11 +3951,11 @@ var ICEcoder = { var statusArray = JSON.parse(xhr.responseText); // console.log(statusArray); - get('bugIcon').style.backgroundPosition = - statusArray['result'] == "off" ? "0 0" : - statusArray['result'] == "ok" ? "-32px 0" : - statusArray['result'] == "bugs" ? "-48px 0" : - "-16px 0"; // if the result is 'error' or another value + get('bugIcon').style.color = + statusArray['result'] == "off" ? "" : + statusArray['result'] == "ok" ? "#080" : + statusArray['result'] == "bugs" ? "#b00" : + "#f80"; // if the result is 'error' or another value ic.bugReportStatus = statusArray['result']; if (ic.bugFilesSizesSeen[0]=="null") { ic.bugFilesSizesSeen = statusArray['filesSizesSeen']; diff --git a/files.php b/files.php index 9dcc410..3a7b777 100644 --- a/files.php +++ b/files.php @@ -21,9 +21,9 @@ $t = $text['files']; -
-
-
+
">
">
+
+