Skip to content

P
ptd
Commit d8a58686 authored by Chi Bui's avatar Chi Bui 👀
Browse files
Options

edit css 19/08

parent b415f617
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 58 deletions
themes/contrib/estore/css/styles.css
View file @ d8a58686
......@@ -243,7 +243,7 @@ header .link_content .field--type-text-with-summary p {
.bottom-nav {
/* background-color: #f7df24 !important; */
padding-bottom: 16px;
padding-bottom: 10px;
}
.region-middle-header {
......@@ -253,8 +253,10 @@ header .link_content .field--type-text-with-summary p {
.region-middle-header .main-menu {
width: 100%;
}
.region-middle-header .main-menu .menu--main {
.pin .main-menu{
width: 100%;
}
.pin .main-menu .menu--main {
display: flex;
width: 100%;
justify-content: space-between;
......@@ -377,6 +379,7 @@ padding: 20px 20px 14px !important;
/* height: 40px; */
display: flex;
align-items: center;
line-height: 30px !important;
}
.menu--category-menu .open ul.sidebar-submenu-3 li {
......@@ -399,8 +402,13 @@ padding: 20px 20px 14px !important;
}
.menu--category-menu .open ul.sidebar-submenu-2 {
padding: 10px 5px 0px !important;
min-height: 445px;
padding: 10px 5px !important;
min-height: 456px;
margin: 0;
/* border-left: none; */
/* border-right: 2px solid #e94337; */
/* border-bottom: 2px solid #e94337; */
/* border-top: 2px solid #e94337; */
}
/* .menu--category-menu .open ul.sidebar-submenu-2 ul.slidebar-submenu-3 {
......@@ -413,7 +421,7 @@ padding: 20px 20px 14px !important;
flex-direction: column;
justify-content: flex-start;
top: 0;
left: 97%;
left: 100%;
/* width: 73%; */
/* text-align: center; */
background: white !important;
......@@ -502,8 +510,8 @@ header.navbar .category-menu ul.menu ul.dropdown-menu li span {
}
.block-views-blocklist-social-block-social .view-content .img-responsive {
width: 40px;
height: 40px;
width: 30px;
height: 30px;
margin-right: 9px;
/* margin-top: 14px; */
border-radius: 9px;
......@@ -551,7 +559,7 @@ header.navbar .category-menu ul.menu ul.dropdown-menu li {
}
.main-container {
min-height: 350px
min-height: 500px
}
@media(min-width: 991px) and (max-width:1200px) {
......@@ -808,8 +816,8 @@ header.navbar .category-menu ul.menu.litte-menu {
}
.logo_img {
transition: all 0.3s ease 0s;
animation: mymove 3s infinite linear;
/* transition: all 0.3s ease 0s; */
/* animation: mymove 3s infinite linear; */
}
.middle-header-wrapper .container-fluid {
......@@ -841,7 +849,7 @@ header.navbar .category-menu ul.menu.litte-menu {
.name.navbar-brand {
text-transform: uppercase;
color: #e94337 !important;
font-size: 33px !important;
font-size: 35px !important;
width: 100%;
letter-spacing: 0px !important;
font-weight: bold !important;
......@@ -849,7 +857,7 @@ header.navbar .category-menu ul.menu.litte-menu {
}
.hl-link-img {
background: #f3c09a;
/* background: #f3c09a; */
z-index: 20;
position: absolute;
top: 4px;
......@@ -863,17 +871,12 @@ header.navbar .category-menu ul.menu.litte-menu {
right: 15px;
}
header .link_content:hover {
background: #eb5335;
color: #;
}
header .link_content {
/* background: #eb5335; */
background-color: #ea442c;
/* background-color: #ea442c; */
height: 57px;
color: white;
color: #fff !important;
display: block;
font-size: 14px;
font-weight: 500;
......@@ -886,12 +889,13 @@ header .link_content {
}
header .link_content a {
color: white;
color: #E94536 !important;
font-size: 26px;
}
header .link_content a:hover {
/* header .link_content a:hover {
color: white;
}
} */
.pin {
border: 1.75px solid #e94537;
......@@ -1103,25 +1107,31 @@ header.navbar .block-search-navigation .search-icon {
display: none;
}
.region-middle-bottom-header .form-group {
.region-middle-header .form-group {
display: block !important;
/* position: relative; */
}
.region-middle-bottom-header input {
.region-middle-header button .button-label{
display: none;
}
.region-middle-header input {
border: 2.5px solid #e94537;
/* background: #fcdb99; */
width: 100% !important;
height: 56px;
height: 48px;
color: #333;
font-size: 14px;
font-weight: 400;
padding: 0 145px 0 20px;
border-radius: 6px;
}
.region-middle-bottom-header button {
font-size: 14px;
.region-middle-header button span {
margin-right: 0 ;
margin-left: 0;
margin-top: 5px;
}
.region-middle-header button {
font-size: 20px;
text-transform: uppercase;
border: 0;
position: absolute;
......@@ -1132,12 +1142,11 @@ header.navbar .block-search-navigation .search-icon {
color: #fff;
font-weight: 600;
padding: 0 20px;
min-width: 110px;
min-width: 95px;
border-radius: 0 5px 5px 0;
-webkit-transition: 0.3s;
transition: 0.3s;
max-height: 50px;
max-height: 56px;
max-height: 48px;
}
/* invi 1440 */
......@@ -3174,7 +3183,6 @@ html {
}
body {
color: #7f7d7d;
background-color: #fff;
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
......@@ -3896,8 +3904,8 @@ pre code {
.col-lg-12 {
position: relative;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
padding-right: 10px;
padding-left: 10px;
}
.col-xs-1,
......@@ -5623,7 +5631,9 @@ select[multiple].input-lg,
margin-bottom: 0;
vertical-align: middle;
}
.layout-region-checkout-main .form-control {
width: 100%;
}
.form-inline .form-control {
display: inline-block;
width: auto;
......@@ -10952,7 +10962,7 @@ body.toolbar-loading.toolbar {
.top-header-wrapper .left-top-header {
float: left;
margin-top: 12px;
margin-top: 8px;
line-height: 12px;
/* font-size: 45px; */
}
......@@ -11039,7 +11049,7 @@ body.toolbar-loading.toolbar {
}
.middle-header-wrapper {
padding: 20px 0;
padding: 10px 0;
/* background: white; */
}
......@@ -11320,7 +11330,7 @@ header.navbar .category-menu {
}
header.navbar .category-menu .block-title {
padding: 5px 30px;
padding: 9px 30px;
transition: all 0.5s ease-in-out;
color: #fff;
font-weight: 600;
......@@ -11333,7 +11343,7 @@ header.navbar .category-menu .block-title {
header.navbar .category-menu .block-title i {
float: right;
line-height: 43px;
line-height: 37px;
}
header.navbar .category-menu .block-title.active,
......@@ -11361,7 +11371,7 @@ header.navbar .category-menu .block-title:hover {}
header.navbar .category-menu ul.menu {
position: absolute;
z-index: 999;
top: 83px;
top: 78px;
left: 0;
display: block;
width: 100%;
......@@ -11389,7 +11399,7 @@ header.navbar .category-menu ul.menu li {
}
header.navbar .category-menu ul.menu li:hover {
background: #f3f3f3
/* background: #f3f3f3 */
}
header.navbar .category-menu ul.menu li a {
......@@ -11463,7 +11473,12 @@ header.navbar .main-menu ul.menu .sidebar-submenu-2 li a {
.commerce-checkout-flow-multistep-default {
margin-bottom: 80px !important;
}
.layout-region-checkout-secondary h3{
margin-top: 0;
}
.layout-region-checkout-secondary .table-responsive table tbody tr td {
line-height: 33px !important;
}
.commerce-checkout-flow-multistep-default button {
position: absolute;
left: 45%;
......@@ -11471,6 +11486,8 @@ header.navbar .main-menu ul.menu .sidebar-submenu-2 li a {
font-weight: 800;
font-size: 16px;
padding: 10px;
bottom: 27px;
}
header.navbar .main-menu ul.menu li a {
......@@ -11712,8 +11729,8 @@ header.navbar .block-search-navigation .search-icon.active {
.region-sidebar-first .block-views .view-display-id-block_products ul li,
.region-sidebar-second .block-views .view-display-id-block_products ul li {
margin-bottom: 10px;
padding-bottom: 10px;
margin-bottom: 5px;
/* padding-bottom: 10px; */
list-style-type: none;
border-bottom: 1px solid #e1e1e1;
}
......@@ -12029,7 +12046,7 @@ header.navbar .block-search-navigation .search-icon.active {
}
.estore-homepage-first .collection-region {
margin: 30px 0 20px;
margin: 20px 0 10px ;
}
.estore-homepage-first .collection-region .collection-banner img {
......@@ -13172,7 +13189,7 @@ article.commerce-product.full .product-right .field--name-variations button {
}
a {
transition: all 0.3s ease-in-out;
transition: all 0.1s ease-in-out;
}
.btn {
......
themes/contrib/estore/js/custom.js
View file @ d8a58686
......@@ -56,6 +56,22 @@ for (i = 0; i < acc.length; i++) {
$(".menu.menu--category-menu.nav").addClass('hide-block');
$(".menu.menu--category-menu.nav").addClass('not-home');
}
var current = location.pathname;
if(current == "/products"){
$(".menu.menu--category-menu.nav").removeClass('hide-block').removeClass('not-home').css({"top":"140px"});
}
if(current.length > 17){
let currentpathSlice = current.slice(0,17);
if(currentpathSlice == "/product_category"){
$(".menu.menu--category-menu.nav").removeClass('hide-block').removeClass('not-home').css({"top":"125px"});;
}
}
// console.log($(".sidebar-submenu-3").children('li'));
$(".region-middle-bottom-header input").attr("placeholder", "Tìm kiếm");
if ($(window).width() > 991) {
......@@ -102,7 +118,7 @@ for (i = 0; i < acc.length; i++) {
}
// $(".region-middle-bottom-header button").text(" ")
var current = location.pathname;
var textPrice = $(".field--name-price");
for(let i =0 ; i < textPrice.length; i++){
let price = textPrice.eq(i).text();
......
themes/contrib/estore/templates/block/block--system-menu-block--category-menu.html.twig
View file @ d8a58686
......@@ -40,7 +40,7 @@
{% set title_attributes = title_attributes.addClass('visually-hidden') %}
{% endif %}
{{ title_prefix }}
<div {{ title_attributes.addClass('block-title','active').setAttribute('id', heading_id) }}><span>{{ configuration.label }}<i class="fa fa-navicon"></i></span></div>
<div {{ title_attributes.addClass('block-title','active').setAttribute('id', heading_id) }}><span>{{ configuration.label }}<i class="fa fa-caret-down" ></i></span></div>
{{ title_suffix }}
{# Menu. #}
......
themes/contrib/estore/templates/commerce/commerce-checkout-completion-message.html.twig 0 → 100644
View file @ d8a58686
{#
/**
* @file
* Default theme implementation for the completion message.
*
* Available variables:
* - order_entity: The order entity.
* - payment_instructions: The payment instructions, if provided.
*
* @ingroup themeable
*/
#}
<div class="checkout-complete">
{% if payment_instructions %}
<div class="checkout-complete__payment-instructions">
<h2>{{ 'Payment instructions'|t }}</h2>
<h4 style= "font-weight: 400">{{ 'You can view your order on your account page when logged in.'|t }} </h4>
<h4>{{ 'Your order number is @number.'|t({'@number': order_entity.getOrderNumber}) }}</h4>
<h4 style= "font-weight: 400">{{ payment_instructions }}</h4>
</div>
{% endif %}
</div>
themes/contrib/estore/templates/layouts/homepage/first/homepage--first.html.twig
View file @ d8a58686
......@@ -55,14 +55,6 @@
{% endif %}
{% if content.product_categories %}
<div {{ region_attributes.product_categories.addClass('layout__region', 'layout__region--product-categories', 'row') }}>
<div class="layout__region--product-categories--inner container-fluid">
{{ content.product_categories }}
</div>
</div>
{% endif %}
{% if content.second_collection_title or content.second_collection_products or content.second_collection_hot or content.second_collection_banner %}
<div class="collection-region second-collection-region">
......
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