Skip to content

J
joshine
Commit 144efa1f by lmf
Options

Merge branch 'master' of http://47.99.244.21:9999/root/joshine

parents dd1a222a 97972ec0
Showing with 394 additions and 57 deletions
app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
...@@ -6,60 +6,6 @@ ...@@ -6,60 +6,6 @@
/** @var \Magento\Customer\Block\Newsletter $block */ /** @var \Magento\Customer\Block\Newsletter $block */
?> ?>
<style type="text/css">
input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
border: 1px solid #e1e1e1;
height: 50px;
padding: 5px;
border-radius: 3px;
box-shadow: none;
}
.fieldset > .field:not(.choice) > .label {
padding: 6px 15px 0 0;
text-align: right;
box-sizing: border-box;
float: left;
}
.actions-toolbar .action.primary{
vertical-align: middle;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgb(0 0 0 / 0%);
border-radius: 0px;
background-color: #222222;
box-shadow: none;
color: #ffffff;
display: inline-block;
font-family: 'Outfit', sans-serif;
font-weight: normal;
padding: 18px 50px;
line-height: 1;
text-shadow: none;
text-transform: capitalize;
white-space: nowrap;
font-size: 13px;
border-radius: 2px;
border: 2px solid #222222;
background-image: none;
text-align: center;
border: none;
text-transform: uppercase;
font-weight: normal !important;
transition: all 0.4s ease;
-webkit-transition: all 0.4s ease;
}
.label {
color: #555;
font-size: 13px;
}
input{
box-shadow: inset 0 -2px #e7e7e7;
}
.field.choice>[type="radio"], .field.choice>[type="checkbox"] {
margin-top: 4px;
}
</style>
<?= $block->getChildHtml('form_before') ?> <?= $block->getChildHtml('form_before') ?>
<form class="form form-newsletter-manage" action="<?= $block->escapeUrl($block->getAction()) ?>" method="post" id="form-validate"> <form class="form form-newsletter-manage" action="<?= $block->escapeUrl($block->getAction()) ?>" method="post" id="form-validate">
<fieldset class="fieldset"> <fieldset class="fieldset">
......
app/design/frontend/Joshine/breeze/Magento_Customer/templates/account/dashboard/info.phtml
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
.customer-account-index{ .customer-account-index{
font-family: 'Outfit-Regular', sans-serif; font-family: 'Outfit-Regular', sans-serif;
} }
label button, table .id a, table .actions a, a[href^="tel:"], a[href^="mailto:"], a.alert, address a, .block .block-title a, .actions-toolbar a, .box-actions a, .product-item-details dl a, .map-show-info, .minimal-price-link, .prices-tier a, .block.related .action.select, .samples a, .reviews-actions a, .search-suggestions a, .cart.table .action-gift, .checkout-onepage-success .column.main a, .paypal-review .discount .title, .paypal-review .paypal-review-title a{
color: #666666;
}
.block-dashboard-info .block-title{ .block-dashboard-info .block-title{
border-bottom: 1px solid #e1e1e1; border-bottom: 1px solid #e1e1e1;
...@@ -34,7 +36,7 @@ ...@@ -34,7 +36,7 @@
.block-dashboard-info .box-information .box-title,.box-newsletter strong.box-title,.block-dashboard-addresses .box-title{ .block-dashboard-info .box-information .box-title,.box-newsletter strong.box-title,.block-dashboard-addresses .box-title{
font-size: 20px; font-size: 20px;
padding-bottom: 10px; padding-bottom: 10px;
color: #292929; color: #333333;
display: block; display: block;
font-weight: 600; font-weight: 600;
} }
...@@ -86,9 +88,23 @@ ...@@ -86,9 +88,23 @@
display: block; display: block;
font-weight: 600; font-weight: 600;
} }
.block-dashboard-orders{ .block-dashboard-orders,.block-reviews-dashboard{
display: none; display: none;
} }
.box-content{
color: #666666;
font-size: 14px;
}
.box-actions a{
color: #373737;
font-size: 15px;
cursor: pointer;
}
.box-actions a:hover{
color: #000000;
}
.block-dashboard-addresses .block-title a{float: right;text-transform: none;color: #666666;}
.block-dashboard-addresses .block-title a:hover{color: #333333}
@media(min-width: 768px){ @media(min-width: 768px){
.block .box{ .block .box{
max-width: 700px; max-width: 700px;
......
app/design/frontend/Joshine/breeze/Magento_Customer/templates/address/book.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/** @var \Magento\Customer\Block\Address\Book $block */
?>
<style type="text/css">
.account .main .block .block-title{
background:none;
color: #666666;
font-size: 18px;
font-weight: 300;
text-transform: uppercase;
}
.account .column.main .block:not(.widget) .box-title > span{
font-weight: 700;
line-height: 1.1;
font-size: 1.4rem;
margin-top: 2rem;
margin-bottom: 2rem;
color: #666666;
}
address{font-style: normal;color: #666666;font-size: 14px;}
label button, table .id a, table .actions a, a[href^="tel:"], a[href^="mailto:"], a.alert, address a, .block .block-title a, .actions-toolbar a, .box-actions a, .product-item-details dl a, .map-show-info, .minimal-price-link, .prices-tier a, .block.related .action.select, .samples a, .reviews-actions a, .search-suggestions a, .cart.table .action-gift, .checkout-onepage-success .column.main a, .paypal-review .discount .title, .paypal-review .paypal-review-title a{
color: #666666;
}
.block-content a.action.edit:hover{color: #333333}
.action.primary{
vertical-align: middle;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgb(0 0 0 / 0%);
border-radius: 0px;
background-color: #222222;
box-shadow: none;
color: #ffffff;
display: inline-block;
font-family: 'Outfit', sans-serif;
font-weight: normal;
padding: 18px 50px;
line-height: 1;
text-shadow: none;
text-transform: capitalize;
white-space: nowrap;
font-size: 13px;
border-radius: 2px;
border: 2px solid #222222;
background-image: none;
text-align: center;
border: none;
text-transform: uppercase;
font-weight: normal !important;
transition: all 0.4s ease;
-webkit-transition: all 0.4s ease;
}
@media(min-width: 768px){
.block .box{
max-width: none;
}
.table-additional-addresses-items.history{
color: #666666;
}
}
</style>
<div class="block block-addresses-default">
<div class="block-title"><strong><?= $block->escapeHtml(__('Default Addresses')) ?></strong></div>
<div class="block-content">
<?php if ($_pAddsses = $block->getDefaultBilling()) : ?>
<div class="box box-address-billing">
<strong class="box-title">
<span><?= $block->escapeHtml(__('Default Billing Address')) ?></span>
</strong>
<div class="box-content">
<address>
<?= $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
</address>
</div>
<div class="box-actions">
<a class="action edit" href="<?= $block->escapeUrl($block->getAddressEditUrl($_pAddsses)) ?>">
<span><?= $block->escapeHtml(__('Change Billing Address')) ?></span>
</a>
</div>
</div>
<?php else : ?>
<div class="box box-billing-address">
<strong class="box-title"><span><?= $block->escapeHtml(__('Default Billing Address')) ?></span></strong>
<div class="box-content">
<p><?= $block->escapeHtml(__('You have no default billing address in your address book.')) ?></p>
</div>
</div>
<?php endif ?>
<?php if ($_pAddsses = $block->getDefaultShipping()) : ?>
<div class="box box-address-shipping">
<strong class="box-title">
<span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span>
</strong>
<div class="box-content">
<address>
<?= $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
</address>
</div>
<div class="box-actions">
<a class="action edit" href="<?= $block->escapeUrl($block->getAddressEditUrl($_pAddsses)) ?>">
<span><?= $block->escapeHtml(__('Change Shipping Address')) ?></span>
</a>
</div>
</div>
<?php else : ?>
<div class="box box-shipping-address">
<strong class="box-title"><span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span></strong>
<div class="box-content">
<p><?= $block->escapeHtml(__('You have no default shipping address in your address book.')) ?></p>
</div>
</div>
<?php endif ?>
</div>
</div>
app/design/frontend/Joshine/breeze/Magento_Customer/templates/form/newsletter.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/** @var \Magento\Customer\Block\Newsletter $block */
?>
<style type="text/css">
input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
border: 1px solid #e1e1e1;
height: 50px;
padding: 5px;
border-radius: 3px;
box-shadow: none;
}
.fieldset > .field:not(.choice) > .label {
padding: 6px 15px 0 0;
text-align: right;
box-sizing: border-box;
float: left;
}
.actions-toolbar .action.primary{
vertical-align: middle;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgb(0 0 0 / 0%);
border-radius: 0px;
background-color: #222222;
box-shadow: none;
color: #ffffff;
display: inline-block;
font-family: 'Outfit-Regular', sans-serif;
font-weight: normal;
padding: 18px 50px;
line-height: 1;
text-shadow: none;
text-transform: capitalize;
white-space: nowrap;
font-size: 13px;
border-radius: 2px;
border: 2px solid #222222;
background-image: none;
text-align: center;
border: none;
text-transform: uppercase;
font-weight: normal !important;
transition: all 0.4s ease;
-webkit-transition: all 0.4s ease;
}
.label {
color: #555;
font-size: 13px;
}
input{
box-shadow: inset 0 -2px #e7e7e7;
}
.field.choice>[type="radio"], .field.choice>[type="checkbox"] {
margin-top: 4px;
}
</style>
<?= $block->getChildHtml('form_before') ?>
<form class="form form-newsletter-manage" action="<?= $block->escapeUrl($block->getAction()) ?>" method="post" id="form-validate">
<fieldset class="fieldset">
<?= $block->getBlockHtml('formkey') ?>
<legend class="legend"><span><?= $block->escapeHtml(__('Subscription option')) ?></span></legend><br>
<div class="field choice">
<input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?= $block->escapeHtmlAttr(__('General Subscription')) ?>"<?php if ($block->getIsSubscribed()) : ?> checked="checked"<?php endif; ?> class="checkbox">
<label for="subscription" class="label"><span><?= $block->escapeHtml(__('General Subscription')) ?></span></label>
</div>
<?php /* Extensions placeholder */ ?>
<?= $block->getChildHtml('customer.form.newsletter.extra') ?>
</fieldset>
<div class="actions-toolbar">
<div class="primary"><button type="submit" title="<?= $block->escapeHtmlAttr(__('Save')) ?>" class="action save primary"><span><?= $block->escapeHtml(__('Save')) ?></span></button></div>
<div class="secondary"><a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a></div>
</div>
</form>
<?php /* Extensions placeholder */ ?>
<?= $block->getChildHtml('customer.form.newsletter.extra2') ?>
app/design/frontend/Joshine/breeze/Magento_Sales/templates/order/history.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
// phpcs:disable Magento2.Templates.ThisInTemplate
// @codingStandardsIgnoreFile
/** @var \Magento\Sales\Block\Order\History $block */
?>
<style type="text/css">
table .id a, table .actions a{color: #666666;}
</style>
<?php $_orders = $block->getOrders(); ?>
<?= $block->getChildHtml('info') ?>
<?php if ($_orders && count($_orders)) : ?>
<div class="table-wrapper orders-history">
<table class="data table table-order-items history" id="my-orders-table">
<caption class="table-caption"><?= $block->escapeHtml(__('Orders')) ?></caption>
<thead>
<tr>
<th scope="col" class="col id"><?= $block->escapeHtml(__('Order #')) ?></th>
<th scope="col" class="col date"><?= $block->escapeHtml(__('Date')) ?></th>
<?= $block->getChildHtml('extra.column.header') ?>
<th scope="col" class="col total"><?= $block->escapeHtml(__('Order Total')) ?></th>
<th scope="col" class="col status"><?= $block->escapeHtml(__('Status')) ?></th>
<th scope="col" class="col actions"><?= $block->escapeHtml(__('Action')) ?></th>
</tr>
</thead>
<tbody>
<?php foreach ($_orders as $_order) : ?>
<tr>
<td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= $block->escapeHtml($_order->getRealOrderId()) ?></td>
<td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @noEscape */ $block->formatDate($_order->getCreatedAt()) ?></td>
<?php $extra = $block->getChildBlock('extra.container'); ?>
<?php if ($extra) : ?>
<?php $extra->setOrder($_order); ?>
<?= $extra->getChildHtml() ?>
<?php endif; ?>
<td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total"><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
<td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= $block->escapeHtml($_order->getStatusLabel()) ?></td>
<td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
<a href="<?= $block->escapeUrl($block->getViewUrl($_order)) ?>" class="action view">
<span><?= $block->escapeHtml(__('View Order')) ?></span>
</a>&nbsp;|&nbsp;
<?php if ($this->helper(\Magento\Sales\Helper\Reorder::class)->canReorder($_order->getEntityId())) : ?>
<a href="#" data-post='<?= /* @noEscape */
$this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
->getPostData($block->getReorderUrl($_order))
?>' class="action order">
<span><?= $block->escapeHtml(__('Reorder')) ?></span>
</a>
<?php endif ?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<?php if ($block->getPagerHtml()) : ?>
<div class="order-products-toolbar toolbar bottom"><?= $block->getPagerHtml() ?></div>
<?php endif ?>
<?php else : ?>
<div class="message info empty"><span><?= $block->escapeHtml($block->getEmptyOrdersMessage()) ?></span></div>
<?php endif ?>
app/design/frontend/Joshine/breeze/Magento_Wishlist/templates/view.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
/** @var \Magento\Wishlist\Block\Customer\Wishlist $block */
?>
<style type="text/css">
.action.primary.tocart{
height: 42px;
}
button, .action.primary, input[type='submit'], input[type='reset'], input[type='button'], .pagebuilder-button-primary, .pagebuilder-button-secondary, .pagebuilder-button-link{
background: #000000;
color: #ffffff;
}
</style>
<?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow()) : ?>
<div class="toolbar wishlist-toolbar"><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
<?= ($block->getChildHtml('wishlist.rss.link')) ?>
<form class="form-wishlist-items" id="wishlist-view-form"
data-mage-init='{"wishlist":{
"addToCartUrl":<?= /* @noEscape */ $block->getItemAddToCartParams("%item%") ?>,
"addAllToCartUrl":<?= /* @noEscape */ $block->getAddAllToCartParams() ?>,
"commentString":""},
"validation": {}}' action="<?= $block->escapeUrl($block->getUrl('wishlist/index/update', ['wishlist_id' => $block->getWishlistInstance()->getId()])) ?>" method="post">
<?= $block->getChildHtml('top') ?>
<?php if ($block->hasWishlistItems()) : ?>
<?= $block->getBlockHtml('formkey') ?>
<?php $block->getChildBlock('items')->setItems($block->getWishlistItems()); ?>
<?= $block->getChildHtml('items') ?>
<?php else : ?>
<div class="message info empty"><span><?= $block->escapeHtml(__('You have no items in your wish list.')) ?></span></div>
<?php endif ?>
<?= $block->getChildHtml('bottom') ?>
<div class="actions-toolbar">
<div class="primary">
<?= $block->getChildHtml('control_buttons') ?>
</div>
<div class="secondary">
<a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
<span><?= $block->escapeHtml(__('Back')) ?></span>
</a>
</div>
</div>
</form>
<script id="form-tmpl" type="text/x-magento-template">
<form id="wishlist-hidden-form" method="post" action="<%- data.url %>" class="no-display">
<% if (data.qty) { %>
<input name="qty" value="<%- data.qty %>">
<% } %>
<% if (data.item) { %>
<input name="item" value="<%- data.item %>">
<% } %>
<% if (data.entity) { %>
<input name="entity" value="<%- data.entity %>">
<% } %>
</form>
</script>
<div class="toolbar wishlist-toolbar"><br><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
<?php endif ?>
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -1028,10 +1028,20 @@ footer{ ...@@ -1028,10 +1028,20 @@ footer{
.block.widget-recent{ .block.widget-recent{
display: none !important; display: none !important;
} }
.account{
font-family: 'Outfit-Regular';
}
.account .page-title-wrapper h1 { .account .page-title-wrapper h1 {
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
} }
.account .page-title-wrapper h1 span{
font-size: 60px;
font-weight: 400;
font-family: 'Outfit-Regular';
letter-spacing: -1.5px;
}
.account .page-title-wrapper{ .account .page-title-wrapper{
padding-bottom: 30px; padding-bottom: 30px;
padding-top: 55px; padding-top: 55px;
...@@ -1041,12 +1051,46 @@ footer{ ...@@ -1041,12 +1051,46 @@ footer{
font-size: 14px; font-size: 14px;
} }
.account .message.info,.account .message.warning,.account .message.notice{
background: #fdf0d5;
color: #6f4400;
}
.account.customer-account-edit{ .account.customer-account-edit{
form .legend{ form .legend{
border:none; border:none;
} }
} }
@media(max-width: 767.98px){
.sidebar .block-collapsible-nav{
top:120px;
width: 96%;
z-index: 9999;
}
.account .page-title-wrapper h1 span{
font-size: 36px !important;
}
.account .block-collapsible-nav .title{
border-bottom: 1px solid #d1d1d1;
border-top: 1px solid #d1d1d1;
}
.account .block-collapsible-nav .title strong{
font-weight: 700;
font-size: 1.4rem;
font-family: 'Outfit-Regular', sans-serif;
}
.account .block-collapsible-nav .content.block-collapsible-nav-content .nav.item{
margin: 3px 0;
padding-bottom: 10px;
}
.block-collapsible-nav .item.current strong{
color: #000000;
font-weight: 600;
}
}
.block.widget.block-viewed-products-grid{
display: none;
}
@media(min-width: 640px){ @media(min-width: 640px){
.switcher.currency{ .switcher.currency{
position: relative; position: relative;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment