Skip to content

Commit b55a01e

Browse files
stefanneculaistefanneculai
committed
Update to 2.7.4.
1 parent 6a29a4d commit b55a01e

File tree

121 files changed

+786
-769
lines changed

Some content is hidden

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

121 files changed

+786
-769
lines changed

‎froala_editor/static/froala_editor/css/froala_editor.css‎

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

77
.clearfix::after {
@@ -58,14 +58,6 @@
5858
-webkit-user-select: none;
5959
-ms-user-select: none;
6060
}
61-
.fr-element [contenteditable="false"] {
62-
user-select: none;
63-
-o-user-select: none;
64-
-moz-user-select: none;
65-
-khtml-user-select: none;
66-
-webkit-user-select: none;
67-
-ms-user-select: none;
68-
}
6961
.fr-element [contenteditable="true"] {
7062
outline: 0px solid transparent;
7163
user-select: text;
@@ -115,7 +107,8 @@
115107
-o-transition: transform 0.2s ease 0s;
116108
fill: #1e88e5;
117109
}
118-
.fr-box a.fr-floating-btn i {
110+
.fr-box a.fr-floating-btn i,
111+
.fr-box a.fr-floating-btn svg {
119112
font-size: 14px;
120113
line-height: 32px;
121114
}
@@ -301,7 +294,9 @@ iframe.fr-iframe {
301294
width: auto;
302295
}
303296
.fr-toolbar .fr-command.fr-btn i,
304-
.fr-popup .fr-command.fr-btn i {
297+
.fr-popup .fr-command.fr-btn i,
298+
.fr-toolbar .fr-command.fr-btn svg,
299+
.fr-popup .fr-command.fr-btn svg {
305300
display: block;
306301
font-size: 14px;
307302
width: 14px;
@@ -357,7 +352,9 @@ iframe.fr-iframe {
357352
.fr-toolbar .fr-command.fr-btn.fr-dropdown span,
358353
.fr-popup .fr-command.fr-btn.fr-dropdown span,
359354
.fr-toolbar .fr-command.fr-btn.fr-dropdown img,
360-
.fr-popup .fr-command.fr-btn.fr-dropdown img {
355+
.fr-popup .fr-command.fr-btn.fr-dropdown img,
356+
.fr-toolbar .fr-command.fr-btn.fr-dropdown svg,
357+
.fr-popup .fr-command.fr-btn.fr-dropdown svg {
361358
margin-left: 8px;
362359
margin-right: 16px;
363360
}
@@ -650,7 +647,7 @@ body.prevent-scroll.fr-mobile {
650647
-ms-transition: height 0.2s ease 0s;
651648
-o-transition: height 0.2s ease 0s;
652649
}
653-
.fr-modal .fr-modal-wrapper .fr-modal-head i {
650+
.fr-modal .fr-modal-wrapper .fr-modal-head .fr-modal-close {
654651
padding: 12px;
655652
width: 20px;
656653
font-size: 16px;
@@ -660,8 +657,6 @@ body.prevent-scroll.fr-mobile {
660657
-webkit-box-sizing: content-box;
661658
-moz-box-sizing: content-box;
662659
box-sizing: content-box;
663-
}
664-
.fr-modal .fr-modal-wrapper .fr-modal-head i.fr-modal-close {
665660
position: absolute;
666661
top: 0;
667662
right: 0;
@@ -795,6 +790,9 @@ body.prevent-scroll.fr-mobile {
795790
opacity: 0;
796791
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
797792
}
793+
.fr-popup.fr-empty {
794+
display: none !important;
795+
}
798796
.fr-popup .fr-hs {
799797
display: block !important;
800798
}

‎froala_editor/static/froala_editor/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.

‎froala_editor/static/froala_editor/css/froala_editor.pkgd.css‎

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

77
.clearfix::after {
@@ -58,14 +58,6 @@
5858
-webkit-user-select: none;
5959
-ms-user-select: none;
6060
}
61-
.fr-element [contenteditable="false"] {
62-
user-select: none;
63-
-o-user-select: none;
64-
-moz-user-select: none;
65-
-khtml-user-select: none;
66-
-webkit-user-select: none;
67-
-ms-user-select: none;
68-
}
6961
.fr-element [contenteditable="true"] {
7062
outline: 0px solid transparent;
7163
user-select: text;
@@ -115,7 +107,8 @@
115107
-o-transition: transform 0.2s ease 0s;
116108
fill: #1e88e5;
117109
}
118-
.fr-box a.fr-floating-btn i {
110+
.fr-box a.fr-floating-btn i,
111+
.fr-box a.fr-floating-btn svg {
119112
font-size: 14px;
120113
line-height: 32px;
121114
}
@@ -301,7 +294,9 @@ iframe.fr-iframe {
301294
width: auto;
302295
}
303296
.fr-toolbar .fr-command.fr-btn i,
304-
.fr-popup .fr-command.fr-btn i {
297+
.fr-popup .fr-command.fr-btn i,
298+
.fr-toolbar .fr-command.fr-btn svg,
299+
.fr-popup .fr-command.fr-btn svg {
305300
display: block;
306301
font-size: 14px;
307302
width: 14px;
@@ -357,7 +352,9 @@ iframe.fr-iframe {
357352
.fr-toolbar .fr-command.fr-btn.fr-dropdown span,
358353
.fr-popup .fr-command.fr-btn.fr-dropdown span,
359354
.fr-toolbar .fr-command.fr-btn.fr-dropdown img,
360-
.fr-popup .fr-command.fr-btn.fr-dropdown img {
355+
.fr-popup .fr-command.fr-btn.fr-dropdown img,
356+
.fr-toolbar .fr-command.fr-btn.fr-dropdown svg,
357+
.fr-popup .fr-command.fr-btn.fr-dropdown svg {
361358
margin-left: 8px;
362359
margin-right: 16px;
363360
}
@@ -650,7 +647,7 @@ body.prevent-scroll.fr-mobile {
650647
-ms-transition: height 0.2s ease 0s;
651648
-o-transition: height 0.2s ease 0s;
652649
}
653-
.fr-modal .fr-modal-wrapper .fr-modal-head i {
650+
.fr-modal .fr-modal-wrapper .fr-modal-head .fr-modal-close {
654651
padding: 12px;
655652
width: 20px;
656653
font-size: 16px;
@@ -660,8 +657,6 @@ body.prevent-scroll.fr-mobile {
660657
-webkit-box-sizing: content-box;
661658
-moz-box-sizing: content-box;
662659
box-sizing: content-box;
663-
}
664-
.fr-modal .fr-modal-wrapper .fr-modal-head i.fr-modal-close {
665660
position: absolute;
666661
top: 0;
667662
right: 0;
@@ -795,6 +790,9 @@ body.prevent-scroll.fr-mobile {
795790
opacity: 0;
796791
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
797792
}
793+
.fr-popup.fr-empty {
794+
display: none !important;
795+
}
798796
.fr-popup .fr-hs {
799797
display: block !important;
800798
}
@@ -1540,7 +1538,8 @@ textarea.fr-code {
15401538
position: relative;
15411539
z-index: 1;
15421540
}
1543-
.fr-popup .fr-color-set > span > i {
1541+
.fr-popup .fr-color-set > span > i,
1542+
.fr-popup .fr-color-set > span > svg {
15441543
text-align: center;
15451544
line-height: 32px;
15461545
height: 32px;
@@ -2553,7 +2552,7 @@ div.fr-modal-body div.fr-image-list div.fr-image-container .fr-insert-img {
25532552
}
25542553
.fr-table-resizer {
25552554
cursor: col-resize;
2556-
position: fixed;
2555+
position: absolute;
25572556
z-index: 3;
25582557
display: none;
25592558
}
@@ -2676,7 +2675,7 @@ div.fr-modal-body div.fr-image-list div.fr-image-container .fr-insert-img {
26762675
height: 12px;
26772676
}
26782677
.fr-insert-helper {
2679-
position: fixed;
2678+
position: absolute;
26802679
z-index: 9999;
26812680
white-space: nowrap;
26822681
}

‎froala_editor/static/froala_editor/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.

‎froala_editor/static/froala_editor/css/froala_style.css‎

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

77
.clearfix::after {
@@ -291,18 +291,19 @@ img.fr-shadow,
291291
}
292292
.fr-view .fr-img-caption .fr-img-wrap > span {
293293
margin: auto;
294-
display: inline-block;
294+
display: block;
295295
padding: 5px 5px 10px;
296296
font-size: 14px;
297297
font-weight: initial;
298-
max-width: 100%;
299298
-webkit-box-sizing: border-box;
300299
-moz-box-sizing: border-box;
301300
box-sizing: border-box;
302301
-webkit-opacity: 0.9;
303302
-moz-opacity: 0.9;
304303
opacity: 0.9;
305304
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
305+
width: 100%;
306+
text-align: center;
306307
}
307308
.fr-view button.fr-rounded,
308309
.fr-view input.fr-rounded,

0 commit comments

Comments
 (0)