From aa43e97c6cd9c0dec7a47ad726e23bedbabaf066 Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Tue, 24 Nov 2015 23:35:58 -0800
Subject: [PATCH] Small tweaks to multiblock display

---
 src/coffee/controllers/stack_controller.coffee | 4 +++-
 src/jade/templates/multiblock_viewer.jade      | 6 +++---
 src/scss/templates/multiblock_viewer.scss      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/coffee/controllers/stack_controller.coffee b/src/coffee/controllers/stack_controller.coffee
index 148667869..17a476b0f 100644
--- a/src/coffee/controllers/stack_controller.coffee
+++ b/src/coffee/controllers/stack_controller.coffee
@@ -126,7 +126,9 @@ module.exports = class StackController extends BaseController
         @imageLoader.load display.iconUrl, @$image
         @$nameLink.html display.itemName
         @$nameLink.attr 'href', display.itemUrl
-        @$quantityField.val @model.quantity
+
+        quantityText = if @model.quantity > 1000 then "#{@model.quantity / 1000}k" else "#{@model.quantity}"
+        @$quantityField.val quantityText
 
         @_updateButtonType @$firstButton, @firstButtonType
         @_updateButtonType @$secondButton, @secondButtonType
diff --git a/src/jade/templates/multiblock_viewer.jade b/src/jade/templates/multiblock_viewer.jade
index a93f8faad..d36ece823 100644
--- a/src/jade/templates/multiblock_viewer.jade
+++ b/src/jade/templates/multiblock_viewer.jade
@@ -7,11 +7,11 @@
 
 .view__multiblock_viewer
     .left
-        h3 Current Layer
-        .view__inventory.layer
-
         h3 Complete Materials
         .view__inventory.complete
+
+        h3 Current Layer
+        .view__inventory.layer
     .right
         .caption
             img
diff --git a/src/scss/templates/multiblock_viewer.scss b/src/scss/templates/multiblock_viewer.scss
index d16ef2421..1db1f3326 100644
--- a/src/scss/templates/multiblock_viewer.scss
+++ b/src/scss/templates/multiblock_viewer.scss
@@ -7,7 +7,7 @@ All rights reserved.
 
 .view__multiblock_viewer {
     display: flex;
-    align-items: flex-start;
+    align-items: stretch;
 
     h3 {
         margin-bottom: 1em;