Skip to content

Commit cab84dd

Browse files
stefanneculaistefanneculai
committed
Update to v2.7.0.
1 parent d0d1213 commit cab84dd

File tree

121 files changed

+586
-188
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

+586
-188
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* froala_editor v2.6.6 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.7.0 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
44
* Copyright 2014-2017 Froala Labs
55
*/
@@ -26,12 +26,12 @@
2626
}
2727
.fr-box.fr-basic .fr-element {
2828
color: #000000;
29-
padding: 10px;
29+
padding: 16px;
3030
-webkit-box-sizing: border-box;
3131
-moz-box-sizing: border-box;
3232
box-sizing: border-box;
3333
overflow-x: auto;
34-
min-height: 40px;
34+
min-height: 52px;
3535
}
3636
.fr-box.fr-basic.fr-rtl .fr-element {
3737
text-align: right;

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

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

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* froala_editor v2.6.6 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.7.0 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
44
* Copyright 2014-2017 Froala Labs
55
*/
@@ -26,12 +26,12 @@
2626
}
2727
.fr-box.fr-basic .fr-element {
2828
color: #000000;
29-
padding: 10px;
29+
padding: 16px;
3030
-webkit-box-sizing: border-box;
3131
-moz-box-sizing: border-box;
3232
box-sizing: border-box;
3333
overflow-x: auto;
34-
min-height: 40px;
34+
min-height: 52px;
3535
}
3636
.fr-box.fr-basic.fr-rtl .fr-element {
3737
text-align: right;
@@ -1471,6 +1471,36 @@ textarea.fr-code {
14711471
-ms-transform: translate3d(-100%, 0, 0);
14721472
-o-transform: translate3d(-100%, 0, 0);
14731473
}
1474+
.fr-popup .fr-color-hex-layer {
1475+
width: 100%;
1476+
margin: 0px;
1477+
padding: 10px;
1478+
}
1479+
.fr-popup .fr-color-hex-layer .fr-input-line {
1480+
float: left;
1481+
width: calc(100% - 50px);
1482+
padding: 8px 0 0;
1483+
}
1484+
.fr-popup .fr-color-hex-layer .fr-action-buttons {
1485+
float: right;
1486+
width: 50px;
1487+
}
1488+
.fr-popup .fr-color-hex-layer .fr-action-buttons button {
1489+
background-color: #1e88e5;
1490+
color: #FFF;
1491+
border-radius: 4px;
1492+
-moz-border-radius: 4px;
1493+
-webkit-border-radius: 4px;
1494+
-moz-background-clip: padding;
1495+
-webkit-background-clip: padding-box;
1496+
background-clip: padding-box;
1497+
font-size: 13px;
1498+
height: 32px;
1499+
}
1500+
.fr-popup .fr-color-hex-layer .fr-action-buttons button:hover {
1501+
background-color: #166dba;
1502+
color: #FFF;
1503+
}
14741504
.fr-popup .fr-separator + .fr-colors-tabs {
14751505
-webkit-box-shadow: none;
14761506
-moz-box-shadow: none;
@@ -2384,7 +2414,7 @@ div.fr-modal-body div.fr-image-list div.fr-image-container .fr-insert-img {
23842414
.fr-qi-helper {
23852415
position: absolute;
23862416
z-index: 3;
2387-
padding-left: 10px;
2417+
padding-left: 16px;
23882418
white-space: nowrap;
23892419
}
23902420
.fr-qi-helper a.fr-btn.fr-floating-btn {

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

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

Lines changed: 161 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* froala_editor v2.6.6 (https://www.froala.com/wysiwyg-editor)
2+
* froala_editor v2.7.0 (https://www.froala.com/wysiwyg-editor)
33
* License https://froala.com/wysiwyg-editor/terms/
44
* Copyright 2014-2017 Froala Labs
55
*/
@@ -151,9 +151,11 @@
151151
}
152152
.fr-view img.fr-dib.fr-fil {
153153
margin-left: 0;
154+
text-align: left;
154155
}
155156
.fr-view img.fr-dib.fr-fir {
156157
margin-right: 0;
158+
text-align: right;
157159
}
158160
.fr-view img.fr-dii {
159161
display: inline-block;
@@ -174,19 +176,79 @@
174176
max-width: calc(100% - 5px);
175177
}
176178
.fr-view img.fr-rounded {
177-
border-radius: 100%;
178-
-moz-border-radius: 100%;
179-
-webkit-border-radius: 100%;
179+
border-radius: 10px;
180+
-moz-border-radius: 10px;
181+
-webkit-border-radius: 10px;
180182
-moz-background-clip: padding;
181183
-webkit-background-clip: padding-box;
182184
background-clip: padding-box;
183185
}
184186
.fr-view img.fr-bordered {
185-
border: solid 10px #CCC;
187+
border: solid 5px #CCC;
188+
-webkit-box-sizing: content-box;
189+
-moz-box-sizing: content-box;
190+
box-sizing: content-box;
191+
}
192+
.fr-view img.fr-shadow {
193+
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
194+
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
195+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
196+
}
197+
.fr-view span.fr-img-caption {
198+
position: relative;
199+
max-width: 100%;
200+
}
201+
.fr-view span.fr-img-caption.fr-dib {
202+
margin: 5px auto;
203+
display: block;
204+
float: none;
205+
vertical-align: top;
206+
}
207+
.fr-view span.fr-img-caption.fr-dib.fr-fil {
208+
margin-left: 0;
209+
text-align: left;
210+
}
211+
.fr-view span.fr-img-caption.fr-dib.fr-fir {
212+
margin-right: 0;
213+
text-align: right;
214+
}
215+
.fr-view span.fr-img-caption.fr-dii {
216+
display: inline-block;
217+
float: none;
218+
vertical-align: bottom;
219+
margin-left: 5px;
220+
margin-right: 5px;
221+
max-width: calc(100% - (2 * 5px));
222+
}
223+
.fr-view span.fr-img-caption.fr-dii.fr-fil {
224+
float: left;
225+
margin: 5px 5px 5px 0;
226+
max-width: calc(100% - 5px);
227+
}
228+
.fr-view span.fr-img-caption.fr-dii.fr-fir {
229+
float: right;
230+
margin: 5px 0 5px 5px;
231+
max-width: calc(100% - 5px);
232+
}
233+
.fr-view span.fr-img-caption.fr-rounded {
234+
border-radius: 10px;
235+
-moz-border-radius: 10px;
236+
-webkit-border-radius: 10px;
237+
-moz-background-clip: padding;
238+
-webkit-background-clip: padding-box;
239+
background-clip: padding-box;
240+
}
241+
.fr-view span.fr-img-caption.fr-bordered {
242+
border: solid 5px #CCC;
186243
-webkit-box-sizing: content-box;
187244
-moz-box-sizing: content-box;
188245
box-sizing: content-box;
189246
}
247+
.fr-view span.fr-img-caption.fr-shadow {
248+
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
249+
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
250+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
251+
}
190252
.fr-view .fr-video {
191253
text-align: center;
192254
position: relative;
@@ -223,6 +285,34 @@
223285
.fr-view a.fr-green {
224286
color: green;
225287
}
288+
.fr-view .fr-img-caption {
289+
text-align: center;
290+
}
291+
.fr-view .fr-img-caption .fr-img-wrap {
292+
padding: 0px;
293+
display: inline-block;
294+
margin: auto;
295+
text-align: center;
296+
}
297+
.fr-view .fr-img-caption .fr-img-wrap img {
298+
display: block;
299+
margin: auto;
300+
}
301+
.fr-view .fr-img-caption .fr-img-wrap > span {
302+
margin: auto;
303+
display: inline-block;
304+
padding: 5px 5px 10px;
305+
font-size: 14px;
306+
font-weight: initial;
307+
max-width: 100%;
308+
-webkit-box-sizing: border-box;
309+
-moz-box-sizing: border-box;
310+
box-sizing: border-box;
311+
-webkit-opacity: 0.9;
312+
-moz-opacity: 0.9;
313+
opacity: 0.9;
314+
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
315+
}
226316
.fr-view button.fr-rounded,
227317
.fr-view input.fr-rounded,
228318
.fr-view textarea.fr-rounded {
@@ -262,9 +352,11 @@ img.fr-view.fr-dib {
262352
}
263353
img.fr-view.fr-dib.fr-fil {
264354
margin-left: 0;
355+
text-align: left;
265356
}
266357
img.fr-view.fr-dib.fr-fir {
267358
margin-right: 0;
359+
text-align: right;
268360
}
269361
img.fr-view.fr-dii {
270362
display: inline-block;
@@ -285,16 +377,76 @@ img.fr-view.fr-dii.fr-fir {
285377
max-width: calc(100% - 5px);
286378
}
287379
img.fr-view.fr-rounded {
288-
border-radius: 100%;
289-
-moz-border-radius: 100%;
290-
-webkit-border-radius: 100%;
380+
border-radius: 10px;
381+
-moz-border-radius: 10px;
382+
-webkit-border-radius: 10px;
291383
-moz-background-clip: padding;
292384
-webkit-background-clip: padding-box;
293385
background-clip: padding-box;
294386
}
295387
img.fr-view.fr-bordered {
296-
border: solid 10px #CCC;
388+
border: solid 5px #CCC;
389+
-webkit-box-sizing: content-box;
390+
-moz-box-sizing: content-box;
391+
box-sizing: content-box;
392+
}
393+
img.fr-view.fr-shadow {
394+
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
395+
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
396+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
397+
}
398+
span.fr-img-caption.fr-view {
399+
position: relative;
400+
max-width: 100%;
401+
}
402+
span.fr-img-caption.fr-view.fr-dib {
403+
margin: 5px auto;
404+
display: block;
405+
float: none;
406+
vertical-align: top;
407+
}
408+
span.fr-img-caption.fr-view.fr-dib.fr-fil {
409+
margin-left: 0;
410+
text-align: left;
411+
}
412+
span.fr-img-caption.fr-view.fr-dib.fr-fir {
413+
margin-right: 0;
414+
text-align: right;
415+
}
416+
span.fr-img-caption.fr-view.fr-dii {
417+
display: inline-block;
418+
float: none;
419+
vertical-align: bottom;
420+
margin-left: 5px;
421+
margin-right: 5px;
422+
max-width: calc(100% - (2 * 5px));
423+
}
424+
span.fr-img-caption.fr-view.fr-dii.fr-fil {
425+
float: left;
426+
margin: 5px 5px 5px 0;
427+
max-width: calc(100% - 5px);
428+
}
429+
span.fr-img-caption.fr-view.fr-dii.fr-fir {
430+
float: right;
431+
margin: 5px 0 5px 5px;
432+
max-width: calc(100% - 5px);
433+
}
434+
span.fr-img-caption.fr-view.fr-rounded {
435+
border-radius: 10px;
436+
-moz-border-radius: 10px;
437+
-webkit-border-radius: 10px;
438+
-moz-background-clip: padding;
439+
-webkit-background-clip: padding-box;
440+
background-clip: padding-box;
441+
}
442+
span.fr-img-caption.fr-view.fr-bordered {
443+
border: solid 5px #CCC;
297444
-webkit-box-sizing: content-box;
298445
-moz-box-sizing: content-box;
299446
box-sizing: content-box;
300447
}
448+
span.fr-img-caption.fr-view.fr-shadow {
449+
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
450+
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
451+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
452+
}

0 commit comments

Comments
 (0)