Skip to content

J
joshine
Commit 1731419d by halweg
Options

Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into developer

parents c0c706fc 476da6e9
Showing with 7 additions and 29 deletions
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
...@@ -8,13 +8,10 @@ ...@@ -8,13 +8,10 @@
<?= $block->getLayout()->createBlock("Sparsh\FreeShippingBar\Block\Entity\FreeShippingBar")->setTemplate("free_shipping_bar.phtml")->setEntityId("2")->toHtml();?> <?= $block->getLayout()->createBlock("Sparsh\FreeShippingBar\Block\Entity\FreeShippingBar")->setTemplate("free_shipping_bar.phtml")->setEntityId("2")->toHtml();?>
<?php echo $block->getLayout()->createBlock('Joshine\Banner\Block\Index')->setTemplate('Joshine_Banner::index.phtml')->toHtml(); ?> <?php echo $block->getLayout()->createBlock('Joshine\Banner\Block\Index')->setTemplate('Joshine_Banner::index.phtml')->toHtml(); ?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_top_category_thumnail')->toHtml();?> <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_top_category_thumnail')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_top_category_thumnail_wishe')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_new_arrivals')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_new_arrivals_wishe')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('flashsaleproduct')->toHtml();?> <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('flashsaleproduct')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('flashsaleproduct_wishe')->toHtml();?> <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_new_arrivals')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('custom_product')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_category_thumnail')->toHtml();?> <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_category_thumnail')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_category_thumnail_wishe')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Joshine\InstagramFeed\Block\MediaFeed')->toHtml();?> <?php echo $block->getLayout()->createBlock('Joshine\InstagramFeed\Block\MediaFeed')->toHtml();?>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
position: fixed; position: fixed;
font-size: larger; font-size: larger;
bottom: 0; bottom: 0;
z-index: 11; z-index: 1;
margin: 0 auto; margin: 0 auto;
left: 0; left: 0;
right: 0; right: 0;
...@@ -342,7 +342,7 @@ footer .footer_link{ ...@@ -342,7 +342,7 @@ footer .footer_link{
position: fixed; position: fixed;
font-size: larger; font-size: larger;
bottom: 0; bottom: 0;
z-index: 11; z-index: 1;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
left: 0; left: 0;
...@@ -502,7 +502,7 @@ ul { ...@@ -502,7 +502,7 @@ ul {
position: fixed; position: fixed;
font-size: larger; font-size: larger;
bottom: 0; bottom: 0;
z-index: 11; z-index: 1;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
left: 0; left: 0;
...@@ -585,10 +585,6 @@ ul { ...@@ -585,10 +585,6 @@ ul {
} }
@media (max-width: 768px){ @media (max-width: 768px){
.categories_tab {
height: 330px;
}
#topBtn { #topBtn {
width: 8% !important; width: 8% !important;
} }
...@@ -599,7 +595,6 @@ ul { ...@@ -599,7 +595,6 @@ ul {
margin: 0px 0 ; margin: 0px 0 ;
padding: 50px; padding: 50px;
width: 100%; width: 100%;
height: 400px;
} }
.section-element.shop_by_categories .container { .section-element.shop_by_categories .container {
padding-bottom: 15px; padding-bottom: 15px;
...@@ -1413,9 +1408,7 @@ p.flashsale-title { ...@@ -1413,9 +1408,7 @@ p.flashsale-title {
.flash-sale-item{ .flash-sale-item{
width:50%; width:50%;
} }
.categories_tab {
height: 400px;
}
.page-bottom { .page-bottom {
margin-top: 30px !important; margin-top: 30px !important;
} }
...@@ -2512,18 +2505,6 @@ footer{ ...@@ -2512,18 +2505,6 @@ footer{
} }
} }
@media (max-width: 670px) {
.categories_tab {
}
.flash_sale.news-arrivals{
margin-top: -75px;
}
}
@media (min-width: 670px) {
.categories_tab {
}
}
@media (min-width: 780px){ @media (min-width: 780px){
.categories_tab { .categories_tab {
margin-top: 0px; margin-top: 0px;
...@@ -2677,7 +2658,7 @@ button.action.submit.primary { ...@@ -2677,7 +2658,7 @@ button.action.submit.primary {
display: block !important; display: block !important;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
z-index: 11; z-index: 1;
} }
.breeze-gallery .stage .main-image-wrapper > picture{ .breeze-gallery .stage .main-image-wrapper > picture{
display: none; display: none;
......
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