Merge pull request #537 from jayant1992/master

UI and UX improvements to editor
This commit is contained in:
Nick Winter 2014-03-13 07:07:13 -07:00
commit 4ad0fba860
5 changed files with 15 additions and 8 deletions

View file

@ -241,7 +241,7 @@ module.exports = class Camera extends CocoClass
@newZoom = newZoom
@tweenProgress = 0.01
createjs.Tween.get(@)
.to({tweenProgress: 1.0}, time, createjs.Ease.getPowInOut(3))
.to({tweenProgress: 1.0}, time, createjs.Ease.getPowOut(4))
.call @finishTween
else

View file

@ -45,7 +45,8 @@ h1 h2 h3 h4
background-color: #2f261d
p
margin: 0
padding-top: 25px
padding-top: 10px
padding-bottom: 10px
text-align: center
.mixpanel-badge, .firebase-badge
@ -67,7 +68,7 @@ a[data-toggle="modal"]
cursor: pointer
.share-buttons, .partner-badges
margin-top: 10px
padding-bottom: 10px
text-align: center
@include opacity(0.75)

View file

@ -3,6 +3,11 @@
a.open-modal-button
float: right
input#search
width: 190px
height: 30px
padding-left: 5px
table.table
background-color: white
.body-row

View file

@ -2,15 +2,15 @@
h3(data-i18n="editor.level_tab_thangs_title") Current Thangs
.btn-group(data-toggle="buttons-radio")#extant-thangs-filter
button.btn.btn-primary All
button.btn.btn-primary(value="Unit")
button.btn.btn-primary(value="Unit", title="Unit")
i.icon-user
button.btn.btn-primary(value="Wall")
button.btn.btn-primary(value="Wall", title="Wall")
i.icon-home
button.btn.btn-primary(value="Floor")
button.btn.btn-primary(value="Floor", title="Floor")
i.icon-globe
button.btn.btn-primary(value="Doodad")
button.btn.btn-primary(value="Doodad", title="Doodad")
i.icon-leaf
button.btn.btn-primary(value="Misc")
button.btn.btn-primary(value="Misc", title="Misc")
i.icon-question-sign
#thangs-treema(title="Double click to configure a thang")

View file

@ -98,6 +98,7 @@ module.exports = class ThangsTabView extends View
@$el.find('#extant-thangs-filter button:first').button('toggle')
onFilterExtantThangs: (e) ->
@$el.find('#extant-thangs-filter button.active').button('toggle')
button = $(e.target).closest('button')
button.button('toggle')
val = button.val()