From 549abc12248e32040f2cbd6c3e19475795f1ce65 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Sun, 4 Jan 2015 11:35:43 -0800 Subject: [PATCH] Improve layout of stacks in crafting table --- src/css/templates/crafting_table.scss | 23 +++++++++--------- src/css/templates/stack.scss | 16 +++++++----- src/data/minecraft/recipes.json | 10 ++++---- src/images/unknown.png | Bin 1733 -> 3210 bytes .../crafting_table_controller.coffee | 6 ++--- src/templates/crafting_table.jade | 18 +++++++------- src/templates/stack.jade | 8 +++--- 7 files changed, 43 insertions(+), 38 deletions(-) diff --git a/src/css/templates/crafting_table.scss b/src/css/templates/crafting_table.scss index 6de353af7..f505cb882 100644 --- a/src/css/templates/crafting_table.scss +++ b/src/css/templates/crafting_table.scss @@ -28,22 +28,23 @@ All rights reserved. margin-bottom: 0.5em; } - table { background: $color-table-background; width: 100%; } + table.main { + background: $color-table-background; width: 100%; - td { - border-left: 0.1em solid $color-gray-light; - padding: 0 1em 1em 1em; - width: 25%; + td.list { + position: relative; + border-left: 0.1em solid $color-gray-light; + min-height: 12em; + padding: 0 1em 1em 1em; + width: 25%; - &:first-child { border-left: 0; } + &:first-child { border-left: 0; } + } } - textarea, ul { - position: relative; + textarea, table.list { + position: relative; height: 100%; width: 100%; font-size: $font-size-normal; - width: 100%; - height: 100%; - min-height: 12em; padding: 0.2em; } diff --git a/src/css/templates/stack.scss b/src/css/templates/stack.scss index 25dd762c1..bd72e9f1c 100644 --- a/src/css/templates/stack.scss +++ b/src/css/templates/stack.scss @@ -6,25 +6,29 @@ All rights reserved. */ .view__stack { - position: relative; width: 100%; height: 1.8em; + font-family: $font-family-normal; + + td { border-left: 0 !important; padding-bottom: 0.25em; } + + td:nth-child(2) { padding-left: 0.5em; width: 100%; } + td:nth-child(3) { width: 1.6em; } .quantity { border-radius: 0.75em; background: $color-ice; color: $color-table-background; - display: inline-block; font-size: $font-size-small; text-align: center; min-width: 3em; - margin-right: 0.5em; - padding: 0 0.5em; + padding: 0.1em 0.5em; + height: $font-size-small + 0.2em; } .name { - padding-right: 2.4em; + font-size: $font-size-small; } img { - position: absolute; top: 0; right: 0; height: 1.6em; width: 1.6em; + height: 1.6em; width: 1.6em; } } diff --git a/src/data/minecraft/recipes.json b/src/data/minecraft/recipes.json index ff46acb0e..8ba6e8f50 100644 --- a/src/data/minecraft/recipes.json +++ b/src/data/minecraft/recipes.json @@ -485,7 +485,7 @@ "tools": "Crafting Table" }, { "output": "Glistering Melon", - "input": [[8, "Gold Nugget"], "Melon (item)"], + "input": [[8, "Gold Nugget"], "Melon"], "tools": "Crafting Table" }, { "output": "Glowstone", @@ -833,11 +833,11 @@ "input": "Lilac" }, { "output": "Melon (block)", - "input": [[9, "Melon (item)"]], + "input": [[9, "Melon"]], "tools": "Crafting Table" }, { "output": "Melon Seeds", - "input": "Melon (item)" + "input": "Melon" }, { "output": "Milk", "input": "Bucket", @@ -983,7 +983,7 @@ "tools": "Brewing Stand" }, { "output": [[3, "Potion of Fire Resistance (8:00)"]], - "input": [[3, "Postion of Fire Resistance (3:00)"], "Redstone"], + "input": [[3, "Potion of Fire Resistance (3:00)"], "Redstone"], "tools": "Brewing Stand" }, { "output": [[3, "Potion of Harming"]], @@ -1103,7 +1103,7 @@ "tools": "Brewing Stand" }, { "output": [[3, "Potion of Swiftness II (1:30)"]], - "input": [[3, "Potion of Regeneration (0:45)"], "Glowstone"], + "input": [[3, "Potion of Swiftness (3:00)"], "Glowstone"], "tools": "Brewing Stand" }, { "output": [[3, "Potion of Water Breathing (3:00)"]], diff --git a/src/images/unknown.png b/src/images/unknown.png index 756fce8eaa3cc0483488a4da6acd03e883cca578..9e71b5f9e6d10b42a5012c83c066e2e321cd2aa9 100644 GIT binary patch delta 1582 zcmV+}2GRM&4T>4Ca0Y({1W80eRA>e5SxZY~M-;C1{nl5&w zgjjI7x2jH^^PQ?wr%s(K#AA7!f&cdm1X88`$jC^2dU|?SMn-?eGw>{rMx#&f?(Twt zKp>iymUfKyA=>wEZ*RkBAMNh$UQLDU2PrT-JY1Tcojm{`&jB!4US2NB%F6Q4Civv! z+9?LJ6UCtQebFk=%b>dqOT#ezow=p zP*qixTU=Z$poD)G4uBT`F1EL~FE%zdq8Rt;^z`&~GK%O)RA6D&KhMg_`W3UC(bUwG zhobZ*{&{|WE|!*-xGJ~T*VkY4^z{6ZI2X+kqobpP;cz&D*~28JwvZ=zQ-&rSgG_4$ z1_uYzT3T9u!&3LQx3_0X+fGD~4lVb}+}vCQt1>k|KmUIjKe2WC=H$paKpk}hB`Vr^8Cz(%fGp~Dfsp( zoCJ6+5e$C@y~qqclarI@;MeE1v0W92xysen)>e4TB2QtQ?Uj`k`gVhkAoKI{1w9nM zsnqfDvDr^|+tAP;a&vP%`NFjdm=j*7^=>ZKbuH=V=_>ue6T$B8t_h9@SZ!^sd5B4b zIN-$k`nqwLQPHifEz#K6=y`TfHZgz)&zx^1FZF-zXw*DmLDWw_uM#_bW0MNb6bomz zzP{cDo_$oTy1JU5M&YVlTwKVi>zf#$a6c`=iO5lb%*@OIp0GNH6i-xHN=r)x#>%Sg zO|zmRvgjy43|P?s9Dx1`z+?0>JdlFC-m16JF*nuj{WiRm8^iKk*44Ld1sGL=AVim^ zQ&fKt2r+zzz%}~PSP5crRxpMwuG^*nyvC>4a4=_A2NlPlva(XZ+>A#@0d>VxbBbeX zsSpbzU54wHE@4vuHvA04TING$B_$>1q%@SOs38gm*Azp=NZ9+ zF4+|ZKbvQ{f@Ok6J%eDd}!ajJ3`)yRUW2eC%qKz1c1)KP#lRQTSaEbm0OZMa9;^I3e z?ljV)jUHoRVZnTsmzO=Ly}OvT1H~(1a-wupfP}az{)EkZE3b=AgWq=>Wix-}i1%wZ zS*{8&3&33E?CdO48*by@TRUY^HZizmBq-cf0d_JUgAM(|)YQ}slT9D0P!>~+l=kdeI)jssxzPVBF6~UQKD+Jlyy&(q*s+ z`Xh!cJoViUDOHx+cTy|h#EeNN=9HM0L4O4{;u8Q2k(ReSUX<{;$8aW{5wBBVM%u^n gI0KI}kk}0T3lXwCjO-z)+5i9m07*qoM6N<$f^w}6djJ3c delta 93 zcmeB@Jj%PFfGw24-qXb~B!l(sg+>M-IK1Fzu>6zOfW!k0jLd925(WwQ7za)tU{En& UVC