Skip to content

Commit 6d0a947

Browse files
kapil2704kapil2704
committed
Update to v2.9.7
1 parent c732551 commit 6d0a947

File tree

131 files changed

+357
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+357
-298
lines changed

‎assets/css/froala_editor.css‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
2-
* froala_editor v2.9.6 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.9.7 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
4-
* Copyright 2014-2019 Froala Labs
4+
* Copyright 2014-2020 Froala Labs
55
*/
66

77
.clearfix::after {
@@ -152,9 +152,11 @@ iframe.fr-iframe {
152152
left: 0;
153153
right: 0;
154154
overflow: hidden;
155+
pointer-events: none;
155156
}
156157
.fr-wrapper.show-placeholder .fr-placeholder {
157158
display: block;
159+
position: relative;
158160
}
159161
.fr-wrapper ::-moz-selection {
160162
background: #b5d6fd;
@@ -197,7 +199,7 @@ iframe.fr-iframe {
197199
}
198200
@media (min-width: 992px) {
199201
.fr-box.fr-document {
200-
min-width: 21cm;
202+
min-width: calc(21cm + 30px + 30px);
201203
}
202204
.fr-box.fr-document .fr-wrapper {
203205
text-align: left;
@@ -215,7 +217,8 @@ iframe.fr-iframe {
215217
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
216218
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
217219
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
218-
overflow: visible;
220+
/* https://github.com/froala-labs/froala-editor-js-2/issues/1531 */
221+
/* Removed overflow: visible; */
219222
z-index: auto;
220223
}
221224
.fr-box.fr-document .fr-wrapper .fr-element hr {

‎assets/css/froala_editor.min.css‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/froala_editor.pkgd.css‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
2-
* froala_editor v2.9.6 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.9.7 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
4-
* Copyright 2014-2019 Froala Labs
4+
* Copyright 2014-2020 Froala Labs
55
*/
66

77
.clearfix::after {
@@ -152,9 +152,11 @@ iframe.fr-iframe {
152152
left: 0;
153153
right: 0;
154154
overflow: hidden;
155+
pointer-events: none;
155156
}
156157
.fr-wrapper.show-placeholder .fr-placeholder {
157158
display: block;
159+
position: relative;
158160
}
159161
.fr-wrapper ::-moz-selection {
160162
background: #b5d6fd;
@@ -197,7 +199,7 @@ iframe.fr-iframe {
197199
}
198200
@media (min-width: 992px) {
199201
.fr-box.fr-document {
200-
min-width: 21cm;
202+
min-width: calc(21cm + 30px + 30px);
201203
}
202204
.fr-box.fr-document .fr-wrapper {
203205
text-align: left;
@@ -215,7 +217,8 @@ iframe.fr-iframe {
215217
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
216218
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
217219
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
218-
overflow: visible;
220+
/* https://github.com/froala-labs/froala-editor-js-2/issues/1531 */
221+
/* Removed overflow: visible; */
219222
z-index: auto;
220223
}
221224
.fr-box.fr-document .fr-wrapper .fr-element hr {
@@ -1953,6 +1956,7 @@ body.fr-fullscreen {
19531956
}
19541957
.fr-element img {
19551958
cursor: pointer;
1959+
padding: 0 1px;
19561960
}
19571961
.fr-image-resizer {
19581962
position: absolute;

‎assets/css/froala_editor.pkgd.min.css‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/froala_style.css‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
2-
* froala_editor v2.9.6 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.9.7 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
4-
* Copyright 2014-2019 Froala Labs
4+
* Copyright 2014-2020 Froala Labs
55
*/
66

77
.clearfix::after {
@@ -221,7 +221,7 @@ img.fr-shadow,
221221
}
222222
.fr-view img.fr-dii.fr-fil {
223223
float: left;
224-
margin: 5px 5px 5px 0;
224+
margin: 5px 25px 5px 0;
225225
max-width: calc(100% - 5px);
226226
}
227227
.fr-view img.fr-dii.fr-fir {
@@ -257,7 +257,7 @@ img.fr-shadow,
257257
}
258258
.fr-view span.fr-img-caption.fr-dii.fr-fil {
259259
float: left;
260-
margin: 5px 5px 5px 0;
260+
margin: 5px 25px 5px 0;
261261
max-width: calc(100% - 5px);
262262
}
263263
.fr-view span.fr-img-caption.fr-dii.fr-fir {
@@ -362,6 +362,10 @@ img.fr-shadow,
362362
.fr-view textarea.fr-large {
363363
font-size: 24px;
364364
}
365+
.fr-view ul,
366+
.fr-view ol {
367+
list-style-position: inside;
368+
}
365369
/**
366370
* Image style.
367371
*/
@@ -402,7 +406,7 @@ img.fr-view.fr-dii {
402406
}
403407
img.fr-view.fr-dii.fr-fil {
404408
float: left;
405-
margin: 5px 5px 5px 0;
409+
margin: 5px 25px 5px 0;
406410
max-width: calc(100% - 5px);
407411
}
408412
img.fr-view.fr-dii.fr-fir {
@@ -438,7 +442,7 @@ span.fr-img-caption.fr-view.fr-dii {
438442
}
439443
span.fr-img-caption.fr-view.fr-dii.fr-fil {
440444
float: left;
441-
margin: 5px 5px 5px 0;
445+
margin: 5px 25px 5px 0;
442446
max-width: calc(100% - 5px);
443447
}
444448
span.fr-img-caption.fr-view.fr-dii.fr-fir {

‎assets/css/froala_style.min.css‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/plugins/char_counter.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
2-
* froala_editor v2.9.6 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.9.7 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
4-
* Copyright 2014-2019 Froala Labs
4+
* Copyright 2014-2020 Froala Labs
55
*/
66

77
.clearfix::after {

0 commit comments

Comments
 (0)