Skip to content

Commit

Permalink
Merge pull request #528 from BitBagCommerce/feature/OP-312-fixtures-s…
Browse files Browse the repository at this point in the history
…tyling

Restyling and redefining fixtures for homepage, category, product and Q&A pages
  • Loading branch information
senghe authored Sep 27, 2024
2 parents a8f4500 + 71c708a commit 2ba057a
Show file tree
Hide file tree
Showing 46 changed files with 1,328 additions and 599 deletions.
12 changes: 6 additions & 6 deletions src/Resources/assets/shop/scss/_carousel.scss
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
.carousel-wrapper {
position: relative;

.carousel {
.products-carousel {
margin: 0 -1em;
}

.carousel-nav {
.carousel-left {
.products-carousel-nav {
.products-carousel-left {
left: 30px;
}

.carousel-right {
.products-carousel-right {
right: 30px;
}

.carousel-left, .carousel-right {
.products-carousel-left, .products-carousel-right {
position: absolute;
top: 50%;
transform: translateY(-50%);
}
}

.carousel-item {
.products-carousel-item {
padding: 5px 1em;
}
}
4 changes: 2 additions & 2 deletions src/Resources/config/fos_ck_editor/fos_ck_editor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ fos_ck_editor:
- "exportpdf"
plugins:
mediaVideo:
path: '/bundles/SyliusCmsPlugin/js/ckeditor-plugins/video/'
path: '/bundles/syliuscmsplugin/js/ckeditor-plugins/video/'
filename: 'plugin.js'
mediaImage:
path: '/bundles/SyliusCmsPlugin/js/ckeditor-plugins/image/'
path: '/bundles/syliuscmsplugin/js/ckeditor-plugins/image/'
filename: 'plugin.js'
toolbars:
configs:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="{{ content_element_base_class }}__taxons-list">
<ul class="ui bulleted list">
<ul class="ui list">
{% for taxon in taxons %}
<li>
<a href="{{ path('sylius_shop_product_index', {'slug': taxon.slug, '_locale': taxon.translation.locale}) }}">
Expand Down
Binary file removed tests/Application/Resources/fixtures/BitBagOffer.pdf
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/Application/Resources/fixtures/blog_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed tests/Application/Resources/fixtures/sale.jpeg
Binary file not shown.
Binary file removed tests/Application/Resources/fixtures/size_table.jpeg
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
1 change: 1 addition & 0 deletions tests/Application/assets/shop/entry.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
import 'sylius/bundle/ShopBundle/Resources/private/entry';
import './styles.scss';
93 changes: 93 additions & 0 deletions tests/Application/assets/shop/styles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
.homepage-logo {
border-radius: 6px;
overflow: hidden;
}

.homepage-sale {
img {
width: 80% !important;
margin: auto !important;
border-radius: 20px;
}
}

.cms_content_element__taxons-list {
.ui {
display: flex;
justify-content: space-between;
margin-left: 0 !important;

li {
flex: 1 1 auto;
text-align: center;
vertical-align: middle;
border: solid #eee 1px;
margin: 20px;
border-radius: 4px;
font-size: 16pt;
background: transparent;
transition: border-color 200ms ease-in;

a {
padding: 40px !important;
display: block;
transition: color 200ms ease-in;
}
}

li:hover {
border-color: #22b99a;
transition: border-color 200ms ease-in;
a {
color: #22b99a;
transition: color 200ms ease-in;
}
}

li:before {
content: none !important;
}
}
}

.cms-page-content {
.teaser {
.ui.image {
width: 100%;

img {
width: 100%
}
}
}

h2 {
font-size: 22pt;
margin-bottom: 22px;
}

h3 {
margin-top: 16px;
font-size: 18pt;
margin-bottom: 16px;
}

.cms_content_element__textarea {
p {
font-size: 13pt;
ul {
font-size: 13pt;
li {
margin-bottom: 6px;
}
}
}

ul {
font-size: 13pt;
li {
margin-bottom: 6px;
}
}
}
}
7 changes: 7 additions & 0 deletions tests/Application/config/packages/_sylius.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,10 @@ sylius_api:
sylius_shop:
product_grid:
include_all_descendants: true

sylius_cms:
templates:
blocks:
- "src/Resources/views/Block/CustomLayout.html.twig"
pages:
- "src/Resources/views/Page/CustomLayout.html.twig"
34 changes: 34 additions & 0 deletions tests/Application/config/packages/fixtures/1_collection.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
parameters:
fixtures_dir: "%kernel.project_dir%/Resources/fixtures"

sylius_fixtures:
suites:
default:
listeners:
orm_purger: ~
logger: ~
fixtures:
collection:
options:
custom:
blog:
name: "Blog"
type: "page"
homepage:
name: "Homepage"
type: "page"
homepage_banner:
name: "Homepage"
type: "media"
black_friday:
name: "Black Friday"
type: "block"
black_friday_banner:
name: "Black Friday banners"
type: "media"
blog_images:
name: "Blog images"
type: "media"
products_details:
name: "Product details"
type: "block"
Loading

0 comments on commit 2ba057a

Please sign in to comment.