Skip to content

Commit 91e0e89

Browse files
stefanneculaistefanneculai
committed
Update to v2.6.4.
1 parent 129718c commit 91e0e89

File tree

119 files changed

+1514
-192
lines changed

Some content is hidden

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

119 files changed

+1514
-192
lines changed

‎assets/css/froala_editor.css‎

Lines changed: 66 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
44
* Copyright 2014-2017 Froala Labs
55
*/
@@ -33,6 +33,9 @@
3333
overflow-x: auto;
3434
min-height: 40px;
3535
}
36+
.fr-box.fr-basic.fr-rtl .fr-element {
37+
text-align: right;
38+
}
3639
.fr-element {
3740
background: transparent;
3841
position: relative;
@@ -316,7 +319,7 @@ iframe.fr-iframe {
316319
font-size: 14px;
317320
display: block;
318321
line-height: 17px;
319-
min-width: 38px;
322+
min-width: 34px;
320323
float: left;
321324
text-overflow: ellipsis;
322325
overflow: hidden;
@@ -411,7 +414,7 @@ iframe.fr-iframe {
411414
.fr-popup.fr-rtl .fr-command.fr-btn {
412415
float: right;
413416
}
414-
.fr-toolbar.fr-inline .fr-command.fr-btn {
417+
.fr-toolbar.fr-inline .fr-command.fr-btn:not(.fr-hidden) {
415418
display: -webkit-inline-flex;
416419
display: -ms-inline-flexbox;
417420
display: inline-flex;
@@ -463,13 +466,22 @@ iframe.fr-iframe {
463466
z-index: 4;
464467
-webkit-overflow-scrolling: touch;
465468
overflow: hidden;
469+
zoom: 1;
466470
border-radius: 0 0 2px 2px;
467471
-moz-border-radius: 0 0 2px 2px;
468472
-webkit-border-radius: 0 0 2px 2px;
469473
-moz-background-clip: padding;
470474
-webkit-background-clip: padding-box;
471475
background-clip: padding-box;
472476
}
477+
.fr-command.fr-btn + .fr-dropdown-menu.test-height .fr-dropdown-wrapper {
478+
-webkit-transition: none;
479+
-moz-transition: none;
480+
-ms-transition: none;
481+
-o-transition: none;
482+
height: auto;
483+
max-height: 275px;
484+
}
473485
.fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper {
474486
background: #ffffff;
475487
padding: 0;
@@ -521,6 +533,9 @@ iframe.fr-iframe {
521533
color: #bdbdbd;
522534
cursor: default;
523535
}
536+
.fr-command.fr-btn:not(.fr-active) + .fr-dropdown-menu {
537+
left: -3000px !important;
538+
}
524539
.fr-command.fr-btn.fr-active + .fr-dropdown-menu {
525540
display: inline-block;
526541
-webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 2px 2px 1px rgba(0, 0, 0, 0.14);
@@ -566,6 +581,20 @@ body.prevent-scroll.fr-mobile {
566581
-webkit-font-smoothing: antialiased;
567582
-moz-osx-font-smoothing: grayscale;
568583
text-align: center;
584+
line-height: 1.2;
585+
}
586+
.fr-modal.fr-middle .fr-modal-wrapper {
587+
margin-top: 0;
588+
margin-bottom: 0;
589+
margin-left: auto;
590+
margin-right: auto;
591+
top: 50%;
592+
left: 50%;
593+
-webkit-transform: translate(-50%, -50%);
594+
-moz-transform: translate(-50%, -50%);
595+
-ms-transform: translate(-50%, -50%);
596+
-o-transform: translate(-50%, -50%);
597+
position: absolute;
569598
}
570599
.fr-modal .fr-modal-wrapper {
571600
border-radius: 2px;
@@ -585,7 +614,6 @@ body.prevent-scroll.fr-mobile {
585614
border-top: 5px solid #222222;
586615
overflow: hidden;
587616
width: 90%;
588-
padding-bottom: 10px;
589617
position: relative;
590618
}
591619
@media (min-width: 768px) and (max-width: 991px) {
@@ -649,10 +677,42 @@ body.prevent-scroll.fr-mobile {
649677
height: 100%;
650678
min-height: 150px;
651679
overflow-y: scroll;
680+
padding-bottom: 10px;
652681
}
653682
.fr-modal .fr-modal-wrapper div.fr-modal-body:focus {
654683
outline: 0;
655684
}
685+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command {
686+
height: 36px;
687+
line-height: 1;
688+
color: #1e88e5;
689+
padding: 10px;
690+
cursor: pointer;
691+
text-decoration: none;
692+
border: none;
693+
background: none;
694+
font-size: 16px;
695+
outline: none;
696+
-webkit-transition: background 0.2s ease 0s;
697+
-moz-transition: background 0.2s ease 0s;
698+
-ms-transition: background 0.2s ease 0s;
699+
-o-transition: background 0.2s ease 0s;
700+
}
701+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command + button {
702+
margin-left: 24px;
703+
}
704+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:hover,
705+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:focus {
706+
background: #ebebeb;
707+
color: #1e88e5;
708+
}
709+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:active {
710+
background: #d6d6d6;
711+
color: #1e88e5;
712+
}
713+
.fr-modal .fr-modal-wrapper div.fr-modal-body button::-moz-focus-inner {
714+
border: 0;
715+
}
656716
.fr-desktop .fr-modal-wrapper .fr-modal-head i:hover {
657717
background: #ebebeb;
658718
}
@@ -701,6 +761,7 @@ body.prevent-scroll.fr-mobile {
701761
text-rendering: optimizelegibility;
702762
-webkit-font-smoothing: antialiased;
703763
-moz-osx-font-smoothing: grayscale;
764+
line-height: 1.2;
704765
}
705766
.fr-popup .fr-input-focus {
706767
background: #f5f5f5;
@@ -1020,6 +1081,7 @@ body.prevent-scroll.fr-mobile {
10201081
text-rendering: optimizelegibility;
10211082
-webkit-font-smoothing: antialiased;
10221083
-moz-osx-font-smoothing: grayscale;
1084+
line-height: 1.2;
10231085
}
10241086
.fr-toolbar::after {
10251087
clear: both;

‎assets/css/froala_editor.min.css‎

Lines changed: 2 additions & 2 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: 67 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
44
* Copyright 2014-2017 Froala Labs
55
*/
@@ -33,6 +33,9 @@
3333
overflow-x: auto;
3434
min-height: 40px;
3535
}
36+
.fr-box.fr-basic.fr-rtl .fr-element {
37+
text-align: right;
38+
}
3639
.fr-element {
3740
background: transparent;
3841
position: relative;
@@ -316,7 +319,7 @@ iframe.fr-iframe {
316319
font-size: 14px;
317320
display: block;
318321
line-height: 17px;
319-
min-width: 38px;
322+
min-width: 34px;
320323
float: left;
321324
text-overflow: ellipsis;
322325
overflow: hidden;
@@ -411,7 +414,7 @@ iframe.fr-iframe {
411414
.fr-popup.fr-rtl .fr-command.fr-btn {
412415
float: right;
413416
}
414-
.fr-toolbar.fr-inline .fr-command.fr-btn {
417+
.fr-toolbar.fr-inline .fr-command.fr-btn:not(.fr-hidden) {
415418
display: -webkit-inline-flex;
416419
display: -ms-inline-flexbox;
417420
display: inline-flex;
@@ -463,13 +466,22 @@ iframe.fr-iframe {
463466
z-index: 4;
464467
-webkit-overflow-scrolling: touch;
465468
overflow: hidden;
469+
zoom: 1;
466470
border-radius: 0 0 2px 2px;
467471
-moz-border-radius: 0 0 2px 2px;
468472
-webkit-border-radius: 0 0 2px 2px;
469473
-moz-background-clip: padding;
470474
-webkit-background-clip: padding-box;
471475
background-clip: padding-box;
472476
}
477+
.fr-command.fr-btn + .fr-dropdown-menu.test-height .fr-dropdown-wrapper {
478+
-webkit-transition: none;
479+
-moz-transition: none;
480+
-ms-transition: none;
481+
-o-transition: none;
482+
height: auto;
483+
max-height: 275px;
484+
}
473485
.fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper {
474486
background: #ffffff;
475487
padding: 0;
@@ -521,6 +533,9 @@ iframe.fr-iframe {
521533
color: #bdbdbd;
522534
cursor: default;
523535
}
536+
.fr-command.fr-btn:not(.fr-active) + .fr-dropdown-menu {
537+
left: -3000px !important;
538+
}
524539
.fr-command.fr-btn.fr-active + .fr-dropdown-menu {
525540
display: inline-block;
526541
-webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 2px 2px 1px rgba(0, 0, 0, 0.14);
@@ -566,6 +581,20 @@ body.prevent-scroll.fr-mobile {
566581
-webkit-font-smoothing: antialiased;
567582
-moz-osx-font-smoothing: grayscale;
568583
text-align: center;
584+
line-height: 1.2;
585+
}
586+
.fr-modal.fr-middle .fr-modal-wrapper {
587+
margin-top: 0;
588+
margin-bottom: 0;
589+
margin-left: auto;
590+
margin-right: auto;
591+
top: 50%;
592+
left: 50%;
593+
-webkit-transform: translate(-50%, -50%);
594+
-moz-transform: translate(-50%, -50%);
595+
-ms-transform: translate(-50%, -50%);
596+
-o-transform: translate(-50%, -50%);
597+
position: absolute;
569598
}
570599
.fr-modal .fr-modal-wrapper {
571600
border-radius: 2px;
@@ -585,7 +614,6 @@ body.prevent-scroll.fr-mobile {
585614
border-top: 5px solid #222222;
586615
overflow: hidden;
587616
width: 90%;
588-
padding-bottom: 10px;
589617
position: relative;
590618
}
591619
@media (min-width: 768px) and (max-width: 991px) {
@@ -649,10 +677,42 @@ body.prevent-scroll.fr-mobile {
649677
height: 100%;
650678
min-height: 150px;
651679
overflow-y: scroll;
680+
padding-bottom: 10px;
652681
}
653682
.fr-modal .fr-modal-wrapper div.fr-modal-body:focus {
654683
outline: 0;
655684
}
685+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command {
686+
height: 36px;
687+
line-height: 1;
688+
color: #1e88e5;
689+
padding: 10px;
690+
cursor: pointer;
691+
text-decoration: none;
692+
border: none;
693+
background: none;
694+
font-size: 16px;
695+
outline: none;
696+
-webkit-transition: background 0.2s ease 0s;
697+
-moz-transition: background 0.2s ease 0s;
698+
-ms-transition: background 0.2s ease 0s;
699+
-o-transition: background 0.2s ease 0s;
700+
}
701+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command + button {
702+
margin-left: 24px;
703+
}
704+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:hover,
705+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:focus {
706+
background: #ebebeb;
707+
color: #1e88e5;
708+
}
709+
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:active {
710+
background: #d6d6d6;
711+
color: #1e88e5;
712+
}
713+
.fr-modal .fr-modal-wrapper div.fr-modal-body button::-moz-focus-inner {
714+
border: 0;
715+
}
656716
.fr-desktop .fr-modal-wrapper .fr-modal-head i:hover {
657717
background: #ebebeb;
658718
}
@@ -701,6 +761,7 @@ body.prevent-scroll.fr-mobile {
701761
text-rendering: optimizelegibility;
702762
-webkit-font-smoothing: antialiased;
703763
-moz-osx-font-smoothing: grayscale;
764+
line-height: 1.2;
704765
}
705766
.fr-popup .fr-input-focus {
706767
background: #f5f5f5;
@@ -1020,6 +1081,7 @@ body.prevent-scroll.fr-mobile {
10201081
text-rendering: optimizelegibility;
10211082
-webkit-font-smoothing: antialiased;
10221083
-moz-osx-font-smoothing: grayscale;
1084+
line-height: 1.2;
10231085
}
10241086
.fr-toolbar::after {
10251087
clear: both;
@@ -2029,6 +2091,7 @@ body.fr-fullscreen {
20292091
}
20302092
.fr-modal-head .fr-modal-tags {
20312093
display: none;
2094+
text-align: left;
20322095
}
20332096
.fr-modal-head .fr-modal-tags a {
20342097
display: inline-block;

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

Lines changed: 2 additions & 2 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
44
* Copyright 2014-2017 Froala Labs
55
*/

‎assets/css/froala_style.min.css‎

Lines changed: 1 addition & 1 deletion
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
44
* Copyright 2014-2017 Froala Labs
55
*/

‎assets/css/plugins/char_counter.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/plugins/code_view.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
44
* Copyright 2014-2017 Froala Labs
55
*/

‎assets/css/plugins/code_view.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)