Update crafting page checks to fade in

Update the crafting page so that the check mark for each step only
appears when hovering over that step, and so that the check also has
some descriptive text helping the user understand what it does.
This commit is contained in:
Andrew Miner
2015-05-29 12:49:13 -07:00
parent 3f50072da1
commit 0b07bdb482
4 changed files with 65 additions and 21 deletions
@@ -28,7 +28,7 @@ module.exports = class StepController extends BaseController
# Event Methods ################################################################################ # Event Methods ################################################################################
onCompleteButtonClicked: (event)-> onCompleteClicked: (event)->
event.preventDefault() event.preventDefault()
@trigger Event.button.complete, this @trigger Event.button.complete, this
@@ -47,7 +47,8 @@ module.exports = class StepController extends BaseController
modPack: @modPack modPack: @modPack
@$header = @$('h3') @$header = @$('h3')
@$completeButton = @$('button.complete') @$completePanel = @$('.complete')
@$completeImage = @$('.complete img')
super super
onWillChangeModel: (oldModel, newModel)-> onWillChangeModel: (oldModel, newModel)->
@@ -63,9 +64,9 @@ module.exports = class StepController extends BaseController
@recipeController.multiplier = @model.multiplier @recipeController.multiplier = @model.multiplier
if @canComplete(this) if @canComplete(this)
@$completeButton.removeProp 'disabled' @$completePanel.addClass 'disabled'
else else
@$completeButton.prop 'disabled', true @$completePanel.removeClass 'disabled'
super super
@@ -73,4 +74,4 @@ module.exports = class StepController extends BaseController
events: -> events: ->
return _.extend super, return _.extend super,
'click button.complete': 'onCompleteButtonClicked' 'click .complete a': 'onCompleteClicked'
+2 -1
View File
@@ -9,4 +9,5 @@
h3 h3
.view__inventory .view__inventory
.view__minimal_recipe .view__minimal_recipe
button.complete .complete
a: div: p I already have this
+6
View File
@@ -62,6 +62,11 @@ $color-brick-light: #D9D9D9;
$color-dirt: #906647; $color-dirt: #906647;
$color-ice: #8AA7E6; $color-ice: #8AA7E6;
// Opacity Values //////////////////////////////////////////////////////////////////////////////////
$opacity-hidden: 0.000001;
$opacity-shown: 1.0;
// Style Colors //////////////////////////////////////////////////////////////////////////////////// // Style Colors ////////////////////////////////////////////////////////////////////////////////////
$color-active: #5C8AE6; $color-active: #5C8AE6;
@@ -69,6 +74,7 @@ $color-active-hover: #2E6BE6;
$color-background: #AAC9FF; $color-background: #AAC9FF;
$color-background-panel: #FFFFFF; $color-background-panel: #FFFFFF;
$color-background-toolbar: rgba(255, 255, 255, 0.75); $color-background-toolbar: rgba(255, 255, 255, 0.75);
$color-checkmark: #7EDD7B;
$color-content: rgba(230, 230, 230, 0.90); $color-content: rgba(230, 230, 230, 0.90);
$color-error: #F3C2C2; $color-error: #F3C2C2;
$color-error-new: #CD0000; $color-error-new: #CD0000;
+50 -14
View File
@@ -13,6 +13,17 @@ All rights reserved.
&:first-child { &:first-child {
border-top: 0; border-top: 0;
padding-top: 0;
.complete {
top: 0;
}
}
&:hover {
.complete {
opacity: $opacity-shown;
}
} }
.view__inventory { .view__inventory {
@@ -23,25 +34,50 @@ All rights reserved.
position: absolute; top: 2em; right: 4.8em; position: absolute; top: 2em; right: 4.8em;
} }
button.complete { .complete {
position: absolute; top: 1em; right: 0; height: 3em; width: 3em; position: absolute; top: 1em; right: 0;
cursor: pointer;
opacity: $opacity-hidden;
background: url("/images/check.png") no-repeat center; transition: opacity $animate-fast;
border: 0;
font-size: $font-size-small;
outline: none;
&:active { a {
background: url('/images/check_active.png') no-repeat center; div {
} height: 3em;
&:disabled { background: url('/images/check.png') no-repeat right;
background: url('/images/check_disabled.png') no-repeat center !important; background-size: 3em 3em;
cursor: inherit; padding-right: 4em;
} text-align: right;
&:hover { &:hover {
background: url('/images/check_hover.png') no-repeat center; background-image: url('/images/check_hover.png');
p {
font-weight: bold;
}
}
p {
position: relative; top: 50%;
@include transform(translateY(-50%));
color: $color-checkmark;
font-size: $font-size-small;
}
}
}
&.active {
a {
background-image: url('/images/check_active.png');
}
}
&.disabled {
a {
background-image: url('/images/check_disabled.png') !important;
cursor: inherit;
}
} }
} }
} }