Skip to content

Commit

Permalink
Update to V2.6.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanneculai committed Jul 21, 2017
1 parent 77be923 commit 1a79061
Show file tree
Hide file tree
Showing 47 changed files with 384 additions and 69 deletions.
70 changes: 66 additions & 4 deletions froala_editor/static/froala_editor/css/froala_editor.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down Expand Up @@ -33,6 +33,9 @@
overflow-x: auto;
min-height: 40px;
}
.fr-box.fr-basic.fr-rtl .fr-element {
text-align: right;
}
.fr-element {
background: transparent;
position: relative;
Expand Down Expand Up @@ -316,7 +319,7 @@ iframe.fr-iframe {
font-size: 14px;
display: block;
line-height: 17px;
min-width: 38px;
min-width: 34px;
float: left;
text-overflow: ellipsis;
overflow: hidden;
Expand Down Expand Up @@ -411,7 +414,7 @@ iframe.fr-iframe {
.fr-popup.fr-rtl .fr-command.fr-btn {
float: right;
}
.fr-toolbar.fr-inline .fr-command.fr-btn {
.fr-toolbar.fr-inline .fr-command.fr-btn:not(.fr-hidden) {
display: -webkit-inline-flex;
display: -ms-inline-flexbox;
display: inline-flex;
Expand Down Expand Up @@ -463,13 +466,22 @@ iframe.fr-iframe {
z-index: 4;
-webkit-overflow-scrolling: touch;
overflow: hidden;
zoom: 1;
border-radius: 0 0 2px 2px;
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
.fr-command.fr-btn + .fr-dropdown-menu.test-height .fr-dropdown-wrapper {
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
-o-transition: none;
height: auto;
max-height: 275px;
}
.fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper {
background: #ffffff;
padding: 0;
Expand Down Expand Up @@ -521,6 +533,9 @@ iframe.fr-iframe {
color: #bdbdbd;
cursor: default;
}
.fr-command.fr-btn:not(.fr-active) + .fr-dropdown-menu {
left: -3000px !important;
}
.fr-command.fr-btn.fr-active + .fr-dropdown-menu {
display: inline-block;
-webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 2px 2px 1px rgba(0, 0, 0, 0.14);
Expand Down Expand Up @@ -566,6 +581,20 @@ body.prevent-scroll.fr-mobile {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
line-height: 1.2;
}
.fr-modal.fr-middle .fr-modal-wrapper {
margin-top: 0;
margin-bottom: 0;
margin-left: auto;
margin-right: auto;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
-moz-transform: translate(-50%, -50%);
-ms-transform: translate(-50%, -50%);
-o-transform: translate(-50%, -50%);
position: absolute;
}
.fr-modal .fr-modal-wrapper {
border-radius: 2px;
Expand All @@ -585,7 +614,6 @@ body.prevent-scroll.fr-mobile {
border-top: 5px solid #222222;
overflow: hidden;
width: 90%;
padding-bottom: 10px;
position: relative;
}
@media (min-width: 768px) and (max-width: 991px) {
Expand Down Expand Up @@ -649,10 +677,42 @@ body.prevent-scroll.fr-mobile {
height: 100%;
min-height: 150px;
overflow-y: scroll;
padding-bottom: 10px;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body:focus {
outline: 0;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command {
height: 36px;
line-height: 1;
color: #1e88e5;
padding: 10px;
cursor: pointer;
text-decoration: none;
border: none;
background: none;
font-size: 16px;
outline: none;
-webkit-transition: background 0.2s ease 0s;
-moz-transition: background 0.2s ease 0s;
-ms-transition: background 0.2s ease 0s;
-o-transition: background 0.2s ease 0s;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command + button {
margin-left: 24px;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:hover,
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:focus {
background: #ebebeb;
color: #1e88e5;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:active {
background: #d6d6d6;
color: #1e88e5;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button::-moz-focus-inner {
border: 0;
}
.fr-desktop .fr-modal-wrapper .fr-modal-head i:hover {
background: #ebebeb;
}
Expand Down Expand Up @@ -701,6 +761,7 @@ body.prevent-scroll.fr-mobile {
text-rendering: optimizelegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
line-height: 1.2;
}
.fr-popup .fr-input-focus {
background: #f5f5f5;
Expand Down Expand Up @@ -1020,6 +1081,7 @@ body.prevent-scroll.fr-mobile {
text-rendering: optimizelegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
line-height: 1.2;
}
.fr-toolbar::after {
clear: both;
Expand Down
4 changes: 2 additions & 2 deletions froala_editor/static/froala_editor/css/froala_editor.min.css

Large diffs are not rendered by default.

71 changes: 67 additions & 4 deletions froala_editor/static/froala_editor/css/froala_editor.pkgd.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down Expand Up @@ -33,6 +33,9 @@
overflow-x: auto;
min-height: 40px;
}
.fr-box.fr-basic.fr-rtl .fr-element {
text-align: right;
}
.fr-element {
background: transparent;
position: relative;
Expand Down Expand Up @@ -316,7 +319,7 @@ iframe.fr-iframe {
font-size: 14px;
display: block;
line-height: 17px;
min-width: 38px;
min-width: 34px;
float: left;
text-overflow: ellipsis;
overflow: hidden;
Expand Down Expand Up @@ -411,7 +414,7 @@ iframe.fr-iframe {
.fr-popup.fr-rtl .fr-command.fr-btn {
float: right;
}
.fr-toolbar.fr-inline .fr-command.fr-btn {
.fr-toolbar.fr-inline .fr-command.fr-btn:not(.fr-hidden) {
display: -webkit-inline-flex;
display: -ms-inline-flexbox;
display: inline-flex;
Expand Down Expand Up @@ -463,13 +466,22 @@ iframe.fr-iframe {
z-index: 4;
-webkit-overflow-scrolling: touch;
overflow: hidden;
zoom: 1;
border-radius: 0 0 2px 2px;
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
.fr-command.fr-btn + .fr-dropdown-menu.test-height .fr-dropdown-wrapper {
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
-o-transition: none;
height: auto;
max-height: 275px;
}
.fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper {
background: #ffffff;
padding: 0;
Expand Down Expand Up @@ -521,6 +533,9 @@ iframe.fr-iframe {
color: #bdbdbd;
cursor: default;
}
.fr-command.fr-btn:not(.fr-active) + .fr-dropdown-menu {
left: -3000px !important;
}
.fr-command.fr-btn.fr-active + .fr-dropdown-menu {
display: inline-block;
-webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 2px 2px 1px rgba(0, 0, 0, 0.14);
Expand Down Expand Up @@ -566,6 +581,20 @@ body.prevent-scroll.fr-mobile {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
line-height: 1.2;
}
.fr-modal.fr-middle .fr-modal-wrapper {
margin-top: 0;
margin-bottom: 0;
margin-left: auto;
margin-right: auto;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
-moz-transform: translate(-50%, -50%);
-ms-transform: translate(-50%, -50%);
-o-transform: translate(-50%, -50%);
position: absolute;
}
.fr-modal .fr-modal-wrapper {
border-radius: 2px;
Expand All @@ -585,7 +614,6 @@ body.prevent-scroll.fr-mobile {
border-top: 5px solid #222222;
overflow: hidden;
width: 90%;
padding-bottom: 10px;
position: relative;
}
@media (min-width: 768px) and (max-width: 991px) {
Expand Down Expand Up @@ -649,10 +677,42 @@ body.prevent-scroll.fr-mobile {
height: 100%;
min-height: 150px;
overflow-y: scroll;
padding-bottom: 10px;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body:focus {
outline: 0;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command {
height: 36px;
line-height: 1;
color: #1e88e5;
padding: 10px;
cursor: pointer;
text-decoration: none;
border: none;
background: none;
font-size: 16px;
outline: none;
-webkit-transition: background 0.2s ease 0s;
-moz-transition: background 0.2s ease 0s;
-ms-transition: background 0.2s ease 0s;
-o-transition: background 0.2s ease 0s;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command + button {
margin-left: 24px;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:hover,
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:focus {
background: #ebebeb;
color: #1e88e5;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command:active {
background: #d6d6d6;
color: #1e88e5;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button::-moz-focus-inner {
border: 0;
}
.fr-desktop .fr-modal-wrapper .fr-modal-head i:hover {
background: #ebebeb;
}
Expand Down Expand Up @@ -701,6 +761,7 @@ body.prevent-scroll.fr-mobile {
text-rendering: optimizelegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
line-height: 1.2;
}
.fr-popup .fr-input-focus {
background: #f5f5f5;
Expand Down Expand Up @@ -1020,6 +1081,7 @@ body.prevent-scroll.fr-mobile {
text-rendering: optimizelegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
line-height: 1.2;
}
.fr-toolbar::after {
clear: both;
Expand Down Expand Up @@ -2029,6 +2091,7 @@ body.fr-fullscreen {
}
.fr-modal-head .fr-modal-tags {
display: none;
text-align: left;
}
.fr-modal-head .fr-modal-tags a {
display: inline-block;
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion froala_editor/static/froala_editor/css/froala_style.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion froala_editor/static/froala_editor/css/plugins/colors.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.6.2 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.5.1 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.4 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down
Loading

0 comments on commit 1a79061

Please sign in to comment.