Skip to content

P
ptd
Commit 391c6897 authored by root's avatar root
Browse files
Options

Merge branch 'master' of http://gitlab.invigroup.com/quan.nguyen/ptd

parents 6f46dd49 327df60f
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 103 deletions
themes/contrib/estore/css/styles.css
View file @ 391c6897
......@@ -36,7 +36,9 @@ article.commerce-product.teaser .product-image img:hover {
}
article.commerce-product.teaser .product-image img {
/* text-align: center; */
transition: all .4s linear;
margin: auto;
}
/* blog custom invi */
.single-blog {
......@@ -102,21 +104,25 @@ text-transform: uppercase;
/*end blog custom invi */
/* invi custom */
.wrap-header {
background: linear-gradient(45deg,#fee0a0 , #facd87)
}
.middle-header-wrapper {
background-color: #f7df24 !important;
/* background-color: #f7df24 !important; */
}
.bottom-nav {
background-color: #f7df24 !important;
/* background-color: #f7df24 !important; */
padding-bottom: 16px;
}
.region-middle-header{
min-width: 100%;
}
.region-middle-header .contextual-region.main-menu{
.region-middle-header .main-menu{
width: 100%;
}
.region-middle-header .contextual-region.main-menu .menu--main{
.region-middle-header .main-menu .menu--main{
display: flex;
width: 100%;
justify-content: space-between;
......@@ -353,7 +359,17 @@ header.navbar .category-menu ul.menu ul.dropdown-menu li span {
margin-top: 14px;
border-radius: 9px;
}
.view-manufacturer-list .view-content{
display: flex;
justify-content: space-around;
height: 100px;
}
.view-manufacturer-list .view-content img.img-responsive{
display: block;
height: auto;
height: 90px !important;
width: auto !important;
}
header.navbar .category-menu ul.menu ul.dropdown-menu li {
/* border: none; */
font-weight: 200 !important;
......@@ -373,7 +389,8 @@ header.navbar .category-menu ul.menu ul.dropdown-menu li {
}
.middle-header-wrapper .container-fluid.fixed-top.no-toolbar {
top: 0
top: 0;
margin: 0;
}
.footer-bottom-left {
......@@ -393,9 +410,12 @@ header.navbar .category-menu ul.menu ul.dropdown-menu li {
left: 0;
right: 0;
width: 100%;
/* background: rgba(255, 255, 255, 0.95); */
height: 90px;
background: linear-gradient(45deg,#fee0a0 , #f5be77);
}
header.navbar .category-menu ul.menu.litte-menu {
height: 455px;
/* // overflow: hidden; */
......@@ -555,7 +575,7 @@ header.navbar .category-menu ul.menu.litte-menu {
.middle-header-wrapper .container-fluid {
display: flex;
align-items: center;
background: #f7df24;
/* background: #f7df24; */
}
@keyframes mymove {
......@@ -581,11 +601,11 @@ header.navbar .category-menu ul.menu.litte-menu {
.name.navbar-brand {
text-transform: uppercase;
color: #e94337 !important;
font-size: 30px !important;
font-size: 33px !important;
width: 100%;
letter-spacing: 0px !important;
font-weight: bold !important;
text-shadow: -2px 0 0 #fff, 0 -2px 0 #fff, 2px 0 0 #fff, 0 2px 0 #fff, 2px -2px 0 #fff, -2px 2px 0 #fff, -2px -2px 0 #fff, 2px 2px 0 #fff, 3px 3px 4px rgba(0, 0, 0, 0.5);
text-shadow: -1px 0 0 #fff, 0 -1px 0 #fff, 1px 0 0 #fff, 0 2px 0 #fff, 2px -2px 0 #fff, -2px 2px 0 #fff, -2px -2px 0 #fff, 2px 2px 0 #fff, 3px 3px 4px rgba(0, 0, 0, 0.5);
}
header .link_content:hover {
......@@ -619,40 +639,40 @@ header .link_content a:hover {
}
.pin {
border: 1px solid #e94337;
border: 1.75px solid #f11300;
border-radius: 4px;
padding: 5px 20px;
background: #fe0024;
background: #ffffffcc;
color: white !important;
}
.pin_be {
display: flex;
align-items: center;
background: #f7df24;
/* background: #f7df24; */
}
.cong {
border-top: 1px solid #e94337;
border-bottom: 1px solid #e94337;
border-left: 1px solid #e94337;
border-top: 1.75px solid #f11300;
border-bottom: 1.75px solid #f11300;
border-left: 1.75px solid #f11300;
height: 29px;
line-height: 25px;
width: 10px;
background: #fe0024;
color: white;
background: #ffffffcc;
color: #f11300;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
.tru {
border-top: 1px solid #e94337;
border-bottom: 1px solid #e94337;
border-right: 1px solid #e94337;
border-top: 1.75px solid #f11300;
border-bottom: 1.75px solid #f11300;
border-right: 1.75px solid #f11300;
height: 28px;
width: 10px;
color: white;
background: #fe0024;
color: #eb5235;
background: #ffffffcc;
border-bottom-right-radius: 3px;
border-top-right-radius: 3px;
line-height: 25px;
......@@ -677,16 +697,20 @@ header.navbar .block-search-navigation {
position: relative;
width: 100%;
/* max-width: 650px; */
border: 2px solid #e94537;
border: 2.5px solid #e94537;
/* border-right: 2px solid #ebebeb; */
/* border-bottom: 2px solid #ebebeb; */
border-radius: 0 5px 5px 0;
border-radius: 6px;
overflow: hidden;
}
.search .input-group input::placeholder {
color: #333;
color: #975050 !important;
}
.search .input-group input {
color: #975050 !important;
}
.search .input-group button {
font-size: 12px;
text-transform: uppercase;
......@@ -695,11 +719,11 @@ header.navbar .block-search-navigation {
top: -2px;
bottom: -2px;
right: -2px;
background: #e94337;
background: #eb5235;
color: #fff;
font-weight: 500;
padding: 0 20px;
min-width: 128px;
min-width: 110px;
border-radius: 0 5px 5px 0;
-webkit-transition: 0.3s;
transition: 0.3s;
......@@ -707,14 +731,15 @@ header.navbar .block-search-navigation {
.search .input-group input {
border: 0;
background: white;
background: #fcdb99;
width: 100%;
height: 50px;
color: #333;
font-size: 14px;
font-weight: 400;
padding: 0 145px 0 20px;
/* opacity: 0.7; */
/* border-radius: 31px !important; */
/* opacity: 0.5; */
}
@media (max-width: 768px) {
......@@ -723,7 +748,7 @@ header.navbar .block-search-navigation {
}
.middle-header-wrapper .region-left-middle-header .branding-block .site-title .name.navbar-brand {
font-size: 19px !important;
font-size: 25px !important;
}
.middle-header-wrapper .region-left-middle-header .branding-block .site-title p.navbar-text {
......@@ -892,7 +917,30 @@ header.navbar .block-search-navigation .search-icon {
}
/* invi 991 response */
@media (max-width: 991px) {
header.navbar .category-menu ul.menu.hide-block{
height: 334px;
overflow-y: scroll;
overflow-x: hidden;
}
.menu--category-menu .open ul.sidebar-submenu-2{
position: relative;
left: 0
}
article.commerce-product.teaser-mini .product-image{
max-width: 100px;
max-width: 100px;
}
article.commerce-product.teaser-mini .product-right{
max-width: 100% !important;
float: none;
}
.estore-homepage-first .collection-region .collection-hot-product .block-title{
margin-top: 29px !important;
}
header.navbar .category-menu ul.menu.litte-menu {
display: none !important;
}
......@@ -916,6 +964,7 @@ header.navbar .block-search-navigation .search-icon {
border-radius: 4px;
position: absolute;
top: 10px;
right: 0;
}
.mobile-top {
......@@ -923,11 +972,11 @@ header.navbar .block-search-navigation .search-icon {
flex-direction: column;
align-items: flex-start;
width: 300px;
position: absolute;
position: fixed;
top: 0;
left: -300px;
z-index: 999999;
height: 100vh;
height: 100%;
background: #f8ebbc;
color: black;
font-weight: 500;
......@@ -1043,12 +1092,16 @@ header.navbar .block-search-navigation .search-icon {
}
.region-mobile-top .navbar-nav {
margin-left: 0
margin-left: 0;
background: #f8ebbc;
display: flex;
flex-direction: column;
width: 100%;
}
.region-mobile-top .pin {
width: 100%;
background: none;
background: #f8ebbc;
border: none;
color: black !important;
}
......@@ -1058,6 +1111,14 @@ header.navbar .block-search-navigation .search-icon {
font-weight: 500;
font-size: 14px;
text-transform: uppercase;
font-size: 14px;
font-weight: 400;
/* text-transform: capitalize; */
display: block;
padding-bottom: 10px;
margin-bottom: 10px;
border-bottom: 1px solid #cbc8c8;
padding-top: 0;
}
header.navbar .category-menu ul.menu.hide-block {
......@@ -6937,7 +6998,7 @@ tbody.collapse.in {
.navbar-default {
border-color: #eee;
background-color: #fff;
/* background-color: #fff; */
}
.navbar-default .navbar-brand {
......@@ -10396,7 +10457,7 @@ body.toolbar-loading.toolbar {
height: 50px;
display: flex;
/* justify-content: center; */
background: #faeed9;
/* background: #faeed9; */
align-items: center;
}
......@@ -10494,7 +10555,7 @@ body.toolbar-loading.toolbar {
.middle-header-wrapper {
padding: 20px 0;
background: white;
/* background: white; */
}
.middle-header-wrapper .region-middle-header img {
......@@ -10732,7 +10793,7 @@ header.navbar .category-menu .block-title {
transition: all 0.5s ease-in-out;
color: #fff;
font-weight: 600;
background: #e94337;
background: #eb5235;
height: 57px;
font-size: 15px;
border-radius: 5px;
......@@ -10745,7 +10806,6 @@ header.navbar .category-menu .block-title i {
header.navbar .category-menu .block-title.active,
header.navbar .category-menu .block-title:hover {
background-color: #F95738;
}
@media (max-width: 991px) {
......@@ -10856,9 +10916,11 @@ header.navbar .main-menu ul.menu li:first-child {
header.navbar .main-menu ul.menu li a {
display: block;
font-weight: 900;
font-size: 15px;
padding: 0;
text-transform: uppercase;
color: white;
color: #f11300;
text-align: right;
line-height: inherit;
white-space: nowrap;
......@@ -11115,7 +11177,7 @@ header.navbar .block-search-navigation .search-icon.active {
.footer {
padding: 50px 0 0 0;
background-color: #f7df24;
background: linear-gradient(45deg,#fee0a0 , #f5be77);
}
.footer .block .block-title {
......@@ -11425,11 +11487,13 @@ header.navbar .block-search-navigation .search-icon.active {
display: block;
max-width: 100%;
height: auto;
height: 464px;
width: auto;
}
.estore-homepage-first .collection-region .collection-hot-product .block-title {
margin: 0;
padding: 5px 0;
padding: 10px 0;
text-align: center;
text-transform: uppercase;
color: #fff;
......@@ -12120,7 +12184,7 @@ article.commerce-product.teaser .product-image .products-hover-wrapper {
}
article.commerce-product.teaser .product-title {
margin: 10px 0 0;
margin: 28px 0 0;
padding: 0;
text-align: center;
font-size: 15px;
......
themes/contrib/estore/js/custom.js
View file @ 391c6897
......@@ -88,16 +88,16 @@ $(".sidebar-submenu-3").eq(i).addClass('ul-flex');
// Custom menu
$(".dropdown-toggle").mouseover(function() {
$(this).parent("li.expanded.dropdown").addClass("open");
// $(this).parent("li.expanded.dropdown").addClass("open");
})
$(".dropdown-menu").mouseover(function() {
$(this).parent("li.expanded.dropdown").addClass("open");
// $(this).parent("li.expanded.dropdown").addClass("open");
})
$(".dropdown-menu").mouseleave(function() {
$(this).parent("li.expanded.dropdown").removeClass("open");
// $(this).parent("li.expanded.dropdown").removeClass("open");
})
$(".dropdown-toggle").mouseleave(function() {
$(this).parent("li.expanded.dropdown").removeClass("open");
// $(this).parent("li.expanded.dropdown").removeClass("open");
})
......
themes/contrib/estore/templates/commerce/commerce-product--teaser-mini.html.twig
View file @ 391c6897
......@@ -21,13 +21,13 @@
#}
<article{{ attributes.addClass('commerce-product', 'teaser-mini', 'clearfix') }}>
<div class="product-inner row">
<div class="col-sm-4">
<div class="col-xs-3 col-md-4 col-lg-4">
<div class="product-image">
{{ product.field_images[0] }}
<div class="products-hover-wrapper"></div>
</div>
</div>
<div class="col-sm-8">
<div class="col-xs-9 col-md-8 col-lg-8">
<div class="product-right">
<h4 class="product-title">
<a href="{{ product_url }}">{{ product.title }}</a>
......
themes/contrib/estore/templates/system/page.html.twig
View file @ 391c6897
......@@ -131,71 +131,74 @@
</div>
</div>
</div>
<div class="mobile-modal"></div>
<div class="middle-header-wrapper clearfix">
<div class="container-fluid">
<div class="col-md-3 col-xs-7">
{% if page.left_middle_header %}
{{ page.left_middle_header }}
{% endif %}
</div>
<div class="col-lg-6 col-md-6 col-xs-2 order-button text-center">
<header{{ navbar_attributes.addclass(navbar_classes) }} id="navbar" role="banner">
<div class="navbar-header">
{% if page.middle_header %}
{{ page.middle_header }}
{% endif %}
</div>
</header>
<button type="button" name="button" class="btn-mobile-top">
<i class="fa fa-bars" aria-hidden="true"></i>
</button>
</div>
<div class="wrap-header">
<div class="middle-header-wrapper clearfix">
<div class="container-fluid">
<div class="col-md-3 col-xs-7">
{% if page.left_middle_header %}
{{ page.left_middle_header }}
{% endif %}
</div>
<div class="col-lg-6 col-md-6 col-xs-2 order-button text-center">
<header{{ navbar_attributes.addclass(navbar_classes) }} id="navbar" role="banner">
<div class="navbar-header">
{% if page.middle_header %}
{{ page.middle_header }}
{% endif %}
</div>
<div class="col-md-3 col-lg-3 col-xs-3">
{% if page.right_middle_header %}
{{ page.right_middle_header }}
{% endif %}
</header>
<button type="button" name="button" class="btn-mobile-top">
<i class="fa fa-bars" aria-hidden="true"></i>
</button>
</div>
<div class="col-md-3 col-lg-3 col-xs-3">
{% if page.right_middle_header %}
{{ page.right_middle_header }}
{% endif %}
</div>
</div>
</div>
</div>
<header{{ navbar_attributes.addclass(navbar_classes, 'bottom-nav') }} id="navbar" role="banner">
{% if not navbar_attributes.hasClass(container) %}
<div class="{{ container }}">
{% endif %}
<div class="navbar-header">
<header{{ navbar_attributes.addclass(navbar_classes, 'bottom-nav') }} id="navbar" role="banner">
{% if not navbar_attributes.hasClass(container) %}
<div class="{{ container }}">
{% endif %}
<div class="navbar-header">
{{ page.navigation }}
<div class="row">
<div class="col-lg-3 col-xs-6 col-md-3">
{{page.right_bottom_header}}
{{ page.navigation }}
<div class="row">
<div class="col-lg-3 col-xs-6 col-md-3">
{{page.right_bottom_header}}
</div>
<div class="col-lg-6 col-md-6">
{{page.middle_bottom_header}}
</div>
<div class="col-lg-3 col-xs-6 col-md-3">
</div>
<div class="col-lg-6 col-md-6">
{{page.middle_bottom_header}}
</div>
<div class="col-lg-3 col-xs-6 col-md-3">
{{page.left_bottom_header}}
{{page.left_bottom_header}}
</div>
</div>
</div>
</div>
{# Navigation (collapsible) #}
{% if page.navigation_collapsible %}
<div id="navbar-collapse" class="navbar-collapse collapse">
{# Navigation (collapsible) #}
{% if page.navigation_collapsible %}
<div id="navbar-collapse" class="navbar-collapse collapse">
{{ page.navigation_collapsible }}
{{ page.navigation_collapsible }}
</div>
{% endif %}
{% if not navbar_attributes.hasClass(container) %}
</div>
{% endif %}
{% if not navbar_attributes.hasClass(container) %}
</div>
{% endif %}
</header>
</header>
</div>
<div class="mobile-modal"></div>
{% endblock %}
{# Main #}
......
themes/contrib/estore/templates/views/views-view-unformatted--products--block-featured.html.twig
View file @ 391c6897
......@@ -20,9 +20,9 @@
<div id="estore-featured-products-carousel" class="features-products-carousel carousel slide" data-ride="carousel">
<div class="featured-top">
<div class="featured-title">
<h3 class="title">{{ 'Featured'|t }}</h3>
<h3 class="title">{{ 'Sản phẩm nổi bật'|t }}</h3>
{% if view.display_handler.options['title'] != '' %}
<h4 class="sub-title">{{ view.display_handler.options['title']|t }}</h4>
{# <h4 class="sub-title">{{ view.display_handler.options['title']|t }}</h4> #}
{% endif %}
</div>
<div class="carousel-controls">
......
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