diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index f4181a7a..a4abdce3 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/remui/market.rcss b/EXE/remui/market.rcss index 61e89170..190ff7ce 100644 --- a/EXE/remui/market.rcss +++ b/EXE/remui/market.rcss @@ -1,7 +1,7 @@ /* the market's view (market.rml): its own window and the base manager's Galactic Market page (base.rml #mkt-pane, the same RML) - every rule under .mkt, beside the base manager's own */ .mkt .split { flex: 1; display: flex; flex-direction: row; min-height: 0; } -.mkt .goods { flex: 0 0 31%; display: flex; flex-direction: column; min-height: 0; margin-right: 18dp; } +.mkt .goods { flex: 0 0 34%; display: flex; flex-direction: column; min-height: 0; margin-right: 18dp; } .mkt .detail { flex: 1; display: flex; flex-direction: column; min-width: 0; min-height: 0; overflow-y: auto; } .mkt .list { flex: 1 1 0; min-height: 0; overflow-y: auto; } .mkt .g { display: flex; flex-direction: row; align-items: center; padding: 5dp 10dp; border-bottom: 1dp #ffffff08; border-left: 2dp #00000000; font-size: 14dp; } @@ -9,13 +9,13 @@ .mkt .g.selected { background-color: #f2b13c24; border-left-color: #f2b13c; } .mkt .g .n { flex: 1; } .mkt .g.quiet .n { color: #8197ad; } -.mkt .g .v { font-family: "IBM Plex Mono"; width: 62dp; text-align: right; font-size: 13dp; } +.mkt .g .v { font-family: "IBM Plex Mono"; width: 50dp; text-align: right; font-size: 13dp; } .mkt .g .v.s { color: #f2b13c; } .mkt .g .v.b { color: #5fd08a; } -.mkt .g .v.npc { color: #5cc8f0; } +.mkt .g .v.a { color: #dbe6f0; } .mkt .ghead { display: flex; flex-direction: row; padding: 0 10dp 4dp 12dp; font-size: 12dp; color: #8197ad; } .mkt .ghead .n { flex: 1; } -.mkt .ghead .v { width: 62dp; text-align: right; } +.mkt .ghead .v { width: 50dp; text-align: right; } .mkt .tools { display: flex; flex-direction: row; align-items: center; margin-bottom: 8dp; } .mkt .tools input { flex: 1; margin-right: 8dp; } .mkt .toggle { font-size: 13dp; color: #8197ad; padding: 4dp 8dp; border-bottom: 2dp #00000000; } @@ -23,7 +23,7 @@ .mkt .toggle:hover { color: #5cc8f0; } .mkt .ihead { display: flex; flex-direction: row; align-items: flex-end; margin-bottom: 8dp; } .mkt .ihead .t { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 22dp; color: #dbe6f0; flex: 1; } -.mkt .ihead .npc { font-size: 13dp; color: #5cc8f0; } +.mkt .ihead .prices { font-size: 13dp; color: #8197ad; } .mkt .chartbar { display: flex; flex-direction: row; align-items: center; margin-bottom: 6dp; } .mkt .chartbar .toggle { margin-right: 6dp; } .mkt .legend { margin-left: auto; font-size: 12dp; color: #8197ad; } @@ -34,7 +34,6 @@ .mkt .chart .col:hover { background-color: #5cc8f014; } .mkt .chart .mean { position: absolute; bottom: 0; left: 0; right: 0; background-color: #f2b13c55; border-top: 2dp #f2b13c; border-radius: 2dp 2dp 0 0; } .mkt .chart .band { position: absolute; left: 35%; width: 30%; min-height: 2dp; background-color: #dbe6f0cc; border-radius: 1dp; } -.mkt .chart .npc { position: absolute; left: 20%; width: 60%; height: 3dp; margin-bottom: -1dp; background-color: #5cc8f0; border-radius: 2dp; } .mkt .chart .empty { position: absolute; left: 0; right: 0; top: 80dp; text-align: center; color: #8197ad; } .mkt .axis { position: relative; height: 0; } .mkt .axis .y { position: absolute; left: 0; width: 70dp; text-align: right; font-family: "IBM Plex Mono"; font-size: 11dp; color: #8197ad; } diff --git a/EXE/remui/market.rml b/EXE/remui/market.rml index 758302d1..26d7e7b9 100644 --- a/EXE/remui/market.rml +++ b/EXE/remui/market.rml @@ -29,17 +29,18 @@ with orders
Only goods somebody offers or wants. Off: every commodity, to place a buy order for it.
-
Goodsellbuy
+
Goodsellbuyavg
{{ received ? 'No good matches.' : 'Asking the server...' }}
- {{ r.name }}{{ r.sell }}{{ r.buy }} + {{ r.name }}{{ r.sell }}{{ r.buy }}{{ r.avg }}
{{ has_item ? item_name : 'Pick a good' }} + {{ item_prices }}
30 days