TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve richeditor support for preview mode and attributes property (#5011)

This commit is contained in:
Klaas Poortinga 2020-03-30 19:33:03 +02:00 committed by GitHub
parent 141893d6a7
commit 3a7224c2ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/backend/formwidgets/richeditor/assets/css/richeditor.css
View File

@ -564,4 +564,15 @@ body .fr-popup .fr-checkbox span {border-color:#d1d6d9}
.control-richeditor figure[data-audio]:before {position:static;margin-right:8px}
.control-richeditor figure[data-video]:before {font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f03d"}
.control-richeditor figure[data-audio]:before {font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f028"}
.fr-quick-insert a.fr-floating-btn {color:rgba(64,82,97,0.8);text-decoration:none}
.fr-quick-insert a.fr-floating-btn {color:rgba(64,82,97,0.8);text-decoration:none}
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command {cursor:not-allowed}
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command:hover,
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command:focus {color:#bdbdbd;-webkit-box-shadow:none;box-shadow:none}
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command:hover::after,
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command:focus::after {border-top-color:#bdbdbd !important}
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command.fr-btn-hover {color:#bdbdbd;background:transparent}
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command.fr-btn-hover::after {border-top-color:#bdbdbd !important}
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command.fr-btn.fr-options:hover,
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command.fr-btn.fr-options:focus {border-left:solid 1px transparent}
.fr-box.fr-basic .fr-toolbar.fr-disabled .fr-command.fr-btn.fr-options.fr-btn-hover {border-left:solid 1px transparent}
.fr-box.fr-basic .fr-element.fr-disabled {cursor:not-allowed}

45
modules/backend/formwidgets/richeditor/assets/less/richeditor.less
View File

@ -224,3 +224,48 @@
text-decoration: none;
}
}
//
// Additions to disabled state
//
.fr-box.fr-basic {
// Toolbar
.fr-toolbar.fr-disabled {
.fr-command {
cursor: not-allowed;
&:hover, &:focus {
color: #bdbdbd;
-webkit-box-shadow: none;
box-shadow: none;
&::after {
border-top-color: #bdbdbd!important;
}
}
&.fr-btn-hover {
color: #bdbdbd; background: transparent;
&::after {
border-top-color:#bdbdbd !important
}
}
&.fr-btn.fr-options {
&:hover, &:focus {
border-left:solid 1px transparent;
}
&.fr-btn-hover {
border-left:solid 1px transparent;
}
}
}
}
// Content
.fr-element.fr-disabled {
cursor: not-allowed;
}
}

3
modules/backend/formwidgets/richeditor/partials/_richeditor.htm
View File

@ -23,7 +23,8 @@
<?php if (isset($tableCellStyles)): ?>data-table-cell-styles="<?= e(json_encode($tableCellStyles)) ?>"<?php endif ?>
data-links-handler="<?= $this->getEventHandler('onLoadPageLinksForm') ?>"
data-ace-vendor-path="<?= Url::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>"
data-control="richeditor">
data-control="richeditor"
<?= $field->getAttributes() ?>>
<textarea
placeholder="<?= e(trans($field->placeholder)) ?>"
name="<?= $name ?>"