BP-1293: Add theming support to new rich-text editor for basic redactor configuration #240
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| @use 'sass:map'; | ||
| @use 'necessary-mix/tables-generator' as tables; | ||
| @use 'necessary-mix/buttons-generator' as buttons; | ||
| @use 'necessary-mix/typography-generator' as typography; | ||
| @use 'necessary-mix/checkboxes-generator' as checkboxes; | ||
| @use 'necessary-mix/toolbar-generator' as toolbar; | ||
|
|
||
| @mixin generate-from($theme) { | ||
| @include typography.generate-from($theme); | ||
| @include tables.generate-from($theme); | ||
| @include buttons.generate-from($theme); | ||
| @include checkboxes.generate-from($theme); | ||
| @include toolbar.generate-from($theme); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| @use 'sass:map'; | ||
| @use '@angular/material' as mat; | ||
|
|
||
| $default-material-button: map.get(mat.define-typography-config(), 'button'); | ||
|
|
||
| @mixin generate-from($theme) { | ||
| $theming-primary: map.get($theme, 'general', 'colors', 'primary'); | ||
| $theming-font-family: map.get($theme, 'general', 'fonts', 'buttons', 'family'); | ||
| $theming-font-weight: map.get($theme, 'general', 'fonts', 'buttons', 'weight'); | ||
| $theming-font-size: map.get($theme, 'general', 'fonts', 'buttons', 'size'); | ||
|
|
||
| $primary-color: if($theming-primary == '' or $theming-primary == null, mat.get-color-from-palette(mat.$primary-palette, 500), $theming-primary); | ||
|
There was a problem hiding this comment. @Cvetanovic please communicate with @jovana-marceta where she has found this shorter IF syntax for Scss because I was not able to find it the latest official docs (which doesn't mean it's not working). |
||
| $font-family: if($theming-font-family == '' or $theming-font-family == null, map.get($default-material-button, 'font-family'), $theming-font-family); | ||
| $font-weight: if($theming-font-weight == '' or $theming-font-weight == null, map.get($default-material-button, 'font-weight'), $theming-font-weight); | ||
| $font-size: if($theming-font-size == '' or $theming-font-size == null, map.get($default-material-button, 'font-size'), $theming-font-size); | ||
|
|
||
| .enigmatry-redactor-content { | ||
| button, .rx-content button { | ||
| background-color: $primary-color; | ||
| font: { | ||
| family: $font-family; | ||
| weight: $font-weight; | ||
| size: $font-size; | ||
| } | ||
| } | ||
|
|
||
| .rx-toolbar-buttons .rx-button { | ||
| &.active, &:hover { | ||
| background: $primary-color; | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| @use 'sass:map'; | ||
| @use '@angular/material' as mat; | ||
|
|
||
| $redactor-checkboxes-selector: '[data-rx-type = 'todoitem'] '; | ||
|
|
||
| @mixin generate-from($theme) { | ||
| $theming-accent-color: map.get($theme, 'general', 'colors', 'accent'); | ||
|
|
||
| .enigmatry-redactor-content { | ||
|
|
||
| $checkbox-color: if($theming-accent-color == '' or $theming-accent-color == null, | ||
|
There was a problem hiding this comment. I understood we need to check for empty string and null for variables coming from AM, but this is our theme which leads me to the fact something's maybe not right on your machine, @jovana-marceta . |
||
| mat.get-color-from-palette(mat.$primary-palette, 500), $theming-accent-color); | ||
|
|
||
| .rx-editor #{$redactor-checkboxes-selector} input:checked::before { | ||
| border-color: $checkbox-color; | ||
| background-color: $checkbox-color; | ||
| } | ||
|
|
||
| @if map.get($theme, 'general', 'checkboxes') { | ||
| .rx-editor #{$redactor-checkboxes-selector} input::before { | ||
| background-color: map.get($theme, 'general', 'checkboxes', 'background'); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| @use 'sass:map'; | ||
| @use '@angular/material' as mat; | ||
| @use 'scss-foundation/src/modules/lists/row-coloring' as list; | ||
|
|
||
| $redactor-th-selector: 'thead th'; | ||
| $body-typography: map.get(mat.define-typography-config(), 'body-1'); | ||
| $caption-typography: map.get(mat.define-typography-config(), 'caption'); | ||
|
|
||
| @mixin generate-from($theme) { | ||
| $theming-table: map.get($theme, 'tables', 'rows', 'odd-even-background'); | ||
| $theming-table-header: map.get($theme, 'tables', 'header', 'font-size'); | ||
| $theming-fonts: map.get($theme, 'general', 'fonts'); | ||
|
|
||
| .enigmatry-redactor-content { | ||
| table { | ||
| @if $theming-table { | ||
| tr { | ||
| @include list.odd-row-coloring(map.get($theming-table, 'odd')); | ||
| @include list.even-row-coloring(map.get($theming-table, 'even')); | ||
| } | ||
| } | ||
| @else { | ||
| tr { | ||
| @include list.even-row-coloring(mat.get-color-from-palette(mat.$grey-palette, 100)); | ||
typhoon41 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| @include list.odd-row-coloring(mat.get-color-from-palette(mat.$grey-palette, 50)); | ||
| } | ||
| } | ||
|
|
||
| @if $theming-table-header { | ||
| th { | ||
| font-family: map.get($theme, 'general', 'fonts', 'body', 'family'); | ||
| font-size: $theming-table-header; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| table, table td { | ||
| /* stylelint-disable-next-line scss/at-if-no-null */ | ||
| @if $theming-fonts and map.has-key($theming-fonts, 'body') and map.get($theming-fonts, 'body', 'size') != null { | ||
|
There was a problem hiding this comment. Will it fail compiling if we just check directly size from body (without has key and previous check)? |
||
| font-size: map.get($theming-fonts, 'body', 'size'); | ||
| } | ||
| @else { | ||
| font-size: map.get($body-typography, 'font-size'); | ||
| } | ||
|
|
||
| #{$redactor-th-selector} { | ||
| /* stylelint-disable-next-line scss/at-if-no-null */ | ||
| @if map.has-key($theme, 'tables') and map.has-key(map.get($theme, 'tables', 'header'), 'font-size') | ||
|
There was a problem hiding this comment. The same applies for this one. |
||
| and $theming-table-header != null { | ||
| font-size: $theming-table-header; | ||
| } | ||
| @else { | ||
| font-size: map.get($caption-typography, 'font-size'); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| @use 'sass:map'; | ||
|
|
||
| @mixin generate-from($theme) { | ||
| $input-background: map.get($theme, 'general', 'inputs', 'background'); | ||
| $input-background: if($input-background == null, transparent, $input-background); | ||
|
|
||
| .enigmatry-redactor-content { | ||
| .rx-main-container, .rx-toolbox-container { | ||
| background: $input-background; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* stylelint-disable selector-max-compound-selectors, scss/at-if-no-null */ | ||
| @use 'sass:map'; | ||
| @use '@angular/material' as mat; | ||
|
|
||
| $body-typography: map.get(mat.define-typography-config(), 'body-1'); | ||
| $hero-typography: map.get(mat.define-typography-config(), 'headline-1'); | ||
| $title-typography: map.get(mat.define-typography-config(), 'subtitle-1'); | ||
| $caption-typography: map.get(mat.define-typography-config(), 'caption'); | ||
|
|
||
| @function get-typography($theme, $key, $default-config) { | ||
| $theming-fonts: map.get($theme, 'general', 'fonts'); | ||
| $font-config: map.get($theming-fonts, $key); | ||
|
|
||
| @if $font-config != null and $font-config != '' { | ||
| @return $font-config; | ||
| } | ||
| @else { | ||
| @return $default-config; | ||
| } | ||
| } | ||
|
|
||
| @function get-font-property($config, $property, $default-value) { | ||
| $value: map.get($config, $property); | ||
|
|
||
|
There was a problem hiding this comment. This is too much duplication and hard to follow. Maybe an option to change this is to replace with the following:
|
||
| @if $value != null and $value != '' { | ||
| @return $value; | ||
| } | ||
| @else { | ||
| @return $default-value; | ||
| } | ||
| } | ||
|
|
||
| @mixin generate-from($theme) { | ||
| $body-config: get-typography($theme, 'body', $body-typography); | ||
| $hero-config: get-typography($theme, 'hero-titles', $hero-typography); | ||
| $title-config: get-typography($theme, 'titles', $title-typography); | ||
|
|
||
| .enigmatry-redactor-content { | ||
| .rx-editor, .rx-content, .rx-content p { | ||
| color: get-font-property($body-config, 'color', map.get($body-typography, 'color')); | ||
| font-family: get-font-property($body-config, 'family', map.get($body-typography, 'font-family')); | ||
| font-size: get-font-property($body-config, 'size', map.get($body-typography, 'font-size')); | ||
| letter-spacing: get-font-property($body-config, 'letter-spacing', map.get($body-typography, 'letter-spacing')); | ||
| } | ||
|
|
||
| .rx-editor, .rx-content, .rx-content { | ||
| h1, h2, h3, h4 { | ||
| font-family: get-font-property($hero-config, 'family', map.get($hero-typography, 'font-family')); | ||
| letter-spacing: get-font-property($hero-config, 'letter-spacing', map.get($hero-typography, 'letter-spacing')); | ||
| } | ||
|
|
||
| h5, h6 { | ||
| font-family: get-font-property($title-config, 'family', map.get($title-typography, 'font-family')); | ||
| letter-spacing: get-font-property($title-config, 'letter-spacing', map.get($title-typography, 'letter-spacing')); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| @use 'core/components'; | ||
| @use 'vendors/overrides'; | ||
jovana-marceta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| @use 'overrides/rich-text'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| @use 'rich-text'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| @use 'scss-foundation/src/modules/display/items'; | ||
| @use '@angular/material' as mat; | ||
|
|
||
| $redactor-link-selectors: 'a, a:visited, a:focus, a:hover'; | ||
|
|
||
| .enigmatry-redactor-content .rx-content { | ||
| #{$redactor-link-selectors} { | ||
| @include items.fully-align(center, center); | ||
| display: inline-flex; | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| button, #{$redactor-link-selectors} { | ||
| @include items.fully-align(center, flex-start); | ||
| height: 36px; | ||
| margin: 8px 8px 8px 0; | ||
| padding: 0 16px; | ||
| border: none; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| a:hover { | ||
| background-color: mat.get-color-from-palette(mat.$grey-palette, 100); | ||
| } | ||
|
|
||
| button { | ||
| @include mat.elevation(4); | ||
jovana-marceta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| height: 36px; | ||
| border-radius: 4px; | ||
| color: #FFF; | ||
|
|
||
| &:hover { | ||
| @include mat.elevation(8); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| @use '@angular/material' as mat; | ||
|
|
||
| $checkbox-width: 18px; | ||
jovana-marceta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $checkbox-height: 18px; | ||
| $border-radius: 2px; | ||
|
|
||
| $redactor-todoitem-selector: '.rx-editor [data-rx-type = 'todoitem']'; | ||
|
|
||
| .enigmatry-redactor-content #{$redactor-todoitem-selector} { | ||
| input { | ||
| width: $checkbox-width; | ||
| height: $checkbox-height; | ||
| } | ||
|
|
||
| input::before, input:checked::before { | ||
| width: $checkbox-width; | ||
| height: $checkbox-height; | ||
| border-width: 2px; | ||
| border-radius: $border-radius; | ||
| border-color: rgb(0 0 0 / .54); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| @use 'sass:map'; | ||
| @use '@angular/material' as mat; | ||
|
|
||
| .enigmatry-redactor-content { | ||
| .rx-button-icon svg { | ||
| fill: rgb(0 0 0 / .54); | ||
| } | ||
|
|
||
| .rx-main-container { | ||
| border-color: rgb(0 0 0 / .38); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| @use 'general'; | ||
| @use 'tables'; | ||
| @use 'buttons'; | ||
| @use 'forms'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* stylelint-disable selector-max-compound-selectors, selector-max-type, selector-max-combinators */ | ||
| .enigmatry-redactor-content table { | ||
| th { | ||
| font-weight: 500; | ||
| } | ||
|
|
||
| p { | ||
| margin: 0; | ||
| } | ||
|
|
||
| td { | ||
| border: 1px solid rgb(0 0 0 / .12); | ||
| } | ||
|
|
||
| tr:first-child { | ||
| th, td { | ||
| border-top: none; | ||
| } | ||
| } | ||
|
|
||
| tr:last-child td { | ||
| border-bottom: none; | ||
| } | ||
|
|
||
| th, td { | ||
| border: { | ||
| right: none; | ||
| left: none; | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Another variable to isolate map.get($theme, 'general', 'fonts', 'buttons') would make other variables shorter and more readable.