codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #2407 by implementing styles for new subscribe-in-gem-shop design.

Browse source
This commit is contained in:
Nick Winter 2015-02-25 14:24:32 -08:00
parent 9adb59f9ad
commit a2a78286da
3 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/styles/play/modal/buy-gems-modal.sass
View file

@ -6,10 +6,10 @@
h1 h1
position: absolute position: absolute
left: 164px left: 200px
top: -70px top: -70px
margin: 0 margin: 0
width: 450px width: 612px
text-align: center text-align: center
color: rgb(254,188,68) color: rgb(254,188,68)
font-size: 38px font-size: 38px
@ -19,7 +19,7 @@
.modal-dialog .modal-dialog
margin: 150px auto 0 auto margin: 150px auto 0 auto
padding: 0 padding: 0
width: 820px width: 1060px
height: 460px height: 460px
background: none background: none
@ -33,7 +33,7 @@
#close-modal #close-modal
position: absolute position: absolute
left: 612px left: 770px
top: -80px top: -80px
width: 60px width: 60px
height: 60px height: 60px
@ -53,7 +53,7 @@
position: absolute position: absolute
left: 55px left: 55px
top: 242px top: 242px
width: 720px width: 960px
height: 140px height: 140px
.product .product
@ -78,8 +78,7 @@
width: 80% width: 80%
left: 10% left: 10%
bottom: -30px bottom: -30px
//- Errors //- Errors
.alert .alert
position: absolute position: absolute
@ -87,13 +86,3 @@
width: 80% width: 80%
top: 20px top: 20px
border: 5px solid gray border: 5px solid gray
#or-subscribe
position: absolute
right: 30px
top: 420px
font-size: 16px
color: #eee
button
min-width: 182px

11
app/templates/play/modal/buy-gems-modal.jade
View file

@ -18,6 +18,11 @@
h3(data-i18n=product.i18n) h3(data-i18n=product.i18n)
button.btn.btn-illustrated.btn-lg(value=product.id) button.btn.btn-illustrated.btn-lg(value=product.id)
span= product.price span= product.price
.product
h4 x3500 / mo
h3(data-i18n="account.subscription")
button.start-subscription-button.btn.btn-lg.btn-illustrated.btn-success(data-i18n="subscribe.subscribe_title") Subscribe
if state === 'declined' if state === 'declined'
#declined-alert.alert.alert-danger.alert-dismissible #declined-alert.alert.alert-danger.alert-dismissible
@ -40,8 +45,4 @@
div#close-modal div#close-modal
span.glyphicon.glyphicon-remove span.glyphicon.glyphicon-remove
#or-subscribe
span(data-i18n="buy_gems.or_subscribe") Or 3500 gems/mo if you...
br
button.start-subscription-button.btn.btn-lg.btn-illustrated.btn-success(data-i18n="subscribe.subscribe_title") Subscribe

2
app/views/play/modal/BuyGemsModal.coffee
View file

@ -21,7 +21,7 @@ module.exports = class BuyGemsModal extends ModalView
'stripe:received-token': 'onStripeReceivedToken' 'stripe:received-token': 'onStripeReceivedToken'
events: events:
'click .product button': 'onClickProductButton' 'click .product button:not(.start-subscription-button)': 'onClickProductButton'
'click #close-modal': 'hide' 'click #close-modal': 'hide'
'click .start-subscription-button': 'onClickStartSubscription' 'click .start-subscription-button': 'onClickStartSubscription'