diff options
Diffstat (limited to 'public')
| -rw-r--r-- | public/assets/javascripts/ui/site/EditSubscriptionModal.js | 11 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 32 |
2 files changed, 39 insertions, 4 deletions
diff --git a/public/assets/javascripts/ui/site/EditSubscriptionModal.js b/public/assets/javascripts/ui/site/EditSubscriptionModal.js index d5eb9ac..e7e1fa5 100644 --- a/public/assets/javascripts/ui/site/EditSubscriptionModal.js +++ b/public/assets/javascripts/ui/site/EditSubscriptionModal.js @@ -17,12 +17,13 @@ var EditSubscriptionModal = ModalFormView.extend({ // this.parent = opt.parent this.__super__.initialize.call(this) - this.$freePlan = this.$("#free_plan") - this.$paidPlan = this.$("#paid_plan") + this.$freePlan = this.$(".freePlan") + this.$paidPlan = this.$(".paidPlan") this.$planRow = this.$(".planRow") this.$basicLayoutRow = this.$(".basicLayoutRow") this.$proLayoutRow = this.$(".proLayoutRow") this.$totalRow = this.$(".totalRow") + this.$planList = this.$(".planList") this.$billingInterval = this.$("[data-role=billingInterval]") @@ -71,11 +72,15 @@ var EditSubscriptionModal = ModalFormView.extend({ return this.show() }, + show: function(){ if (! this.subscriber) { this.$freePlan.show() this.$paidPlan.hide() - this.__super__.show.call(this) + this.$planList.load("/partials/plans", function(){ + this.$(".free_plan_info").remove() + this.__super__.show.call(this) + }.bind(this)) return } diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 5d7199c..8184032 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -904,6 +904,30 @@ iframe.embed { /* PLANS BROCHURE */ /* nb these styles should be fixed for narrower screens/mobile layout */ +.planList { + position: absolute; + left: 50%; + transform: translateX(-48%); +} +.planList .about_custom { + width: 56vw; + margin: 1vw 4vw; +} +.planList .planbox { + padding: 0; +} +.mediaDrawer .planList h3 { + margin-top: 3px; + font-size: 21px; + font-weight: bold +} +.freePlan { + text-align: left; +} +.planList .planbox li:first-child { + font-size: 1.9vw; + padding: 0; +} .about_plan { width: 28vw; margin: 2vw; @@ -940,7 +964,13 @@ iframe.embed { } .planbox li { list-style-type: none; - margin-bottom: 5px; + margin-bottom: 0; + font-size: 1.3vw; + padding: 0 5.6vw; +} +.about_custom.planbox li { + padding: 10px; + font-size: 17px; } .planbox.miscbox { border: 0; |