cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another NanoUI fix

Browse Source 
- Rewrote CSS fix to utilize inheritance
- Added some removed code I missed in the first commit
This commit is contained in:
Loganbacca
2014-11-25 23:14:42 +13:00
parent 2ab9c4354d
commit 8538c7fe81
4 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
nano/css/shared.css
View File

@@ -30,7 +30,7 @@ hr {
height: 1px; height: 1px;
} }
.link, .linkOn, .linkOff, .selected, .disabled { .link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton {
float: left; float: left;
min-width: 15px; min-width: 15px;
height: 16px; height: 16px;
@@ -174,33 +174,11 @@ h4 {
} }
.redButton { .redButton {
float: left;
min-width: 15px;
height: 16px;
text-align: center;
color: #ffffff;
text-decoration: none;
background: #ea0000; background: #ea0000;
border: 1px solid #161616;
padding: 0px 4px 4px 4px;
margin: 0 2px 2px 0;
cursor: default;
white-space: nowrap;
} }
.yellowButton { .yellowButton {
float: left;
min-width: 15px;
height: 16px;
text-align: center;
color: #ffffff;
text-decoration: none;
background: #cacc00; background: #cacc00;
border: 1px solid #161616;
padding: 0px 4px 4px 4px;
margin: 0 2px 2px 0;
cursor: default;
white-space: nowrap;
} }
.highlight { .highlight {

4
nano/templates/advanced_airlock_console.tmpl
View File

@@ -40,8 +40,8 @@
{{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, data.processing ? 'disabled' : null)}} {{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, data.processing ? 'disabled' : null)}}
</div> </div>
<div class="itemContent" style="padding-top: 2px"> <div class="itemContent" style="padding-top: 2px">
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? null : null)}} {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowButton' : null)}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? null : null)}} {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowButton' : null)}}
</div> </div>
</div> </div>
<div style="padding-left: 10px; width: 80px; float: left"> <div style="padding-left: 10px; width: 80px; float: left">

20
nano/templates/docking_airlock_console.tmpl
View File

@@ -11,7 +11,7 @@
<span class="bad" style="float:left">DOCKED-OVERRIDE ENABLED</span> <span class="bad" style="float:left">DOCKED-OVERRIDE ENABLED</span>
{{/if}} {{/if}}
<span style="float:right"> <span style="float:right">
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}} {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
</span> </span>
</div> </div>
{{else data.docking_status == "docking"}} {{else data.docking_status == "docking"}}
@@ -22,7 +22,7 @@
<span class="bad" style="float:left">DOCKING-OVERRIDE ENABLED</span> <span class="bad" style="float:left">DOCKING-OVERRIDE ENABLED</span>
{{/if}} {{/if}}
<span style="float:right"> <span style="float:right">
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}} {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
</span> </span>
</div> </div>
{{else data.docking_status == "undocking"}} {{else data.docking_status == "undocking"}}
@@ -33,7 +33,7 @@
<span class="bad" style="float:left">UNDOCKING-OVERRIDE ENABLED</span> <span class="bad" style="float:left">UNDOCKING-OVERRIDE ENABLED</span>
{{/if}} {{/if}}
<span style="float:right"> <span style="float:right">
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}} {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
</span> </span>
</div> </div>
{{else data.docking_status == "undocked"}} {{else data.docking_status == "undocked"}}
@@ -44,12 +44,12 @@
<span class="bad" style="float:left">OVERRIDE ENABLED</span> <span class="bad" style="float:left">OVERRIDE ENABLED</span>
{{/if}} {{/if}}
<span style="float:right"> <span style="float:right">
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}} {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
</span> </span>
</div> </div>
{{else}} {{else}}
<span class="bad">ERROR</span> <span class="bad">ERROR</span>
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}} {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@@ -78,19 +78,19 @@
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, 'disabled', null)}} {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, 'disabled', null)}}
{{else}} {{else}}
{{if data.interior_status.state == "open"}} {{if data.interior_status.state == "open"}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, null)}} {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redButton')}}
{{else}} {{else}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? null : null)}} {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowButton' : null)}}
{{/if}} {{/if}}
{{if data.exterior_status.state == "open"}} {{if data.exterior_status.state == "open"}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, null)}} {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redButton')}}
{{else}} {{else}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? null : null)}} {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowButton' : null)}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
<div class="item" style="padding-top: 10px; width: 100%"> <div class="item" style="padding-top: 10px; width: 100%">
{{:helper.link('Abort', 'cancel', {'command' : 'abort'}, (data.processing && !data.airlock_disabled) ? null : 'disabled', (data.processing && !data.airlock_disabled) ? null : null)}} {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, (data.processing && !data.airlock_disabled) ? null : 'disabled', (data.processing && !data.airlock_disabled) ? 'redButton' : null)}}
</div> </div>
</div> </div>

10
nano/templates/simple_airlock_console.tmpl
View File

@@ -19,18 +19,18 @@
</div> </div>
<div class="itemContent" style="padding-top: 2px; width: 100%"> <div class="itemContent" style="padding-top: 2px; width: 100%">
{{if data.interior_status.state == "open"}} {{if data.interior_status.state == "open"}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, null)}} {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redButton')}}
{{else}} {{else}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? null : null)}} {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowButton' : null)}}
{{/if}} {{/if}}
{{if data.exterior_status.state == "open"}} {{if data.exterior_status.state == "open"}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, null)}} {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redButton')}}
{{else}} {{else}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? null : null)}} {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowButton' : null)}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
<div class="item" style="padding-top: 10px; width: 100%"> <div class="item" style="padding-top: 10px; width: 100%">
{{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? null : null)}} {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? 'redButton' : null)}}
</div> </div>
</div> </div>