cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10295 from tigercat2000/nano_revert

Browse Source 
Fancy-nanoUI revert
This commit is contained in:
variableundefined
2018-11-21 07:09:17 +08:00
committed by GitHub
parent f7f7e20a69 137f6c5306
commit 2adbc9dca8
17 changed files with 211 additions and 21976 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nano/Gulpfile.js
+5 -38
View File
@@ -30,8 +30,6 @@ const output = {
/* Dependencies */
var bower = require("main-bower-files");
var child_process = require("child_process");
var fs = require("fs");
var path = require("path");
var del = require("del");
var gulp = require("gulp");
var merge = require("merge-stream");
@@ -52,7 +50,7 @@ const glob = function (path) {
return `${path}/*`;
};
var minify = ((process.env.NODE_ENV || 'development').trim().toLowerCase() === 'production');
var minify = util.env["min"];
/*------Task Section------*/
@@ -60,9 +58,7 @@ var minify = ((process.env.NODE_ENV || 'development').trim().toLowerCase() === '
* Type: Default/Main
* Just runs the rest of the compilation tasks.
*/
gulp.task("default", ["fonts", "scripts", "styles"], function () {
console.log("Finished...", (minify ? "With minification" : ""))
});
gulp.task("default", ["fonts", "scripts", "styles"]);
/* Task: Clean
* Type: Dependency.
@@ -95,41 +91,12 @@ gulp.task("watch", function () {
* Run whenever a file is changed. Recompiles and pushes all changes directly to the local BYOND client cache.
*/
gulp.task("reload", ["default"], function () {
child_process.exec("reload.bat", function (err, stdout) {
if (err)
throw err;
var byond_cache = path.join(stdout.trim(), "BYOND", "cache");
var files = fs.readdirSync(byond_cache);
for (let file of files) {
let filepath = path.join(byond_cache, file);
let stats = fs.statSync(filepath)
if (file.startsWith("tmp") && stats.isDirectory()) {
var tmpFiles = fs.readdirSync(filepath);
if (tmpFiles.includes(output.scripts.main)) {
setTimeout(function () {transfer_files(filepath)}, 500);
}
}
}
child_process.exec("reload.bat", function (err, stdout, stderr) {
if(err)
return console.log(err);
});
});
function transfer_files(target) {
let transfer = [input.images, input.layouts, input.templates, output._dir];
for (let trf of transfer) {
let files = fs.readdirSync(trf)
for (let file of files) {
let fileData = fs.statSync(path.join(trf, file))
if (fileData.isFile())
transfer_file(path.join(trf, file), path.join(target, file))
}
}
}
function transfer_file(input, target) {
fs.createReadStream(input).pipe(fs.createWriteStream(target))
}
/*---Buildtasks---*/
/* Task: Fonts
nano/README.md
+1 -1
View File
@@ -101,5 +101,5 @@ of the `Gulpfile.js` and `Gulpfile.coffee` files to perform compilation tasks.
In order to build an un-minified version of NanoUI, you may simply run `gulp` in the
`nanoui` directory. However, this should only be used while testing, and you should run
the command `export NODE_ENV=production; gulp` before commiting changes, in order to produce minified
the command `gulp --min` before commiting changes, in order to produce minified
JavaScript.
nano/assets/libraries.min.js
Vendored
+1 -14598
View File
File diff suppressed because one or more lines are too long
nano/assets/nano.js
+1 -1529
View File
File diff suppressed because one or more lines are too long
nano/assets/nanoui.css
+4 -5382
View File
File diff suppressed because one or more lines are too long
nano/images/br.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 722 B

nano/images/tl.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 694 B

nano/images/tr.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 84 B

nano/layouts/layout_default.tmpl
+28 -40
View File
@@ -1,49 +1,37 @@
<div id='uiCornerBR' class='fancy'>&nbsp;</div>
<div id='uiTitleWrapper'>
<div id='uiCornerTL' class='fancy'>&nbsp;</div>
<div id='uiCornerTR' class='fancy'>&nbsp;</div>
<i class="statusicon fa fa-eye fa-2x" unselectable="on"></i>
<div id='uiTitleText' unselectable="on">{{:config.title}}</div>
<div id='uiTitleFluff' unselectable="on"></div>
<i class='minimize fancy fa fa-minus fa-2x' unselectable='on'></i>
<i class='close fancy fa fa-close fa-2x' unselectable='on'></i>
&nbsp;&nbsp;<i class='close fancy fa fa-close fa-2x' unselectable='on'></i>
</div>
<div class='fancy resizeArea top' rx='0' ry='-1'></div>
<div class='fancy resizeArea tr' rx='1' ry='-1'></div>
<div class='fancy resizeArea right' rx='1' ry='0'></div>
<div class='fancy resizeArea br' rx='1' ry='1'></div>
<div class='fancy resizeArea bottom' rx='0' ry='1'></div>
<div class='fancy resizeArea bl' rx='-1' ry='1'></div>
<div class='fancy resizeArea left' rx='-1' ry='0'></div>
<div class='fancy resizeArea tl' rx='-1' ry='-1'></div>
<div id='cornerWrapper'>
<div id='uiMapWrapper' class="hidden" unselectable="on">
<div id='uiMapHeader' unselectable="on">
{{:helper.link('Hide Map', 'close', {'showMap' : 0})}}
<div style="float: right; width: 240px;">
<span style="float: left;">Zoom Level:&nbsp;</span>
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="6">x1.5</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="8">x2.0</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="12">x2.5</div>
</div>
<!-- Add a template with the key "mapHeader" to have it rendered here -->
</div>
<div id='uiMapContainer' unselectable="on">
<div id='uiMap' unselectable="on">
<img id="uiMapImage" src="{{:config.map}}_nanomap_z{{:config.mapZLevel}}.png" width="256" height="256" unselectable="on" />
<div id='uiMapContent' unselectable="on">
<!-- Add a template with the key "mapContent" to have it rendered here (on the map) -->
<!-- Having a "mapContent" template enables the map functionality -->
</div>
</div>
<div id="uiMapTooltip"></div>
</div>
<div id='uiMapFooter' unselectable="on">
<!-- Add a template with the key "mapFooter" to have it rendered here -->
<div id='uiMapWrapper' class="hidden" unselectable="on">
<div id='uiMapHeader' unselectable="on">
{{:helper.link('Hide Map', 'close', {'showMap' : 0})}}
<div style="float: right; width: 240px;">
<span style="float: left;">Zoom Level:&nbsp;</span>
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="6">x1.5</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="8">x2.0</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="12">x2.5</div>
</div>
<!-- Add a template with the key "mapHeader" to have it rendered here -->
</div>
<div id='uiContent' unselectable="on">
<div id='uiLoadingNotice'>Initiating...</div>
<div id='uiMapContainer' unselectable="on">
<div id='uiMap' unselectable="on">
<img id="uiMapImage" src="{{:config.map}}_nanomap_z{{:config.mapZLevel}}.png" width="256" height="256" unselectable="on" />
<div id='uiMapContent' unselectable="on">
<!-- Add a template with the key "mapContent" to have it rendered here (on the map) -->
<!-- Having a "mapContent" template enables the map functionality -->
</div>
</div>
<div id="uiMapTooltip"></div>
</div>
</div>
<div id='uiMapFooter' unselectable="on">
<!-- Add a template with the key "mapFooter" to have it rendered here -->
</div>
</div>
<div id='uiContent' unselectable="on">
<div id='uiLoadingNotice'>Initiating...</div>
</div>
<div id='resize' class='resize fancy' unselectable='on'></div>
nano/layouts/layout_program.tmpl
+67 -76
View File
@@ -1,84 +1,75 @@
<div id='uiTitleWrapper'>
<div id='uiCornerTL' class='fancy'>&nbsp;</div>
<i class="statusicon fa fa-eye fa-2x" unselectable="on"></i>
<div id='uiTitleText' unselectable="on">{{:config.title}}</div>
<div id='uiTitleFluff' unselectable="on"></div>
<i class='minimize fancy fa fa-minus fa-2x' unselectable='on'></i>
<i class='close fancy fa fa-close fa-2x' unselectable='on'></i>
<div id='uiCornerTR' class='fancy'>&nbsp;</div>
&nbsp;&nbsp;<i class='close fancy fa fa-close fa-2x' unselectable='on'></i>
</div>
<div class='fancy resizeArea top' rx='0' ry='-1'></div>
<div class='fancy resizeArea tr' rx='1' ry='-1'></div>
<div class='fancy resizeArea right' rx='1' ry='0'></div>
<div class='fancy resizeArea br' rx='1' ry='1'></div>
<div class='fancy resizeArea bottom' rx='0' ry='1'></div>
<div class='fancy resizeArea bl' rx='-1' ry='1'></div>
<div class='fancy resizeArea left' rx='-1' ry='0'></div>
<div class='fancy resizeArea tl' rx='-1' ry='-1'></div>
<div id='cornerWrapper'>
<div class="floatLeft">
<div class='item'>
<table><tr>
{{if data.PC_batteryicon && data.PC_showbatteryicon}}
<td><img src='{{:data.PC_batteryicon}}'>
{{/if}}
{{if data.PC_batterypercent && data.PC_showbatteryicon}}
<td><b>{{:data.PC_batterypercent}}</b>
{{/if}}
{{if data.PC_ntneticon}}
<td><img src='{{:data.PC_ntneticon}}'>
{{/if}}
{{if data.PC_apclinkicon}}
<td><img src='{{:data.PC_apclinkicon}}'>
{{/if}}
{{if data.PC_stationtime}}
<td><b>{{:data.PC_stationtime}}<b>
{{/if}}
{{for data.PC_programheaders}}
<td><img src='{{:value.icon}}'>
{{/for}}
</table>
</div>
</div>
<div class="floatRight">
<div class='item'>
<table><tr>
<td>{{:helper.link('Shutdown', 'power-off', {'action' : 'PC_shutdown'})}}
{{if data.PC_showexitprogram}}
<td>{{:helper.link('EXIT PROGRAM', 'times', {'action' : 'PC_exit'})}}
<td>{{:helper.link('Minimize Program', 'minus', {'action' : 'PC_minimize'})}}
{{/if}}
</table>
</div>
</div>
<div id='uiMapWrapper' class="hidden" unselectable="on">
<div id='uiMapHeader' unselectable="on">
{{:helper.link('Hide Map', 'close', {'showMap' : 0})}}
<div style="float: right; width: 240px;">
<span style="float: left;">Zoom Level:&nbsp;</span>
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="6">x1.5</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="8">x2.0</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="12">x2.5</div>
</div>
<!-- Add a template with the key "mapHeader" to have it rendered here -->
</div>
<div id='uiMapContainer' unselectable="on">
<div id='uiMap' unselectable="on">
<img id="uiMapImage" src="{{:config.map}}_nanomap_z{{:config.mapZLevel}}.png" width="256" height="256" unselectable="on" />
<div id='uiMapContent' unselectable="on">
<!-- Add a template with the key "mapContent" to have it rendered here (on the map) -->
<!-- Having a "mapContent" template enables the map functionality -->
</div>
</div>
<div id="uiMapTooltip"></div>
</div>
<div id='uiMapFooter' unselectable="on">
<!-- Add a template with the key "mapFooter" to have it rendered here -->
</div>
</div>
<div class="clearBoth" id='uiContent' unselectable="on">
<div id='uiLoadingNotice'>Initiating...</div>
<div class="floatLeft">
<div class='item'>
<table><tr>
{{if data.PC_batteryicon && data.PC_showbatteryicon}}
<td><img src='{{:data.PC_batteryicon}}'>
{{/if}}
{{if data.PC_batterypercent && data.PC_showbatteryicon}}
<td><b>{{:data.PC_batterypercent}}</b>
{{/if}}
{{if data.PC_ntneticon}}
<td><img src='{{:data.PC_ntneticon}}'>
{{/if}}
{{if data.PC_apclinkicon}}
<td><img src='{{:data.PC_apclinkicon}}'>
{{/if}}
{{if data.PC_stationtime}}
<td><b>{{:data.PC_stationtime}}<b>
{{/if}}
{{for data.PC_programheaders}}
<td><img src='{{:value.icon}}'>
{{/for}}
</table>
</div>
</div>
<div class="floatRight">
<div class='item'>
<table><tr>
<td>{{:helper.link('Shutdown', 'power-off', {'action' : 'PC_shutdown'})}}
{{if data.PC_showexitprogram}}
<td>{{:helper.link('EXIT PROGRAM', 'times', {'action' : 'PC_exit'})}}
<td>{{:helper.link('Minimize Program', 'minus', {'action' : 'PC_minimize'})}}
{{/if}}
</table>
</div>
</div>
<div id='uiMapWrapper' class="hidden" unselectable="on">
<div id='uiMapHeader' unselectable="on">
{{:helper.link('Hide Map', 'close', {'showMap' : 0})}}
<div style="float: right; width: 240px;">
<span style="float: left;">Zoom Level:&nbsp;</span>
<div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="6">x1.5</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="8">x2.0</div>
<div unselectable="on" class="link zoomLink" data-zoom-level="12">x2.5</div>
</div>
<!-- Add a template with the key "mapHeader" to have it rendered here -->
</div>
</div>
<div id='uiMapContainer' unselectable="on">
<div id='uiMap' unselectable="on">
<img id="uiMapImage" src="{{:config.map}}_nanomap_z{{:config.mapZLevel}}.png" width="256" height="256" unselectable="on" />
<div id='uiMapContent' unselectable="on">
<!-- Add a template with the key "mapContent" to have it rendered here (on the map) -->
<!-- Having a "mapContent" template enables the map functionality -->
</div>
</div>
<div id="uiMapTooltip"></div>
</div>
<div id='uiMapFooter' unselectable="on">
<!-- Add a template with the key "mapFooter" to have it rendered here -->
</div>
</div>
<div class="clearBoth" id='uiContent' unselectable="on">
<div id='uiLoadingNotice'>Initiating...</div>
</div>
<div id='resize' class='resize fancy' unselectable='on'></div>
nano/reload.bat
+3 -1
View File
@@ -6,4 +6,6 @@ for /f "tokens=3* delims= " %%a in (
set documents=%%a
)
echo %documents%
copy assets\* "%documents%\BYOND\cache" /y
copy templates\* "%documents%\BYOND\cache" /y
copy layouts\* "%documents%\BYOND\cache" /y
nano/scripts/nano/nano_utility.js
+2 -3
View File
@@ -85,10 +85,9 @@ if (typeof doT == 'undefined') {
reportError('ERROR: Template engine failed to load!');
}
var reportError = function (str, silent) {
var reportError = function (str) {
window.location = "byond://?nano_err=" + encodeURIComponent(str);
if(!silent)
alert(str);
alert(str);
}
// All scripts are initialised here, this allows control of init order
nano/scripts/nano/nano_window.js
+62 -153
View File
@@ -1,9 +1,5 @@
var NanoWindow = function ()
{
var offsetX, offsetY;
var minWidth = 280;
var minHeight = 140;
var setPos = function (x, y) {
NanoUtility.winset("pos", x + "," + y);
};
@@ -11,73 +7,19 @@ var NanoWindow = function ()
NanoUtility.winset("size", w + "," + h);
};
var obeyLimits = function () {
// Alignment (Thanks Goon (CC BY-NC-SA v3))
var prevX = window.screenLeft;
var prevY = window.screenTop;
//Put the window at top left
setPos(0, 0);
//Get any offsets still present
offsetX = window.screenLeft;
offsetY = window.screenTop;
// Clamp it to the viewport
var clampedX = prevX - offsetX;
var clampedY = prevY - offsetY;
clampedX = clampedX < offsetX ? 0 : clampedX;
clampedY = clampedY < offsetY ? 0 : clampedY;
// Put it back
setPos(clampedX, clampedY)
// Done with alignment
// Size constraints
var width = document.body.offsetWidth;
var height = Math.max(document.body.scrollHeight, document.body.offsetHeight,
document.documentElement.clientHeight, document.documentElement.scrollHeight, document.documentElement.offsetHeight);
var newWidth = Math.max(minWidth, width);
var newHeight = Math.max(minHeight, height);
setSize(newWidth, newHeight);
};
var init = function () {
/* We want nanoUI windows to obey the limits regardless,
and we're hijacking this library to do so, even if fancy mode is turned off.
To be fair, this doesn't stop the user from shrinking them past their intended limit when they're not in fancy mode,
but it's a nice safeguard against shoddily-coded UIs. */
setupScroll();
obeyLimits();
if(!NanoStateManager.getData().config.user.fancy) {
return
if(NanoStateManager.getData().config.user.fancy) {
fancyChrome();
attachButtons();
attachDragAndResize();
}
fancyChrome();
// ... but when fancy mode is turned on, we have to do it again to make sure
// that the window offsets are correct for the slightly different window.
obeyLimits();
attachButtons();
attachDragAndResize();
};
var setupScroll = function() {
$("#cornerWrapper").focus();
$("#uiContent").on("click", function (event) {
event = event || window.event;
event.stopPropagation();
$("#cornerWrapper").focus();
})
};
var fancyChrome = function() {
NanoUtility.winset("titlebar", 0);
NanoUtility.winset("can-resize", 0);
NanoUtility.winset("transparent-color", "#FF00E4")
$('.fancy').show();
$('#uiTitleFluff').css("right", "72px");
$('.statusicon').css("left", "34px");
$('#uiTitleText').css("left", "66px");
$('#uiTitleFluff').css("right", "65px");
};
var attachButtons = function() {
var close = function() {
return NanoUtility.close();
@@ -92,115 +34,82 @@ var NanoWindow = function ()
minimize();
});
};
var attachDragAndResize = function() {
/* Drag */
$("body").on("mousemove", "#uiTitleWrapper", function (ev) {
drag(ev);
$(document).on("mousemove", function (event) {
drag();
resize();
});
$("body").on("mousedown", "#uiTitleWrapper", function () {
$(document).on("mouseup", function (event) {
if(dragging) {
dragging = false;
xDrag = null;
yDrag = null;
}
if(resizing) {
resizing = false;
xResize = null;
yResize = null;
}
});
$("#uiTitleWrapper").on("mousedown", function (event) {
dragging = true;
if ($(this)[0].setCapture) { $(this)[0].setCapture(); }
});
$("body").on("mouseup", "#uiTitleWrapper", function () {
dragging = false;
if ($(this)[0].releaseCapture) { $(this)[0].releaseCapture(); }
});
/* Resize */
$("body").on("mousemove", "div.resizeArea", function (ev) {
resize.call(this, ev);
});
$("body").on("mousedown", "div.resizeArea", function () {
$("#resize").on("mousedown", function (event) {
resizing = true;
if (this.setCapture) { this.setCapture(); }
})
$("body").on("mouseup", "div.resizeArea", function () {
resizing = false;
if (this.releaseCapture) { this.releaseCapture(); }
});
};
/* Stolen Goon code ftw (CC BY-NC-SA v3.0) */
var dragging, lastX, lastY;
var drag = function (ev) {
ev = ev || window.event;
if (lastX === ev.screenX && lastY === ev.screenY) {
return
var dragging, xDrag, yDrag;
var drag = function(event) {
var x, y;
if (event == null) {
event = window.event;
}
if (lastX === undefined) {
lastX = ev.screenX;
lastY = ev.clientY;
}
if (dragging) {
var dx = (ev.screenX - lastX);
var dy = (ev.screenY - lastY);
dx += window.screenLeft - offsetX;
dy += window.screenTop - offsetY;
setPos(dx, dy);
}
lastX = ev.screenX;
lastY = ev.screenY;
}
var resizing, resizeWorking
var resize = function (ev) {
if (resizeWorking) {
if (!dragging) {
return;
}
resizeWorking = true;
ev = ev || window.event;
if (lastX === undefined) {
lastX = ev.screenX - offsetX;
lastY = ev.screenY - offsetY;
if (xDrag == null) {
xDrag = event.screenX;
}
if (resizing) {
var width = document.body.offsetWidth;
var height = Math.max(document.body.scrollHeight, document.body.offsetHeight,
document.documentElement.clientHeight, document.documentElement.scrollHeight, document.documentElement.offsetHeight);
var rx = Number($(this).attr("rx"));
var ry = Number($(this).attr("ry"));
var dx = ((ev.screenX-offsetX) - lastX);
var dy = ((ev.screenY-offsetY) - lastY);
var newX = window.screenLeft - offsetX;
var newY = window.screenTop - offsetY;
var newW = width + (dx * rx);
if(rx == -1){
newX += dx;
}
var newH = height + (dy * ry);
if(ry == -1){
newY += dy;
}
newW = Math.max(minWidth, newW);
newH = Math.max(minHeight, newH);
setPos(newX, newY);
setSize(newW, newH);
if (yDrag == null) {
yDrag = event.screenY;
}
lastX = ev.screenX - offsetX;
lastY = ev.screenY - offsetY;
x = (event.screenX - xDrag) + (window.screenLeft);
y = (event.screenY - yDrag) + (window.screenTop);
resizeWorking = false;
setPos(x, y);
xDrag = event.screenX;
yDrag = event.screenY;
};
/* End stolen Goon code */
var resizing, xResize, yResize;
var resize = function() {
var x, y;
if (event == null) {
event = window.event;
}
if (!resizing) {
return;
}
if (xResize == null) {
xResize = event.screenX;
}
if (yResize == null) {
yResize = event.screenY;
}
x = Math.max(150, (event.screenX - xResize) + window.innerWidth);
y = Math.max(150, (event.screenY - yResize) + window.innerHeight);
setSize(x, y);
xResize = event.screenX;
yResize = event.screenY;
};
return {
init: function () { //crazy but ensures correct load order (nanoutil - nanotemplate - nanowindow)
$(document).on('templatesLoaded', function () {
nano/styles/_fancy.less
-85
View File
@@ -1,85 +0,0 @@
#cornerWrapper {
position: absolute;
top: 30px;
bottom: 0;
right: 0;
left: 0;
padding: 0 8px 0 8px;
clear: both;
overflow: auto;
border: 3px solid #363636;
background: data-uri('nanotrasen.svg') no-repeat fixed center/70% 70%,
linear-gradient(to bottom,
@background-start 0%,
@background-end 100%) no-repeat fixed center/100% 100% !important;
}
#uiContent {
padding: 15px;
overflow: hidden;
}
/* Resizing (Stolen from Goon CC-BY-NC-SA) */
@resize: 5px;
.resizeArea {
position: absolute;
z-index: 99999;
}
.resizeArea.top {
top: 0;
left: 10px;
right: 10px;
height: @resize;
cursor: n-resize;
}
.resizeArea.tr {
top: 0;
right: 0;
height: 10px;
width: 10px;
cursor: ne-resize;
}
.resizeArea.right {
top: 10px;
right: 0;
bottom: 10px;
width: @resize;
cursor: e-resize;
}
.resizeArea.br {
bottom: 0;
right: 0;
height: 10px;
width: 10px;
cursor: se-resize;
}
.resizeArea.bottom {
bottom: 0;
left: 10px;
right: 10px;
height: @resize;
cursor: s-resize;
}
.resizeArea.bl {
bottom: 0;
left: 0;
height: 10px;
width: 10px;
cursor: sw-resize;
}
.resizeArea.left {
top: 10px;
left: 0;
bottom: 10px;
width: @resize;
cursor: w-resize;
}
.resizeArea.tl {
top: 0;
left: 0;
height: 10px;
width: 10px;
cursor: nw-resize;
}
/* End Resizing */
nano/styles/_formatting.less
+17 -6
View File
@@ -169,11 +169,6 @@
.titlebutton() {
color: #E9C183;
// Since we're on some hilariously outdated libraries, the below is an issue
// https://github.com/FortAwesome/Font-Awesome/issues/1274
// Using the !important directive is necessary to override the FA styles
cursor: pointer !important;
z-index: 102; // This is for the corners - makes sure the buttons render on top
&:hover {
color: lighten(#98b0c3, 10%);
@@ -190,4 +185,20 @@
position: absolute;
top: 4px;
right: 12px;
}
}
div.resize {
position: fixed;
bottom: 0;
right: 0;
width: 0;
height: 0;
border-style: solid;
border-width: 0 0 30px 30px;
border-color: transparent transparent #363636 transparent;
transform: rotate(360deg);
cursor: nwse-resize;
}
nano/styles/nanoui.less
+16 -34
View File
@@ -5,7 +5,6 @@
@import "_color";
@import "_config";
@import "_display";
@import "_fancy";
@import "_formatting";
@import "_icon";
@import "_lists";
@@ -13,8 +12,16 @@
@import "_native";
@import "_tooltip";
body {
background: data-uri('nanotrasen.svg') no-repeat fixed center/70% 70%,
linear-gradient(to bottom,
@background-start 0%,
@background-end 100%) no-repeat fixed center/100% 100%;
}
//nano scrollbar styling
html, body {
html,body {
scrollbar-face-color:#666666;
scrollbar-arrow-color:#E9C183;
scrollbar-track-color:#363636;
@@ -34,7 +41,6 @@ html, body {
min-width: 100%;
background-color: #363636;
top: 0px;
right: 0px;
overflow: hidden;
z-index: 100;
& > div {
@@ -45,36 +51,6 @@ html, body {
}
}
.corner() {
position: fixed;
min-width: 30px;
background-color: #FF00E4;
z-index: 101;
min-height: 30px;
}
#uiCornerTL {
.corner;
top: 0px;
left: 0px;
background: data-uri('tl.gif') no-repeat;
}
#uiCornerTR {
.corner;
top: 0px;
right: 0px;
background: data-uri('tr.gif') no-repeat;
}
#uiCornerBR {
.corner;
bottom: 0px;
right: 0px;
background: data-uri('br.gif') no-repeat;
}
#uiTitleText {
position: absolute;
top: 6px;
@@ -158,6 +134,12 @@ html, body {
clear: both;
}
#uiContent {
clear: both;
padding: 8px;
margin-top: 30px;
}
#uiMapTooltip {
position: absolute;
right: 10px;
@@ -178,4 +160,4 @@ html, body {
font-weight: bold;
padding: 3px 4px 3px 4px;
margin: 4px 0 4px 0;
}
}
nano/templates/pda.tmpl
+4 -30
View File
@@ -6,12 +6,12 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
<head>
<style type="text/css">
html {
height: 100%;
height: 100%;
overflow: auto;
}
#cornerWrapper {
background: #6F7961 !important;
border: none;
body {
background: #6F7961;
}
.itemLabelNarrow, .itemLabel, .itemLabelWide, .itemLabelWider, .itemLabelWidest {
@@ -104,27 +104,10 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
#uiTitleText, #pdaFooter {
color: #000000;
}
#uiTitleWrapper {
background-color: #8C997B;
}
#uiTitleText {
left: 30px !important;
}
#uiCornerTL, #uiCornerTR,
#uiCornerBR, #uiCornerBL {
opacity: 0;
}
.pmon {
background: black;
}
.statusicon {
display: none;
}
.itemLabel {
color: black;
@@ -139,15 +122,6 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
}
</style>
</head>
{{else}}
<head>
<style type="text/css">
/* These things just don't render correctly at all for us */
#uiCornerBR, #uiCornerBL {
opacity: 0;
}
</style>
</head>
{{/if}}
{{if data.owner}}
<div class="item">