Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Add email styles support #153

Merged
merged 33 commits into from
May 23, 2019
Merged

Add email styles support #153

merged 33 commits into from
May 23, 2019

Conversation

Januszpl
Copy link
Contributor

@Januszpl Januszpl commented Aug 29, 2017

Add email support

Internal ticket - https://dev.snowdog.pro/issues/32702

Janusz Janczy and others added 6 commits August 24, 2017 23:49
…on (without suffix) and for inline version with "-inline" suffix, fix compilation errors with missing/wrong variables name, import in email.scss module email styles only from Magento_Bundle, Magento_Rma, Magento_Sales modules as it's in the magento blank theme
styles/email-inline.scss Outdated Show resolved Hide resolved
styles/email.scss Outdated Show resolved Hide resolved
styles/email.scss Outdated Show resolved Hide resolved
styles/email/_email-base.scss Outdated Show resolved Hide resolved

a:visited {
color: $link__visited__color !important;
text-decoration: $link__visited__text-decoration !important;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If these !important are necessary, should be ignored by sass-lint to not make reports messy.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

styles/email/_email-base.scss Outdated Show resolved Hide resolved
styles/email/_email-extend-inline.scss Show resolved Hide resolved
styles/email/_email-variables.scss Outdated Show resolved Hide resolved
styles/email/_email-variables.scss Show resolved Hide resolved
@Igloczek
Copy link
Contributor

BTW. Will be better to add some stylelint ignore comments, than disabling checks for the whole files.

Janusz Janczy added 9 commits October 10, 2017 23:08
…o2-theme-blank-sass into feature/32702

* 'feature/32702' of https://github.com/SnowdogApps/magento2-theme-blank-sass:
  #32911: make breakpoints consistent across the sass fiels
  Accept any version of magento/framework
* develop:
  Better formatting for version compatibility (#160)
  Version 0.11.0
  Temporaily back to previous dependecy versioning
  Page is unresponsive after closing login popup in checkout (#156)
  Checkout sidebar should have a default length of 4
@Igloczek Igloczek changed the title Feature/32702 Email styles Oct 17, 2017
Copy link
Contributor

@Igloczek Igloczek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are not solved conflicts.

Janusz Janczy and others added 7 commits November 13, 2017 22:51
Conflicts:
	Magento_Sales/styles/_email.scss
	styles/vendor/magento-ui/variables/_email.scss
	styles/vendor/magento-ui/variables/_messages.scss
…ture more similar to less version, move variables imports to variables partial
…w typography as icons use typography defined variable (font name)
…ed previously in LESS to SASS porting commit (fd0ffcc)
@DB-Alex DB-Alex mentioned this pull request Aug 2, 2018
@Januszpl
Copy link
Contributor Author

Januszpl commented Aug 2, 2018

@Igloczek can you review and check #84

// ---------------------------------------------

$indent__base : 20px !default;
$indent__xl : 40px !default;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this PR abandoned? if not why are global variables removed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not abandoned and this just looks like a bug. This branch was not updated for months, so there might be some old code here.

Copy link
Contributor Author

@Januszpl Januszpl Dec 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

content of global.scss was moved to variables/_typography where it is in less version and lib.scss was also modified to match closer the look of less version (and easier upgrades). I had some styles issues and it helped me organize things.
It was created like that in ancient times when I guess approach was different to this project - c2c4cee

But I reverted those changes and will make another PR for that part.

@Januszpl
Copy link
Contributor Author

I will try to check this PR again and check/finish all things.

@Januszpl
Copy link
Contributor Author

Januszpl commented Nov 29, 2018

Already started but it will need to wait to next week when I will come back from a place without access to internet ;)

Januszpl and others added 5 commits December 7, 2018 15:14
…ons below typography as icons use typography defined variable (font name)"

This reverts commit 61e64ec.
…ke structure more similar to less version, move variables imports to variables partial"

This reverts commit ba79372.
@Januszpl
Copy link
Contributor Author

Januszpl commented Mar 3, 2019

@Igloczek can we merge this and #206 and #207 (tested on my local 2.1, 2.2, 2.3 instances)

@Januszpl Januszpl changed the title Email styles Add email styles support Mar 3, 2019
@Januszpl Januszpl requested a review from Igloczek March 4, 2019 14:00
@Januszpl Januszpl requested a review from anqaka April 15, 2019 13:57
@Januszpl Januszpl removed the request for review from Igloczek May 14, 2019 18:22
styles/email/_email-base.scss Show resolved Hide resolved
styles/email/_email-base.scss Show resolved Hide resolved
styles/email/_email-extend-inline.scss Show resolved Hide resolved
anqaka
anqaka previously approved these changes May 22, 2019
Janusz Janczy added 2 commits May 22, 2019 17:59
anqaka
anqaka previously approved these changes May 23, 2019
@Januszpl Januszpl merged commit f77ae92 into develop May 23, 2019
@Igloczek Igloczek deleted the feature/32702 branch July 16, 2019 16:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants