Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-10 15:15:34 +00:00
Code Issues Projects Releases Wiki Activity

Minor CSS refactor, outfit page tweak

Browse Source
This commit is contained in:
Colin McLeod
2015-06-23 23:45:30 -07:00
parent ba2e9a12b0
commit 44de3e4bbc
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/js/app.js
View File

@@ -2,14 +2,11 @@ angular.module('app', ['ui.router', 'ct.ui.router.extras.sticky', 'ui.sortable',
.run(['$rootScope', '$location', '$window', '$document', '$state', 'commonArray', 'shipPurpose', 'shipSize', 'hardPointClass', 'GroupMap', 'Persist', .run(['$rootScope', '$location', '$window', '$document', '$state', 'commonArray', 'shipPurpose', 'shipSize', 'hardPointClass', 'GroupMap', 'Persist',
function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hpc, GroupMap, Persist) { function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hpc, GroupMap, Persist) {
// App is running as a standalone web app on tablet/mobile // App is running as a standalone web app on tablet/mobile
var isStandAlone; var isStandAlone = false;
// This was causing issues on Windows phones ($window.external was causing Angular js to throw an exception). Backup is to try this and set isStandAlone to false if this fails. // This was causing issues on Windows phones ($window.external was causing Angular js to throw an exception). Backup is to try this and set isStandAlone to false if this fails.
try { try {
isStandAlone = $window.navigator.standalone || ($window.external && $window.external.msIsSiteMode && $window.external.msIsSiteMode()); isStandAlone = $window.navigator.standalone || ($window.external && $window.external.msIsSiteMode && $window.external.msIsSiteMode());
} } catch (ex) { }
catch (ex) {
isStandAlone = false;
}
// Redirect any state transition errors to the error controller/state // Redirect any state transition errors to the error controller/state
$rootScope.$on('$stateChangeError', function(e, toState, toParams, fromState, fromParams, error) { $rootScope.$on('$stateChangeError', function(e, toState, toParams, fromState, fromParams, error) {

4
app/less/outfit.less
View File

@@ -152,7 +152,7 @@ table.total {
width: 100%; width: 100%;
}); });
&.dbl { &.half {
width: 50%; width: 50%;
.tablet({ .tablet({
@@ -166,7 +166,7 @@ table.total {
}); });
} }
&.semi { &.third {
width: 33%; width: 33%;
.smallTablet({ .smallTablet({

14
app/views/page-outfit.html
View File

@@ -196,7 +196,7 @@
</div> </div>
</div> </div>
<div class="group dbl" id="componentPriority"> <div class="group half" id="componentPriority">
<table style="width:100%"> <table style="width:100%">
<thead> <thead>
<tr class="main"> <tr class="main">
@@ -236,7 +236,7 @@
<div style="margin-top: 1em" power-bands bands="priorityBands" available="ship.powerAvailable"></div> <div style="margin-top: 1em" power-bands bands="priorityBands" available="ship.powerAvailable"></div>
</div> </div>
<div class="group dbl"> <div class="group half">
<table style="width:100%"> <table style="width:100%">
<thead> <thead>
<tr class="main"> <tr class="main">
@@ -264,22 +264,24 @@
</table> </table>
</div> </div>
<div class="group semi"> <div class="group half">
<h1>Jump Range</h1> <h1>Jump Range</h1>
<div line-chart config="jrChart" series="jrSeries"></div> <div line-chart config="jrChart" series="jrSeries"></div>
</div> </div>
<div class="group semi"> <div class="group half">
<h1>Total Range</h1> <h1>Total Range</h1>
<div line-chart config="trChart" series="trSeries"></div> <div line-chart config="trChart" series="trSeries"></div>
</div> </div>
<div class="group semi"> <!-- TODO: Add back in once calcSpeed is dynamic and accurate
<div class="group third">
<h1>Thruster Speed</h1> <h1>Thruster Speed</h1>
<div line-chart config="speedChart" series="speedSeries"></div> <div line-chart config="speedChart" series="speedSeries"></div>
</div> </div>
-->
<div class="group dbl"> <div class="group half">
<div slider max="ship.fuelCapacity" unit="'T'" on-change="::fuelChange(val)" style="position:relative; margin: 0 auto;"> <div slider max="ship.fuelCapacity" unit="'T'" on-change="::fuelChange(val)" style="position:relative; margin: 0 auto;">
<svg class="icon xl primary-disabled" style="position:absolute;height: 100%;"><use xlink:href="#fuel"></use></svg> <svg class="icon xl primary-disabled" style="position:absolute;height: 100%;"><use xlink:href="#fuel"></use></svg>
</div> </div>