Commit b0d5d674 authored by Ludwig Ruderstaller's avatar Ludwig Ruderstaller

Merge branch 'feature/update-froala-editor' into 'master'

Updated froala editor to 2.9.5

See merge request !9
parents b5aa5e25 f2c4cd8e
......@@ -42,6 +42,7 @@
"css/plugins/special_characters.min.css",
"css/plugins/table.min.css",
"css/plugins/video.min.css",
"css/third_party/embedly.min.css",
"css/third_party/spell_checker.min.css",
"js/froala_editor.min.js",
"js/froala_editor.pkgd.min.js",
......@@ -75,6 +76,7 @@
"js/plugins/url.min.js",
"js/plugins/video.min.js",
"js/plugins/word_paste.min.js",
"js/third_party/embedly.min.js",
"js/third_party/image_aviary.min.js",
"js/third_party/spell_checker.min.js"
],
......
/*!
* froala_editor v2.6.2 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.5 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
* Copyright 2014-2019 Froala Labs
*/
.clearfix::after {
......@@ -26,12 +26,12 @@
}
.fr-box.fr-basic .fr-element {
color: #000000;
padding: 10px;
padding: 16px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
overflow-x: auto;
min-height: 40px;
min-height: 52px;
}
.fr-box.fr-basic.fr-rtl .fr-element {
text-align: right;
......@@ -58,14 +58,6 @@
-webkit-user-select: none;
-ms-user-select: none;
}
.fr-element [contenteditable="false"] {
user-select: none;
-o-user-select: none;
-moz-user-select: none;
-khtml-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
}
.fr-element [contenteditable="true"] {
outline: 0px solid transparent;
}
......@@ -109,7 +101,8 @@
-o-transition: transform 0.2s ease 0s;
fill: #1e88e5;
}
.fr-box a.fr-floating-btn i {
.fr-box a.fr-floating-btn i,
.fr-box a.fr-floating-btn svg {
font-size: 14px;
line-height: 32px;
}
......@@ -163,11 +156,11 @@ iframe.fr-iframe {
.fr-wrapper.show-placeholder .fr-placeholder {
display: block;
}
.fr-wrapper ::selection {
.fr-wrapper ::-moz-selection {
background: #b5d6fd;
color: #000000;
}
.fr-wrapper ::-moz-selection {
.fr-wrapper ::selection {
background: #b5d6fd;
color: #000000;
}
......@@ -202,6 +195,41 @@ 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: left;
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;
z-index: auto;
}
.fr-box.fr-document .fr-wrapper .fr-element hr {
margin-left: -2cm;
margin-right: -2cm;
background: #EFEFEF;
height: 1cm;
outline: none;
border: none;
}
.fr-box.fr-document .fr-wrapper .fr-element img {
z-index: 1;
}
}
.fr-tooltip {
position: absolute;
top: 0;
......@@ -236,7 +264,7 @@ iframe.fr-iframe {
-khtml-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
z-index: 9997;
z-index: 2147483647;
text-rendering: optimizelegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
......@@ -247,6 +275,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;
......@@ -295,7 +333,9 @@ iframe.fr-iframe {
width: auto;
}
.fr-toolbar .fr-command.fr-btn i,
.fr-popup .fr-command.fr-btn i {
.fr-popup .fr-command.fr-btn i,
.fr-toolbar .fr-command.fr-btn svg,
.fr-popup .fr-command.fr-btn svg {
display: block;
font-size: 14px;
width: 14px;
......@@ -351,7 +391,9 @@ iframe.fr-iframe {
.fr-toolbar .fr-command.fr-btn.fr-dropdown span,
.fr-popup .fr-command.fr-btn.fr-dropdown span,
.fr-toolbar .fr-command.fr-btn.fr-dropdown img,
.fr-popup .fr-command.fr-btn.fr-dropdown img {
.fr-popup .fr-command.fr-btn.fr-dropdown img,
.fr-toolbar .fr-command.fr-btn.fr-dropdown svg,
.fr-popup .fr-command.fr-btn.fr-dropdown svg {
margin-left: 8px;
margin-right: 16px;
}
......@@ -411,23 +453,30 @@ iframe.fr-iframe {
border-top-color: #bdbdbd;
}
.fr-toolbar.fr-rtl .fr-command.fr-btn,
.fr-popup.fr-rtl .fr-command.fr-btn {
.fr-popup.fr-rtl .fr-command.fr-btn,
.fr-toolbar.fr-rtl .fr-btn-wrap,
.fr-popup.fr-rtl .fr-btn-wrap {
float: right;
}
.fr-toolbar.fr-inline .fr-command.fr-btn:not(.fr-hidden) {
.fr-toolbar.fr-inline > .fr-command.fr-btn:not(.fr-hidden),
.fr-toolbar.fr-inline > .fr-btn-wrap:not(.fr-hidden) {
display: -webkit-inline-flex;
display: -ms-inline-flexbox;
display: inline-flex;
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 {
......@@ -435,7 +484,9 @@ iframe.fr-iframe {
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;
}
......@@ -457,6 +508,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;
......@@ -474,6 +534,14 @@ iframe.fr-iframe {
-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;
......@@ -525,6 +593,15 @@ iframe.fr-iframe {
color: #bdbdbd;
cursor: default;
}
.fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper .fr-dropdown-content ul.fr-dropdown-list li a .fr-shortcut {
float: right;
margin-left: 32px;
font-weight: bold;
-webkit-opacity: 0.75;
-moz-opacity: 0.75;
opacity: 0.75;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
}
.fr-command.fr-btn:not(.fr-active) + .fr-dropdown-menu {
left: -3000px !important;
}
......@@ -568,7 +645,7 @@ body.prevent-scroll.fr-mobile {
bottom: 0;
right: 0;
width: 100%;
z-index: 9999;
z-index: 2147483640;
text-rendering: optimizelegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
......@@ -617,7 +694,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 {
......@@ -636,18 +713,16 @@ body.prevent-scroll.fr-mobile {
-ms-transition: height 0.2s ease 0s;
-o-transition: height 0.2s ease 0s;
}
.fr-modal .fr-modal-wrapper .fr-modal-head i {
.fr-modal .fr-modal-wrapper .fr-modal-head .fr-modal-close {
padding: 12px;
width: 20px;
font-size: 16px;
font-size: 30px;
cursor: pointer;
line-height: 18px;
color: #222222;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
.fr-modal .fr-modal-wrapper .fr-modal-head i.fr-modal-close {
position: absolute;
top: 0;
right: 0;
......@@ -689,6 +764,12 @@ body.prevent-scroll.fr-mobile {
-moz-transition: background 0.2s ease 0s;
-ms-transition: background 0.2s ease 0s;
-o-transition: background 0.2s ease 0s;
border-radius: 2px;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
.fr-modal .fr-modal-wrapper div.fr-modal-body button.fr-command + button {
margin-left: 24px;
......@@ -719,7 +800,7 @@ body.prevent-scroll.fr-mobile {
-moz-opacity: 0.5;
opacity: 0.5;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
z-index: 9998;
z-index: 2147483639;
}
.fr-popup {
position: absolute;
......@@ -746,7 +827,7 @@ body.prevent-scroll.fr-mobile {
-webkit-user-select: none;
-ms-user-select: none;
margin-top: 10px;
z-index: 9995;
z-index: 2147483635;
text-align: left;
border: 0px;
border-top: 5px solid #222222;
......@@ -775,6 +856,9 @@ body.prevent-scroll.fr-mobile {
opacity: 0;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
}
.fr-popup.fr-empty {
display: none !important;
}
.fr-popup .fr-hs {
display: block !important;
}
......@@ -911,6 +995,12 @@ body.prevent-scroll.fr-mobile {
-moz-transition: background 0.2s ease 0s;
-ms-transition: background 0.2s ease 0s;
-o-transition: background 0.2s ease 0s;
border-radius: 2px;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
.fr-popup .fr-action-buttons button.fr-command + button {
margin-left: 24px;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
/*!
* froala_editor v2.6.2 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.5 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
* Copyright 2014-2019 Froala Labs
*/
.clearfix::after {
......@@ -20,6 +20,38 @@
clip: rect(0, 0, 0, 0);
border: 0;
}
img.fr-rounded,
.fr-img-caption.fr-rounded img {
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
img.fr-bordered,
.fr-img-caption.fr-bordered img {
border: solid 5px #CCC;
}
img.fr-bordered {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
.fr-img-caption.fr-bordered img {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
img.fr-shadow,
.fr-img-caption.fr-shadow img {
-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);
}
.fr-view {
word-wrap: break-word;
}
.fr-view span[style~="color:"] a {
color: inherit;
}
......@@ -32,6 +64,9 @@
empty-cells: show;
max-width: 100%;
}
.fr-view table td {
min-width: 5px;
}
.fr-view table.fr-dashed-borders td,
.fr-view table.fr-dashed-borders th {
border-style: dashed;
......@@ -79,6 +114,7 @@
.fr-view pre {
white-space: pre-wrap;
word-wrap: break-word;
overflow: visible;
}
.fr-view[dir="rtl"] blockquote {
border-left: none;
......@@ -139,6 +175,24 @@
.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%;
......@@ -151,9 +205,11 @@
}
.fr-view img.fr-dib.fr-fil {
margin-left: 0;
text-align: left;
}
.fr-view img.fr-dib.fr-fir {
margin-right: 0;
text-align: right;
}
.fr-view img.fr-dii {
display: inline-block;
......@@ -173,24 +229,61 @@
margin: 5px 0 5px 5px;
max-width: calc(100% - 5px);
}
.fr-view img.fr-rounded {
border-radius: 100%;
-moz-border-radius: 100%;
-webkit-border-radius: 100%;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
.fr-view span.fr-img-caption {
position: relative;
max-width: 100%;
}
.fr-view img.fr-bordered {
border: solid 10px #CCC;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
.fr-view span.fr-img-caption.fr-dib {
margin: 5px auto;
display: block;
float: none;
vertical-align: top;
}
.fr-view span.fr-img-caption.fr-dib.fr-fil {
margin-left: 0;
text-align: left;
}
.fr-view span.fr-img-caption.fr-dib.fr-fir {
margin-right: 0;
text-align: right;
}
.fr-view span.fr-img-caption.fr-dii {
display: inline-block;
float: none;
vertical-align: bottom;
margin-left: 5px;
margin-right: 5px;
max-width: calc(100% - (2 * 5px));
}
.fr-view span.fr-img-caption.fr-dii.fr-fil {
float: left;
margin: 5px 5px 5px 0;
max-width: calc(100% - 5px);
}
.fr-view span.fr-img-caption.fr-dii.fr-fir {
float: right;
margin: 5px 0 5px 5px;
max-width: calc(100% - 5px);
}
.fr-view .fr-video {
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;
......@@ -223,6 +316,37 @@
.fr-view a.fr-green {
color: green;
}
.fr-view .fr-img-caption {
text-align: center;
}
.fr-view .fr-img-caption .fr-img-wrap {
padding: 0px;
display: inline-block;
margin: auto;
text-align: center;
width: 100%;
}
.fr-view .fr-img-caption .fr-img-wrap img {
display: block;
margin: auto;
width: 100%;
}
.fr-view .fr-img-caption .fr-img-wrap > span {
margin: auto;
display: block;
padding: 5px 5px 10px;
font-size: 14px;
font-weight: initial;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-opacity: 0.9;
-moz-opacity: 0.9;
opacity: 0.9;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
width: 100%;
text-align: center;
}
.fr-view button.fr-rounded,
.fr-view input.fr-rounded,
.fr-view textarea.fr-rounded {
......@@ -262,9 +386,11 @@ img.fr-view.fr-dib {
}
img.fr-view.fr-dib.fr-fil {
margin-left: 0;
text-align: left;
}
img.fr-view.fr-dib.fr-fir {
margin-right: 0;
text-align: right;
}
img.fr-view.fr-dii {
display: inline-block;
......@@ -284,17 +410,39 @@ img.fr-view.fr-dii.fr-fir {