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.

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

feat/UI-bundleBuilder #2513

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added assets/img/none.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ const pageClasses = {
wishlists: () => import('./theme/wishlist'),
};

const customClasses = {};
const customClasses = {
'pages\\custom\\product\\fashion_accesories': () => import('./custom/product/fashion_accessories'), // Windows
'pages/custom/product/fashion_accessories': () => import('./custom/product/fashion_accessories'), // Mac/Linu
};

/**
* This function gets added to the global window and then called
Expand Down
Empty file.
153 changes: 153 additions & 0 deletions assets/scss/custom/product/fashion_accessories.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
body {
overflow-x: hidden !important;
}
.page-wraper{
width: 98.6vw;
margin-left: calc(-50vw + 50%);
padding: 40px;
}
.row{
display: flex;
text-align: center;
background: whitesmoke;
border-radius: 25px !important;
}
.bundle{
min-height: 100px;
max-width: 100%;
padding-top: 10px;
margin-top: 0px;
margin-bottom: 0px;
display: flex;
align-items: center;
// margin-bottom: -4.21429rem ;
}
.bundle_left_image{
margin-top: 10px;
margin-bottom: 10px;
min-width: 100px;
max-width: 0px;
max-height: 120px;
min-height: 50px;
}
.center_bundle_img{
margin-top: 10px;
}
.left_bundle_title{
margin-top: 30px;
margin-bottom: 0px;
margin-left: 10px;
text-align: center;
font-size: 25px;
font-family: "Roobert-SemiBold";
}
.textunder_price {
font-size: 23px;
font-family: "Poppins", serif;
padding-left: 10px;
text-align: center;
margin-top: 40px;
margin-right: 40px;
}
.cart_button{
color: #ffffff !important;
background: linear-gradient(270deg, #990AE2 1.67%, #1485EF 96.39%);
border-radius: 5px !important;
cursor: pointer !important;
overflow: hidden !important;
font-weight: bolder !important;
margin: 40px 6px !important;
font-family: 'Roobert-Regular' !important;
width: 7rem !important;
height: 45px !important;
padding: 0px !important;
}
.cart-btn-text{
font-size: 10px !important;
text-align: center;
}
.accessories-row{
display: flex;
flex-direction: row;
flex-wrap:wrap;
background-color:white !important;
}
.accessories-list{
display: flex;
background-color: #EFEFEF !important;
border-radius: 15px !important;
min-height: 300.4px;
min-width: 11px;
margin: 31px;
width: 230px;
height: 400px;
padding: 10px;
}
.accessories-name{
display: flex;
text-align:left;
font-size: 19px;
font-weight: 800;
margin-bottom: 10px;
}
.accessories-price{
display: flex;
font-size: 19px;
margin-left: 10px;
margin-bottom: 20px;
}
.product-image{
min-height: 150px;
max-height: 150px;
object-fit: contain;
width: 100%;
text-align: center;
}
.row3{
display: flex;
text-align: left;
}
.accessories-list-button{
border-radius: 5px !important;
cursor: pointer !important;
overflow: hidden !important;
font-weight: bolder !important;
margin: 40px 0% !important;
font-family: 'Roobert-Regular' !important;
width: 6rem !important;
height: 35px !important;
margin-right: 230px;
height: 400px;
}
.button-learn{
background:#bac0c5;
background-color:none;
text-align:center;
padding-left: 0px;
}
.button-bundle{
background: linear-gradient(270deg, #990AE2 1.67%, #1485EF 96.39%);
text-align: center;
}
.accessories-list-button {
display: flex;
justify-content: space-between;
}
.none{
display: flex;
background-color: #EFEFEF !important;
border-radius: 15px !important;
min-height: 300.4px;
min-width: 11px;
margin: 31px;
width: 230px;
height: 400px;
padding: 10px;
}
.none-image{
border-radius: 5px !important;
cursor: pointer !important;
background-color: #cdcdcd !important;
font-weight: bolder !important;
height: 35px !important;
}
4 changes: 2 additions & 2 deletions assets/scss/settings/global/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
@import "overlay/overlay";

// Set these to true so that Foundation styles are exposed from Citadel
$include-html-classes: false !default;
$include-print-styles: false !default;
$include-html-classes: true !default;
$include-print-styles: true !default;
$include-html-global-classes: $include-html-classes !default;

// These are needed when setting $include-html-classes to true, so that rems don't conflict with pixels.
Expand Down
1 change: 1 addition & 0 deletions assets/scss/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,4 @@
// -----------------------------------------------------------------------------

@import "layouts/layouts"; // 1
@import "./custom/product/fashion_accessories.scss";
File renamed without changes.
3 changes: 3 additions & 0 deletions templates/layout/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
{{#block "head"}} {{/block}}

<link href="{{ head.favicon }}" rel="shortcut icon">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1">

<script>
Expand Down
84 changes: 84 additions & 0 deletions templates/pages/custom/product/fashion_accessories.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{{#partial "page"}}
<div class="page-wraper">
<div class="row">
<div class="columns large-12 ">
<div class="columns large-3">
<div class="columns large-6">
<img class="bundle_left_image" src="https://encrypted-tbn3.gstatic.com/shopping?q=tbn:ANd9GcTI1DcKqzeGvqn5xYQQUpYm3szvAZh90X0LVWAGSb8yTiWDoCBbHrOvcxzeigN7yIKfIeUe4XSm_tmqq1Geu8hLNl63wISc5bvar3asAqb7KLbvkjdGXgUo">
</div>
<div class="columns large-6">
<h2 class="left_bundle_title">Calvin Klein Handbags</h2>
</div>
</div>
<div class="columns large-6 ">
<div class="bundle">
<div class="columns large-2">
<img class="center_bundle_img" src="https://m.media-amazon.com/images/I/410kaYn-4BL.jpg">
<p class="center_bundle_title">Calvin Klein</p>
</div>
<div class="columns large-2">
<img class="center_bundle_img" src="https://m.media-amazon.com/images/I/410kaYn-4BL.jpg">
<p class="center_bundle_title">Calvin Klein</p>
</div>
<div class="columns large-2">
<img class="center_bundle_img" src="https://m.media-amazon.com/images/I/410kaYn-4BL.jpg">
<p class="center_bundle_title">Calvin Klein</p>
</div>
<div class="columns large-2">
<img class="center_bundle_img" src="https://m.media-amazon.com/images/I/410kaYn-4BL.jpg">
<br>
<p class="center_bundle_title">Calvin Klein</p>
</div>
<div class="columns large-2">
<img class="center_bundle_img" src="https://m.media-amazon.com/images/I/410kaYn-4BL.jpg">
<br>
<p class="center_bundle_title">Calvin Klein </p>
</div>
<div class="columns large-2">
<img class="center_bundle_img" src="https://m.media-amazon.com/images/I/410kaYn-4BL.jpg">
<br>
<p class="center_bundle_title">Calvin Klein</p>
</div>
</div>
</div>
<div class="columns large-3">
<div class="columns large-6 bundle3">
<div class="textunder_price">
<span style="color:black;font-weight:bold">£</span>183.50
</div>
</div>
<div class="columns large-6 bundle3">
<div class="cart_button">
<button class="cart-btn-text">Add to Cart</button>
</div>
</div>
</div>
</div>
</div>
<br>
<div class="accessories-row">
<div>
<div class="columns large-3 accessories-list">
<div>
<div class="accessories-name">128GB U3 Industrial Grade microSD Card</div>
<div class="accessories-price">£45.00</div>
<img class="product-image" src="{{getImage image}}">
<div class="row3">
<div class="columns large-6">
<div class="accessories-list-button">
<button class="button-learn">View Details</button>
</div>
</div>
<div class="columns large-6">
<div class="accessories-list-button">
<button class="button-bundle" type="button" onclick="alert('Loading Next Page')">Add to bundle</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{{/partial}}
{{> layout/base}}
1 change: 0 additions & 1 deletion templates/pages/product.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
limit: {{theme_settings.productpage_similar_by_views_count}}
---
{{inject 'productId' product.id}}

{{#partial "page"}}

{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}
Expand Down