Merge branch 'develop'
This commit is contained in:
commit
63a8a60e2d
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
* allow to use `window.tinymceModes` to add or override tinymce modes
|
* allow to use `window.tinymceModes` to add or override tinymce modes
|
||||||
|
* add border color on tinymce editor
|
||||||
### Fixed
|
### Fixed
|
||||||
* fix default crud sort
|
* fix default crud sort
|
||||||
* fix hidden save button in file manager
|
* fix hidden save button in file manager
|
||||||
|
|
|
@ -744,8 +744,15 @@ label.required::after {
|
||||||
background: map-get($theme-colors, 'dark-blue');
|
background: map-get($theme-colors, 'dark-blue');
|
||||||
}
|
}
|
||||||
|
|
||||||
.tox.tox-silver-sink.tox-tinymce-aux {
|
.tox {
|
||||||
z-index: 3000 !important;
|
&.tox-silver-sink.tox-tinymce-aux {
|
||||||
|
z-index: 3000 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.tox-tinymce {
|
||||||
|
border-color: $input-border-color;
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.field-boolean {
|
.field-boolean {
|
||||||
|
|
Loading…
Reference in a new issue