Improve layout of stacks in crafting table

This commit is contained in:
Andrew Miner
2015-01-04 11:35:43 -08:00
parent e99a688b7e
commit 549abc1224
7 changed files with 43 additions and 38 deletions
+12 -11
View File
@@ -28,22 +28,23 @@ All rights reserved.
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
table { background: $color-table-background; width: 100%; } table.main {
background: $color-table-background; width: 100%;
td { td.list {
border-left: 0.1em solid $color-gray-light; position: relative;
padding: 0 1em 1em 1em; border-left: 0.1em solid $color-gray-light;
width: 25%; min-height: 12em;
padding: 0 1em 1em 1em;
width: 25%;
&:first-child { border-left: 0; } &:first-child { border-left: 0; }
}
} }
textarea, ul { textarea, table.list {
position: relative; position: relative; height: 100%; width: 100%;
font-size: $font-size-normal; font-size: $font-size-normal;
width: 100%;
height: 100%;
min-height: 12em;
padding: 0.2em; padding: 0.2em;
} }
+10 -6
View File
@@ -6,25 +6,29 @@ All rights reserved.
*/ */
.view__stack { .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 { .quantity {
border-radius: 0.75em; border-radius: 0.75em;
background: $color-ice; background: $color-ice;
color: $color-table-background; color: $color-table-background;
display: inline-block;
font-size: $font-size-small; font-size: $font-size-small;
text-align: center; text-align: center;
min-width: 3em; min-width: 3em;
margin-right: 0.5em; padding: 0.1em 0.5em;
padding: 0 0.5em; height: $font-size-small + 0.2em;
} }
.name { .name {
padding-right: 2.4em; font-size: $font-size-small;
} }
img { img {
position: absolute; top: 0; right: 0; height: 1.6em; width: 1.6em; height: 1.6em; width: 1.6em;
} }
} }
+5 -5
View File
@@ -485,7 +485,7 @@
"tools": "Crafting Table" "tools": "Crafting Table"
}, { }, {
"output": "Glistering Melon", "output": "Glistering Melon",
"input": [[8, "Gold Nugget"], "Melon (item)"], "input": [[8, "Gold Nugget"], "Melon"],
"tools": "Crafting Table" "tools": "Crafting Table"
}, { }, {
"output": "Glowstone", "output": "Glowstone",
@@ -833,11 +833,11 @@
"input": "Lilac" "input": "Lilac"
}, { }, {
"output": "Melon (block)", "output": "Melon (block)",
"input": [[9, "Melon (item)"]], "input": [[9, "Melon"]],
"tools": "Crafting Table" "tools": "Crafting Table"
}, { }, {
"output": "Melon Seeds", "output": "Melon Seeds",
"input": "Melon (item)" "input": "Melon"
}, { }, {
"output": "Milk", "output": "Milk",
"input": "Bucket", "input": "Bucket",
@@ -983,7 +983,7 @@
"tools": "Brewing Stand" "tools": "Brewing Stand"
}, { }, {
"output": [[3, "Potion of Fire Resistance (8:00)"]], "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" "tools": "Brewing Stand"
}, { }, {
"output": [[3, "Potion of Harming"]], "output": [[3, "Potion of Harming"]],
@@ -1103,7 +1103,7 @@
"tools": "Brewing Stand" "tools": "Brewing Stand"
}, { }, {
"output": [[3, "Potion of Swiftness II (1:30)"]], "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" "tools": "Brewing Stand"
}, { }, {
"output": [[3, "Potion of Water Breathing (3:00)"]], "output": [[3, "Potion of Water Breathing (3:00)"]],
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

@@ -80,9 +80,9 @@ module.exports = class CraftingTableController extends BaseController
@$nameField = @$('input[name="name"]') @$nameField = @$('input[name="name"]')
@$quantityField = @$('select[name="quantity"]') @$quantityField = @$('select[name="quantity"]')
@$needList = @$('td.need ul') @$needList = @$('td.need table')
@$makeList = @$('td.make ul') @$makeList = @$('td.make table')
@$resultList = @$('td.result ul') @$resultList = @$('td.result table')
@_updateNameAutocomplete() @_updateNameAutocomplete()
@_craft() @_craft()
+9 -9
View File
@@ -24,17 +24,17 @@
input(name="including_tools", type="checkbox") input(name="including_tools", type="checkbox")
| including tools | including tools
table table.main
tr tr
td.have td.have.list
h3: p You have... h3: p You have...
textarea(name="have", placeholder="For example:\n\n3 wool\n4 iron ingot") textarea(name="have", placeholder="For example:\n\n3 wool\n4 iron ingot", rows="12")
td.need td.need.list
h3: p You'll need... h3: p You'll need...
ul table.list
td.make td.make.list
h3: p You'll make... h3: p You'll make...
ul table.list
td.result td.result.list
h3: p You'll get... h3: p You'll get...
ul table.list
+4 -4
View File
@@ -5,7 +5,7 @@
//- All rights reserved. //- All rights reserved.
//- //-
li.view__stack tr.view__stack
p.quantity td: p.quantity
a.name: p td: p.name
img(src='') td: img(src='')