Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plans: update messaging and design to clarify upgrade discounts #2479

Merged
merged 7 commits into from
Jan 18, 2016
Merged

Plans: update messaging and design to clarify upgrade discounts #2479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
469df68
clarify upgrade discount messaging
danhauk Jan 15, 2016
fdd9b34
remove discount message banner at the top of the plan
danhauk Jan 15, 2016
ba8ad31
fix wrapping issue on mobile
danhauk Jan 15, 2016
ef29348
make discounted price on plan comparison page green too
danhauk Jan 15, 2016
abea4aa
Merge branch 'master' into update/plans-discounts-design
danhauk Jan 18, 2016
e20569b
fix height issue at smallest breakpoint
danhauk Jan 18, 2016
655341e
fix bug where placeholder card is shorter so the size jumps after load
danhauk Jan 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion assets/stylesheets/sections/_upgrades.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@
.plan-header {
float: left;
width: 100%;
height: 50px;
box-sizing: border-box;

.badge {
Expand Down
4 changes: 1 addition & 3 deletions client/components/plans/plan-discount-message/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ module.exports = React.createClass( {
},

render: function() {
if ( this.planHasDiscount() ) {
return this.planDiscountMessage();
} else if ( this.showMostPopularMessage() ) {
if ( this.showMostPopularMessage() ) {
return this.mostPopularPlan();
}
return false;
Expand Down
7 changes: 5 additions & 2 deletions client/components/plans/plan-header/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
.plan-header {
background: $white;
width: 100%;
padding: 24px 16px;
padding: 24px 16px 16px;
position: relative;
box-sizing: border-box;
cursor: pointer;
Expand Down Expand Up @@ -80,6 +80,10 @@
display: none;
}
}

@include breakpoint( "<480px" ) {
height: 70px;
}
}

.plans-compare {
Expand Down Expand Up @@ -140,7 +144,6 @@
.plan.card {
.plan-header {
float: left;
height: 70px;

.plan-header__title {
margin: -8px 0 0 0;
Expand Down
4 changes: 2 additions & 2 deletions client/components/plans/plan-price/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ module.exports = React.createClass( {
if ( abtest( 'monthlyPlanPricing' ) === 'monthly' && this.props.isInSignup && plan.raw_price !== 0 ) {
periodLabel = this.translate( 'per month, billed yearly' );
} else {
periodLabel = hasDiscount ? this.translate( 'for first year' ) : plan.bill_period_label
periodLabel = hasDiscount ? this.translate( 'due today when you upgrade' ) : plan.bill_period_label
}

return (
<div className="plan-price">
<div className={ hasDiscount ? "plan-price plan-price__discount" : "plan-price" }>
<span>{ this.getPrice() }</span>
<small className="plan-price__billing-period">
{ periodLabel }
Expand Down
13 changes: 10 additions & 3 deletions client/components/plans/plan-price/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
font-size: 14px;
font-weight: 400;
line-height: 20px;
text-align: right;
}

.plan-price__billing-period {
Expand All @@ -12,6 +11,11 @@
color: darken( $gray, 10% );
}

.plan-header .plan-price__discount,
.plan-price__discount .plan-price__billing-period {
color: $alert-green;
}

.plan-price.is-placeholder {
@include placeholder( 23% );
}
Expand Down Expand Up @@ -39,12 +43,15 @@
display: block;
opacity: .7;
}

.plan-price__discount {
color: $alert-green;
}
}

@mixin plans-collapsed() {
.plan-header .plan-price {
display: inline-block;
padding: 0 0 0 40px;
padding: 0 20px 0 40px;
}

.plan-price__billing-period {
Expand Down