diff --git a/src/css/tags.scss b/src/css/tags.scss index 4995c715a..f612593c1 100644 --- a/src/css/tags.scss +++ b/src/css/tags.scss @@ -39,25 +39,25 @@ h1 { p { font-family: $font-family-header; - font-size: $font-size-xx-large; + font-size: $font-size-x-large; position: relative; top: -0.5em; } } h2 { - margin-bottom: 1em; + margin-bottom: 0.5em; * { display: inline; } img { - position: relative; height: 4em; width: 4em; + position: relative; height: 3.2em; width: 3.2em; margin-right: 1em; vertical-align: bottom; } p { font-family: $font-family-header; - font-size: $font-size-x-large; + font-size: $font-size-large; position: relative; top: -0.25em; } } diff --git a/src/css/templates/crafting_table.scss b/src/css/templates/crafting_table.scss index 177bc39a3..375d57383 100644 --- a/src/css/templates/crafting_table.scss +++ b/src/css/templates/crafting_table.scss @@ -9,9 +9,8 @@ All rights reserved. min-height: 14em; width: 100%; - .panel { - position: absolute; top: 5em; right: 2em; bottom: 0; left: 2em; + position: absolute; top: 3.6em; right: 2em; bottom: 0; left: 2em; background: $color-background-panel; .multiplier { diff --git a/src/css/templates/inventory.scss b/src/css/templates/inventory.scss index 35e4f6e70..14a67f973 100644 --- a/src/css/templates/inventory.scss +++ b/src/css/templates/inventory.scss @@ -14,7 +14,7 @@ All rights reserved. } .panel { - position: absolute; top: 5em; right: 2em; bottom: 0; left: 2em; + position: absolute; top: 3.6em; right: 2em; bottom: 0; left: 2em; background: $color-background-panel; text-align: right; } diff --git a/src/css/views.scss b/src/css/views.scss index 4847a681f..e4b77b2ea 100644 --- a/src/css/views.scss +++ b/src/css/views.scss @@ -60,11 +60,23 @@ All rights reserved. } .view__header { - background: $color-brick-light url('/images/stone_brick_light.png'); - position: relative; height: 10em; - margin-top: 5em; + background: $color-gray-light; + position: relative; height: 8em; + margin-top: 3.2em; - h1 { position: relative; top: -3em; left: -3em; } + a { + position: absolute; left: -1.6em; top: -1.6em; + + img { + width: 6.4em; height: 6.4em; + } + } + + h1 { + position: absolute; top: 0.8em; left: 3.2em; + font-family: PressStart; + font-size: $font-size-x-large; + } .divider { background: $color-brick-dark url('/images/stone_brick.png'); diff --git a/src/pages/includes/_header.jade b/src/pages/includes/_header.jade index 987ca6b37..967f4d7ec 100644 --- a/src/pages/includes/_header.jade +++ b/src/pages/includes/_header.jade @@ -6,8 +6,6 @@ //- .view__header - h1 - a.logo(href="/") - img(src="/images/workbench_front.png") - p Crafting Guide + a.logo(href="/"): img(src="/images/workbench_front.png") + h1 Crafting Guide for Minecraft .divider.bottom diff --git a/src/scripts/controllers/inventory_controller.coffee b/src/scripts/controllers/inventory_controller.coffee index caf1fcefa..aa48a8bec 100644 --- a/src/scripts/controllers/inventory_controller.coffee +++ b/src/scripts/controllers/inventory_controller.coffee @@ -116,7 +116,7 @@ module.exports = class InventoryController extends BaseController @$scrollbox = @$('.scrollbox') @$table = @$('table') @$toolbar = @$('.toolbar') - @$title = @$('.title') + @$title = @$('h2 p') super refresh: -> diff --git a/src/templates/inventory.jade b/src/templates/inventory.jade index 226a14f5f..255ea8729 100644 --- a/src/templates/inventory.jade +++ b/src/templates/inventory.jade @@ -8,7 +8,7 @@ .view__inventory h2 img.icon - p.title + p .panel .scrollbox table