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

Jump to bottom

swap unicode with missing semi-colon for regular apostrophe #2223

Merged
merged 3 commits into from
May 9, 2017
Merged

swap unicode with missing semi-colon for regular apostrophe #2223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
124c95e
swap unicode with missing semi-colon for regular apostrophe
kieckhafer May 8, 2017
e47ea18
updated to use <Translation> instead of i18n-data
kieckhafer May 8, 2017
71a3449
Merge branch 'development' into ek-unicodeApostropheFix
May 9, 2017
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
11 changes: 8 additions & 3 deletions imports/plugins/core/checkout/client/components/emptyCartDrawer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import React, { PropTypes } from "react";
import { Translation } from "/imports/plugins/core/ui/client/components";


const EmptyCartDrawer = ({ keepShopping }) => {
return (
<div className="cart-drawer" id="cart-drawer">
<div className="cart-drawer-empty">
<div className="row cart-drawer-empty-msg">
<h1 className="text-align">
<i className="fa fa-frown-o fa-lg" /><strong><p data-i18n="cartDrawer.empty">We&#8217re sad. Your cart is empty.</p></strong>
</h1>
<p className="text-align">
<i className="fa fa-frown-o fa-lg" />
</p>
<p className="text-align">
<Translation defaultValue="We're sad. Your cart is empty." i18nKey="cartDrawer.empty"/>
</p>
</div>
<div className="row">
<a href="#" className="btn btn-warning btn-lg btn-block" id="btn-keep-shopping" data-i18n="cartDrawer.keepShopping"
Expand Down
3 changes: 2 additions & 1 deletion imports/plugins/included/default-theme/client/styles/cart/cartDrawer.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
height: (@cart-drawer-height - 10);
color: contrast(@cart-drawer-bg, black, white);
padding-top: (@cart-drawer-height / 5);
font-size: @font-size-h1;
}

.cart-frown {
Expand Down Expand Up @@ -139,4 +140,4 @@ Pagination Styles
}
.swiper-active-switch {
background: #fff;
}
}