Skip to content
This repository has been archived by the owner on Dec 1, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
davidwindell committed Oct 9, 2023
2 parents cbafc2c + 77253d2 commit 8564919
Show file tree
Hide file tree
Showing 56 changed files with 1,199 additions and 7 deletions.
19 changes: 15 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,24 @@ Removed lib-css mixins

## [Unreleased]

## [1.5.0] - 2020-10-26
### Changed
- Removed Magento framework dependency from `composer.json` to simply maintenance and add Magento 2.4 support (#241)

## [1.4.0] - 2020-03-10
### Added
- PageBuilder support (#235)

### Changed
- Reorganise `styles/vendor/magento-ui/_lib` Imports (#226)
- LESS fade mixin for rgba (#225)

## [1.3.0] - 2019-07-06
### Added
- email styles support (#84)
- Email styles support (#84)

### Changed
- reorganize imports of magento ui sass related files to match less theme structure (#204)
- Reorganize imports of Magento UI SASS related files to match less theme structure (#204)

### Removed
- xml decleration that were removed in Magento 2.3 sass blank theme (#208)

- XML decleration that were removed in Magento 2.3 sass blank theme (#208)
1 change: 1 addition & 0 deletions Magento_PageBuilder/styles/_module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'modules/module';
48 changes: 48 additions & 0 deletions Magento_PageBuilder/styles/modules/_icons.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
@font-face {
font-family: $icons-pagebuilder__font-name;
font-style: normal;
font-weight: normal;
src: url('${icons-pagebuilder__font-path}.eot');
src:
url('${icons-pagebuilder__font-path}.eot?#iefix') format('embedded-opentype'),
url('${icons-pagebuilder__font-path}.woff') format('woff'),
url('${icons-pagebuilder__font-path}.ttf') format('truetype');
}

.pagebuilder-icon {
font-family: $icons-pagebuilder__font-name;
font-style: normal;
font-weight: normal;
line-height: 1;
speak: none;
}

[class^='pagebuilder-icon-']:before,
[class*=' pagebuilder-icon-']:before {
display: inline-block;
font-family: $icons-pagebuilder__font-name;
font-style: normal;
font-weight: normal;
line-height: 1;
speak: none;
text-decoration: inherit;
text-rendering: auto;
text-transform: none;
vertical-align: middle;
}

.pagebuilder-icon-down:before {
content: $icon-pagebuilder-caret-down__content;
}

.pagebuilder-icon-next:before {
content: $icon-pagebuilder-caret-next__content;
}

.pagebuilder-icon-prev:before {
content: $icon-pagebuilder-caret-prev__content;
}

.pagebuilder-icon-up:before {
content: $icon-pagebuilder-caret-up__content;
}
47 changes: 47 additions & 0 deletions Magento_PageBuilder/styles/modules/_layout.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
//
// Product -- Full Width
// _____________________________________________

.product-full-width-section {
padding: 0.5em 0;

.block.review-add {
margin-top: 2.7rem;
}
}

.page-layout-product-full-width {
.block.related {
margin-top: 2.7rem;
}
}

.page-main-details .product-section-title {
border-bottom: 1px solid $color-gray-middle2;
margin-bottom: 15px;
padding-bottom: 12px;
}

.additional-attributes-wrapper .additional-attributes {
border: none;
width: auto;

> tbody > tr {
> th {
border: none;
padding: 5.5px 30px 10px 0;
}
> td {
border: none;
padding: 5.5px 5px 10px;
}
}
}

//
// Page -- Full Width
// _____________________________________________

.cms-index-index.page-layout-cms-full-width .nav-sections {
margin-bottom: 0;
}
59 changes: 59 additions & 0 deletions Magento_PageBuilder/styles/modules/_module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
$icons-pagebuilder__font-name: 'pagebuilder-font';
$icons-pagebuilder__font-path: '../Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons';

$icon-pagebuilder-caret-up__content: '\f104';
$icon-pagebuilder-caret-down__content: '\f101';
$icon-pagebuilder-caret-next__content: '\f102';
$icon-pagebuilder-caret-prev__content: '\f103';

@import 'icons';
@import 'layout';
@import 'slick/slick';
@import 'content-type/import';

.cms-content-important {
background-color: $color-white-smoke;
color: $color-gray20;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 22px;
font-style: normal;
font-weight: 300;
line-height: 1.1;
margin: 0 0 35px -20px;
padding: 20px;
}

.pagebuilder-full-width {
float: left;
width: 100%;
}

.pagebuilder-content-type {
box-sizing: border-box;
margin-bottom: 20px;
}

//
// Styles for legacy content types
// ---------------------------------------------

.pagebuilder-accordion {
@include lib-data-accordion();
}

//
// Responsive Classes
// _____________________________________________

@include min-screen($screen__m) {
.pagebuilder-mobile-only {
display: none !important; // sass-lint:disable-line no-important
}
}

@include max-screen($screen__m - 1) {
.pagebuilder-mobile-hidden {
display: none !important; // sass-lint:disable-line no-important
}
}

21 changes: 21 additions & 0 deletions Magento_PageBuilder/styles/modules/content-type/_import.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//
// _import imports all content types less files
// _____________________________________________

@import 'banner/import';
@import 'block/import';
@import 'buttons/import';
@import 'button-item/import';
@import 'column/import';
@import 'column-group/import';
@import 'heading/import';
@import 'html/import';
@import 'image/import';
@import 'map/import';
@import 'products/import';
@import 'row/import';
@import 'slide/import';
@import 'slider/import';
@import 'tabs/import';
@import 'text/import';
@import 'video/import';
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// Collage center appearance styles
// _____________________________________________

[data-appearance='collage-centered'] {
.pagebuilder-banner-wrapper {
.pagebuilder-overlay {
margin-left: auto;
margin-right: auto;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Collage left appearance styles
// _____________________________________________

[data-appearance='collage-left'] {
.pagebuilder-banner-wrapper {
.pagebuilder-overlay {
margin-right: auto;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Collage right appearance styles
// _____________________________________________

[data-appearance='collage-right'] {
.pagebuilder-banner-wrapper {
.pagebuilder-overlay {
margin-left: auto;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
//
// Default appearance styles
// _____________________________________________

[data-content-type='banner'] > [data-element='link'],
[data-content-type='banner'] > [data-element='empty_link'] {
color: inherit;
text-decoration: inherit;

&:hover {
color: inherit;
text-decoration: inherit;
}
}

.pagebuilder-banner-wrapper {
background-clip: padding-box;
border-radius: inherit;
overflow-wrap: break-word;
box-sizing: border-box;
word-wrap: break-word;

.pagebuilder-overlay {
box-sizing: border-box;
padding: 30px;
transition: background-color 500ms ease;

&.pagebuilder-poster-overlay {
align-items: center;
display: flex;
justify-content: center;
}

&:not(.pagebuilder-poster-overlay) {
max-width: 540px;
}
}

[data-element='content'] {
min-height: 50px;
}

.pagebuilder-banner-button {
margin: 20px 0 0 0;
max-width: 100%;
text-align: inherit;
transition: opacity 500ms ease;
word-break: break-word;
}
}

//
// Responsive Classes
// _____________________________________________

@include max-screen($screen__m - 1) {
.pagebuilder-banner-wrapper {
background-attachment: scroll !important; // sass-lint:disable-line no-important

.pagebuilder-overlay:not(.pagebuilder-poster-overlay) {
max-width: none;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//
// _import imports all appearance scss files
// _____________________________________________

@import 'default';
@import 'poster';
@import 'collage-center';
@import 'collage-left';
@import 'collage-right';
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//
// Poster appearance styles
// _____________________________________________

.pagebuilder-banner-wrapper {
.pagebuilder-poster-content {
width: 100%;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// Default appearance styles
// _____________________________________________

[data-content-type$='block'] {
.block {
p:last-child {
margin-bottom: 1rem;
margin-top: 0;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//
// _import imports all appearance scss files
// _____________________________________________

@import 'default';
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
//
// Default appearance styles
// _____________________________________________

[data-content-type='button-item'] {
max-width: 100%;
[data-element='link'],
[data-element='empty_link'] {
max-width: 100%;
word-wrap: break-word;
}
[data-element='empty_link'] {
cursor: default;
}
}

a,
button,
div {
&.pagebuilder-button-link {
@include lib-button-l();
@include lib-button-as-link(
$_margin: 0 10px 10px 0,
$_padding: $button__padding__l
);
@include lib-css(font-weight, $font-weight__semibold);
box-shadow: none;
box-sizing: border-box;
display: inline-block;
}

&.pagebuilder-button-primary {
@include lib-link-as-button();
@include lib-button-primary($_button-margin: 0 10px 10px 0);
@include lib-button-l();
@include lib-css(border-radius, $button__border-radius);
box-shadow: none;
}

&.pagebuilder-button-secondary {
@include lib-link-as-button();
@include lib-button($_button-margin: 0 10px 10px 0);
@include lib-button-l();
@include lib-css(border-radius, $button__border-radius);
box-shadow: none;
}
}
Loading

0 comments on commit 8564919

Please sign in to comment.