Skip to content

Commit 6db1add

Browse files
committed
Fix tinymce dialog close button style
1 parent ebc2af5 commit 6db1add

4 files changed

Lines changed: 22 additions & 14 deletions

File tree

app/assets/builds/tinymce/skins/ui/alchemy-dark/skin.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/tinymce/skins/ui/alchemy/skin.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/stylesheets/tinymce/skins/ui/alchemy-dark/skin.scss

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,8 +1534,15 @@ button::-moz-focus-inner {
15341534
.tox .tox-dialog__header .tox-button {
15351535
z-index: 1;
15361536
color: var(--color-white);
1537+
height: var(--spacing-6);
15371538
background-image: none; // If used in Solidus we need to override the background image
1538-
border: none; // If used in Solidus we need to override the border
1539+
border-color: transparent; // If used in Solidus we need to override the border
1540+
1541+
&:active:not(:disabled),
1542+
&:hover:not(:disabled) {
1543+
background-color: var(--color-blue_medium);
1544+
color: var(--color-white);
1545+
}
15391546
}
15401547

15411548
.tox .tox-dialog__draghandle {
@@ -2076,11 +2083,8 @@ body.tox-dialog__disable-scroll {
20762083
}
20772084

20782085
.tox .tox-color-input span::before {
2079-
background-image: linear-gradient(
2080-
45deg,
2081-
rgba(0, 0, 0, 0.25) 25%,
2082-
transparent 25%
2083-
),
2086+
background-image:
2087+
linear-gradient(45deg, rgba(0, 0, 0, 0.25) 25%, transparent 25%),
20842088
linear-gradient(-45deg, rgba(0, 0, 0, 0.25) 25%, transparent 25%),
20852089
linear-gradient(45deg, transparent 75%, rgba(0, 0, 0, 0.25) 75%),
20862090
linear-gradient(-45deg, transparent 75%, rgba(0, 0, 0, 0.25) 75%);

app/stylesheets/tinymce/skins/ui/alchemy/skin.scss

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,8 +1534,15 @@ button::-moz-focus-inner {
15341534
.tox .tox-dialog__header .tox-button {
15351535
z-index: 1;
15361536
color: var(--color-white);
1537+
height: var(--spacing-6);
15371538
background-image: none; // If used in Solidus we need to override the background image
1538-
border: none; // If used in Solidus we need to override the border
1539+
border-color: transparent; // If used in Solidus we need to override the border
1540+
1541+
&:active:not(:disabled),
1542+
&:hover:not(:disabled) {
1543+
background-color: var(--color-blue_medium);
1544+
color: var(--color-white);
1545+
}
15391546
}
15401547

15411548
.tox .tox-dialog__draghandle {
@@ -2076,11 +2083,8 @@ body.tox-dialog__disable-scroll {
20762083
}
20772084

20782085
.tox .tox-color-input span::before {
2079-
background-image: linear-gradient(
2080-
45deg,
2081-
rgba(0, 0, 0, 0.25) 25%,
2082-
transparent 25%
2083-
),
2086+
background-image:
2087+
linear-gradient(45deg, rgba(0, 0, 0, 0.25) 25%, transparent 25%),
20842088
linear-gradient(-45deg, rgba(0, 0, 0, 0.25) 25%, transparent 25%),
20852089
linear-gradient(45deg, transparent 75%, rgba(0, 0, 0, 0.25) 75%),
20862090
linear-gradient(-45deg, transparent 75%, rgba(0, 0, 0, 0.25) 75%);

0 commit comments

Comments
 (0)