Skip to content

Commit

Permalink
Update to 2.9.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanneculai committed Nov 1, 2018
1 parent a4c9767 commit db9ec0c
Show file tree
Hide file tree
Showing 131 changed files with 830 additions and 303 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "froala/wysiwyg-cake2",
"version": "2.8.5",
"version": "2.9.0",
"description": "A beautiful jQuery WYSIWYG text editor based on HTML5 technology. Cross browser, with mobile support, high performance and Retina Ready modern design.",
"type": "cakephp-plugin",
"keywords": [
Expand Down
66 changes: 61 additions & 5 deletions webroot/css/froala_editor.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.8.5 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down Expand Up @@ -195,6 +195,37 @@ iframe.fr-iframe {
-moz-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);
box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);
}
@media (min-width: 992px) {
.fr-box.fr-document {
min-width: 21cm;
}
.fr-box.fr-document .fr-wrapper {
text-align: center;
padding: 30px;
min-width: 21cm;
background: #EFEFEF;
}
.fr-box.fr-document .fr-wrapper .fr-element {
text-align: left;
background: #FFF;
width: 21cm;
margin: auto;
min-height: 26cm !important;
padding: 1cm 2cm;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
overflow: visible;
}
.fr-box.fr-document .fr-wrapper .fr-element hr {
margin-left: -2cm;
margin-right: -2cm;
background: #EFEFEF;
height: 1cm;
outline: none;
border: none;
}
}
.fr-tooltip {
position: absolute;
top: 0;
Expand Down Expand Up @@ -240,6 +271,16 @@ iframe.fr-iframe {
opacity: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
}
.fr-toolbar .fr-btn-wrap,
.fr-popup .fr-btn-wrap {
float: left;
white-space: nowrap;
position: relative;
}
.fr-toolbar .fr-btn-wrap.fr-hidden,
.fr-popup .fr-btn-wrap.fr-hidden {
display: none;
}
.fr-toolbar .fr-command.fr-btn,
.fr-popup .fr-command.fr-btn {
background: transparent;
Expand Down Expand Up @@ -418,21 +459,27 @@ iframe.fr-iframe {
float: none;
}
.fr-desktop .fr-command:hover,
.fr-desktop .fr-command:focus {
.fr-desktop .fr-command:focus,
.fr-desktop .fr-command.fr-btn-hover,
.fr-desktop .fr-command.fr-expanded {
outline: 0;
color: #222222;
background: #ebebeb;
}
.fr-desktop .fr-command:hover::after,
.fr-desktop .fr-command:focus::after {
.fr-desktop .fr-command:focus::after,
.fr-desktop .fr-command.fr-btn-hover::after,
.fr-desktop .fr-command.fr-expanded::after {
border-top-color: #222222 !important;
}
.fr-desktop .fr-command.fr-selected {
color: #222222;
background: #d6d6d6;
}
.fr-desktop .fr-command.fr-active:hover,
.fr-desktop .fr-command.fr-active:focus {
.fr-desktop .fr-command.fr-active:focus,
.fr-desktop .fr-command.fr-active.fr-btn-hover,
.fr-desktop .fr-command.fr-active.fr-expanded {
color: #1e88e5;
background: #ebebeb;
}
Expand All @@ -454,6 +501,15 @@ iframe.fr-iframe {
.fr-popup.fr-mobile .fr-command.fr-blink {
background: transparent;
}
.fr-command.fr-btn.fr-options {
width: 16px;
margin-left: -5px;
}
.fr-command.fr-btn.fr-options.fr-btn-hover,
.fr-command.fr-btn.fr-options:hover,
.fr-command.fr-btn.fr-options:focus {
border-left: solid 1px #FAFAFA;
}
.fr-command.fr-btn + .fr-dropdown-menu {
display: inline-block;
position: absolute;
Expand Down Expand Up @@ -622,7 +678,7 @@ body.prevent-scroll.fr-mobile {
@media (min-width: 992px) {
.fr-modal .fr-modal-wrapper {
margin: 50px auto;
width: 600px;
width: 960px;
}
}
.fr-modal .fr-modal-wrapper .fr-modal-head {
Expand Down
4 changes: 2 additions & 2 deletions webroot/css/froala_editor.min.css

Large diffs are not rendered by default.

67 changes: 62 additions & 5 deletions webroot/css/froala_editor.pkgd.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.8.5 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down Expand Up @@ -195,6 +195,37 @@ iframe.fr-iframe {
-moz-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);
box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);
}
@media (min-width: 992px) {
.fr-box.fr-document {
min-width: 21cm;
}
.fr-box.fr-document .fr-wrapper {
text-align: center;
padding: 30px;
min-width: 21cm;
background: #EFEFEF;
}
.fr-box.fr-document .fr-wrapper .fr-element {
text-align: left;
background: #FFF;
width: 21cm;
margin: auto;
min-height: 26cm !important;
padding: 1cm 2cm;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
overflow: visible;
}
.fr-box.fr-document .fr-wrapper .fr-element hr {
margin-left: -2cm;
margin-right: -2cm;
background: #EFEFEF;
height: 1cm;
outline: none;
border: none;
}
}
.fr-tooltip {
position: absolute;
top: 0;
Expand Down Expand Up @@ -240,6 +271,16 @@ iframe.fr-iframe {
opacity: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
}
.fr-toolbar .fr-btn-wrap,
.fr-popup .fr-btn-wrap {
float: left;
white-space: nowrap;
position: relative;
}
.fr-toolbar .fr-btn-wrap.fr-hidden,
.fr-popup .fr-btn-wrap.fr-hidden {
display: none;
}
.fr-toolbar .fr-command.fr-btn,
.fr-popup .fr-command.fr-btn {
background: transparent;
Expand Down Expand Up @@ -418,21 +459,27 @@ iframe.fr-iframe {
float: none;
}
.fr-desktop .fr-command:hover,
.fr-desktop .fr-command:focus {
.fr-desktop .fr-command:focus,
.fr-desktop .fr-command.fr-btn-hover,
.fr-desktop .fr-command.fr-expanded {
outline: 0;
color: #222222;
background: #ebebeb;
}
.fr-desktop .fr-command:hover::after,
.fr-desktop .fr-command:focus::after {
.fr-desktop .fr-command:focus::after,
.fr-desktop .fr-command.fr-btn-hover::after,
.fr-desktop .fr-command.fr-expanded::after {
border-top-color: #222222 !important;
}
.fr-desktop .fr-command.fr-selected {
color: #222222;
background: #d6d6d6;
}
.fr-desktop .fr-command.fr-active:hover,
.fr-desktop .fr-command.fr-active:focus {
.fr-desktop .fr-command.fr-active:focus,
.fr-desktop .fr-command.fr-active.fr-btn-hover,
.fr-desktop .fr-command.fr-active.fr-expanded {
color: #1e88e5;
background: #ebebeb;
}
Expand All @@ -454,6 +501,15 @@ iframe.fr-iframe {
.fr-popup.fr-mobile .fr-command.fr-blink {
background: transparent;
}
.fr-command.fr-btn.fr-options {
width: 16px;
margin-left: -5px;
}
.fr-command.fr-btn.fr-options.fr-btn-hover,
.fr-command.fr-btn.fr-options:hover,
.fr-command.fr-btn.fr-options:focus {
border-left: solid 1px #FAFAFA;
}
.fr-command.fr-btn + .fr-dropdown-menu {
display: inline-block;
position: absolute;
Expand Down Expand Up @@ -622,7 +678,7 @@ body.prevent-scroll.fr-mobile {
@media (min-width: 992px) {
.fr-modal .fr-modal-wrapper {
margin: 50px auto;
width: 600px;
width: 960px;
}
}
.fr-modal .fr-modal-wrapper .fr-modal-head {
Expand Down Expand Up @@ -1888,6 +1944,7 @@ body.fr-fullscreen {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
z-index: 2;
}
.fr-image-resizer.fr-active {
display: block;
Expand Down
4 changes: 2 additions & 2 deletions webroot/css/froala_editor.pkgd.min.css

Large diffs are not rendered by default.

35 changes: 34 additions & 1 deletion webroot/css/froala_style.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.8.5 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down Expand Up @@ -175,6 +175,24 @@ img.fr-shadow,
.fr-view .fr-text-uppercase {
text-transform: uppercase;
}
.fr-view .fr-class-highlighted {
background-color: #ffff00;
}
.fr-view .fr-class-code {
border-color: #cccccc;
border-radius: 2px;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
background: #f5f5f5;
padding: 10px;
font-family: "Courier New", Courier, monospace;
}
.fr-view .fr-class-transparency {
opacity: 0.5;
}
.fr-view img {
position: relative;
max-width: 100%;
Expand Down Expand Up @@ -251,6 +269,21 @@ img.fr-shadow,
text-align: center;
position: relative;
}
.fr-view .fr-video.fr-rv {
padding-bottom: 56.25%;
padding-top: 30px;
height: 0;
overflow: hidden;
}
.fr-view .fr-video.fr-rv > iframe,
.fr-view .fr-video.fr-rv object,
.fr-view .fr-video.fr-rv embed {
position: absolute !important;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
.fr-view .fr-video > * {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
Expand Down
Loading

0 comments on commit db9ec0c

Please sign in to comment.