Skip to content

Commit bf0ab3d

Browse files
committed
Update to version 1.2.5.
1 parent 8acd206 commit bf0ab3d

19 files changed

+255
-208
lines changed

froala:editor/css/froala_content.css

100755100644
Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,49 @@
11
/*!
2-
* froala_editor v1.2.4 (http://editor.froala.com)
3-
* Copyright 2014-2014 Froala
2+
* froala_editor v1.2.5 (http://editor.froala.com)
3+
* License http://editor.froala.com/license
4+
* Copyright 2014-2015 Froala Labs
45
*/
5-
.froala-element img.fr-fil,
6-
img.fr-tag.fr-fil {
6+
img.fr-fil {
77
z-index: 1;
88
position: relative;
9-
vertical-align: top;
10-
display: block;
119
margin: auto;
1210
overflow: auto;
1311
padding: 10px 10px 10px 3px;
1412
float: left !important;
1513
}
16-
.froala-element img.fr-fil.fr-tni,
17-
img.fr-tag.fr-fil.fr-tni {
14+
img.fr-fil.fr-dib {
1815
float: none !important;
1916
margin-left: 0 !important;
2017
}
21-
.froala-element img.fr-fir,
22-
img.fr-tag.fr-fir {
18+
img.fr-fir {
2319
z-index: 1;
2420
position: relative;
25-
vertical-align: top;
26-
display: block;
2721
margin: auto;
2822
overflow: auto;
2923
padding: 10px 3px 10px 10px;
3024
float: right !important;
3125
}
32-
.froala-element img.fr-fir.fr-tni,
33-
img.fr-tag.fr-fir.fr-tni {
26+
img.fr-fir.fr-dib {
3427
float: none !important;
3528
margin-right: 0 !important;
3629
}
37-
.froala-element img.fr-fin,
38-
img.fr-tag.fr-fin {
30+
img.fr-fin {
3931
z-index: 1;
4032
position: relative;
41-
vertical-align: top;
42-
display: block;
4333
margin: auto;
4434
overflow: auto;
45-
padding: 10px 0;
4635
float: none;
4736
}
48-
.froala-element a.fr-file,
37+
img.fr-fin.fr-dib {
38+
padding: 10px 0;
39+
}
40+
img.fr-dib {
41+
vertical-align: top;
42+
display: block;
43+
}
4944
a.fr-file {
5045
position: relative;
5146
}
52-
.froala-element a.fr-file:before,
5347
a.fr-file:before {
5448
position: relative;
5549
display: inline-block;
@@ -63,7 +57,7 @@ a.fr-file:before {
6357
top: 0;
6458
padding-right: 3px;
6559
}
66-
.froala-element table,
60+
.froala-view table,
6761
table.fr-tag {
6862
border-collapse: collapse;
6963
empty-cells: show;
@@ -74,18 +68,18 @@ table.fr-tag {
7468
-moz-box-sizing: border-box;
7569
box-sizing: border-box;
7670
}
77-
.froala-element table td,
71+
.froala-view table td,
7872
table.fr-tag td {
7973
border: solid 1px #cccccc;
8074
padding: 5px;
8175
}
82-
.froala-element table th,
76+
.froala-view table th,
8377
table.fr-tag th {
8478
background: #e6e6e6;
8579
border: solid 1px #cccccc;
8680
padding: 5px;
8781
}
88-
.froala-element pre,
82+
.froala-view pre,
8983
pre.fr-tag {
9084
white-space: pre-wrap;
9185
/* CSS3 */
@@ -107,7 +101,7 @@ pre.fr-tag {
107101
-webkit-background-clip: padding-box;
108102
background-clip: padding-box;
109103
}
110-
.froala-element blockquote,
104+
.froala-view blockquote,
111105
blockquote.fr-tag {
112106
margin-left: 20px;
113107
margin-right: 0;
@@ -117,7 +111,7 @@ blockquote.fr-tag {
117111
font-style: italic;
118112
border-left: solid 5px #cccccc;
119113
}
120-
.froala-element hr,
114+
.froala-view hr,
121115
hr.fr-tag {
122116
height: 0px;
123117
border: 0;
@@ -137,3 +131,15 @@ hr.fr-tag {
137131
float: right;
138132
margin: 10px 1px 10px 10px;
139133
}
134+
.fr-tnv {
135+
float: none !important;
136+
margin: auto;
137+
text-align: center;
138+
display: block !important;
139+
}
140+
.fr-tnv.fr-fvl {
141+
text-align: left;
142+
}
143+
.fr-tnv.fr-fvr {
144+
text-align: right;
145+
}

0 commit comments

Comments
 (0)