Skip to content

Commit 2fe6c3f

Browse files
committed
Merge branch 'develop' into issue/18-format-bar-tablet
2 parents 9b89d36 + 8a1bf41 commit 2fe6c3f

File tree

6 files changed

+1086
-1128
lines changed

6 files changed

+1086
-1128
lines changed

libs/editor-common/assets/android-editor-test.html

Lines changed: 0 additions & 28 deletions
This file was deleted.

libs/editor-common/assets/android-editor.html

Lines changed: 13 additions & 1094 deletions
Large diffs are not rendered by default.
Lines changed: 303 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,303 @@
1+
@font-face {
2+
font-family: 'OpenSans';
3+
src: local("OpenSans");
4+
font-weight: normal;
5+
font-style: normal;
6+
}
7+
@font-face {
8+
font-family: 'OpenSans';
9+
src: local("OpenSans-Italic");
10+
font-weight: normal;
11+
font-style: italic;
12+
}
13+
@font-face {
14+
font-family: 'OpenSans';
15+
src: local("OpenSans-Bold");
16+
font-weight: bold;
17+
font-style: normal;
18+
}
19+
@font-face {
20+
font-family: 'OpenSans';
21+
src: local("OpenSans-BoldItalic");
22+
font-weight: bold;
23+
font-style: italic;
24+
}
25+
26+
* {outline: 0px solid transparent;
27+
-webkit-tap-highlight-color: rgba(0,0,0,0);
28+
-webkit-touch-callout: none;
29+
}
30+
31+
html {
32+
padding:0;
33+
box-sizing: border-box;
34+
}
35+
36+
html, body {
37+
margin:0;
38+
font-family:OpenSans, sans-serif;
39+
font-size:1em;
40+
color:#2D2D2D;
41+
}
42+
43+
body {
44+
padding-left:5px;
45+
padding-right:5px;
46+
padding-top: 0px;
47+
padding-bottom: 0px;
48+
overflow-y: auto;
49+
min-height: 100vh;
50+
word-wrap: break-word;
51+
}
52+
53+
p {
54+
line-height: 24px;
55+
margin-top: 0px;
56+
margin-bottom: 24px;
57+
}
58+
59+
hr {
60+
border: none;
61+
height: 1px;
62+
color: #e8f0f5;
63+
background-color: #e8f0f5;
64+
width: 100%;
65+
}
66+
67+
img {
68+
width: auto;
69+
height: auto;
70+
margin: 0px 0 0px 0;
71+
min-width: 30px;
72+
min-height: 30px;
73+
max-width: 100%;
74+
opacity:1;
75+
}
76+
77+
a {
78+
color: #0087be;
79+
text-decoration: none;
80+
}
81+
82+
blockquote {
83+
background: #e8f0f5;
84+
padding: 10px 10px 10px 20px;
85+
margin: 10px 0 10px 0;
86+
border-radius: 2px;
87+
}
88+
89+
img.zs_active {
90+
border: 2px dashed #000;
91+
}
92+
93+
img.uploading {
94+
opacity:0.3;
95+
-webkit-user-select: none;
96+
}
97+
98+
img.failed {
99+
-webkit-filter: blur(4px) grayscale(0.3);
100+
margin:-1px;
101+
padding:1px;
102+
z-index:-1;
103+
-webkit-user-select: none;
104+
overflow: hidden;
105+
}
106+
107+
span.img_container {
108+
position: relative;
109+
display: inline-block;
110+
-webkit-user-select: none;
111+
}
112+
113+
span.img_container.failed {
114+
overflow: hidden;
115+
}
116+
117+
span.img_container.failed::before {
118+
position: absolute;
119+
top: 50%;
120+
-webkit-transform: translateY(-50%);
121+
left:0%;
122+
text-align: center;
123+
color: white;
124+
width:100%;
125+
height:85px;
126+
opacity:1;
127+
z-index:10;
128+
-webkit-user-select: none;
129+
pointer-events: none;
130+
content:"";
131+
background:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="54" height="54" viewBox="0 0 124 124"><circle fill="none" stroke="#FFFFFF" stroke-width="4" cx="62" cy="62" r="60"/><path d="M79.0637899,40.93125 C74.1838649,36.0375 67.4465291,33 59.9831144,33 C45.0562852,33 33,45.0825 33,60 C33,74.9175 45.0562852,87 59.9831144,87 C72.5628518,87 83.0994371,78.39375 86.0881801,66.75 L79.0637899,66.75 C76.2776735,74.61375 68.8142589,80.25 59.9831144,80.25 C48.7879925,80.25 39.7204503,71.188125 39.7204503,60 C39.7204503,48.811875 48.7879925,39.75 59.9831144,39.75 C65.5722326,39.75 70.587242,42.07875 74.2514071,45.740625 L63.3602251,56.625 L87,56.625 L87,33 L79.0637899,40.93125 L79.0637899,40.93125 Z" fill="#FFFFFF"/></svg>') no-repeat center top;
132+
}
133+
134+
span.img_container.failed.largeFail::before {
135+
height:170px;
136+
background:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="124" height="124" viewBox="0 0 124 124"><circle fill="none" stroke="#FFFFFF" stroke-width="4" cx="62" cy="62" r="60"></circle><path d="M79.0637899,40.93125 C74.1838649,36.0375 67.4465291,33 59.9831144,33 C45.0562852,33 33,45.0825 33,60 C33,74.9175 45.0562852,87 59.9831144,87 C72.5628518,87 83.0994371,78.39375 86.0881801,66.75 L79.0637899,66.75 C76.2776735,74.61375 68.8142589,80.25 59.9831144,80.25 C48.7879925,80.25 39.7204503,71.188125 39.7204503,60 C39.7204503,48.811875 48.7879925,39.75 59.9831144,39.75 C65.5722326,39.75 70.587242,42.07875 74.2514071,45.740625 L63.3602251,56.625 L87,56.625 L87,33 L79.0637899,40.93125 L79.0637899,40.93125 Z" fill="#FFFFFF" ></path></svg>') no-repeat center top;
137+
}
138+
139+
span.img_container.failed::after {
140+
position: absolute;
141+
padding:27px 0 0 0;
142+
top:50%;
143+
left:0%;
144+
font-size:20px;
145+
font-weight:600;
146+
text-align: center;
147+
text-shadow: 0 1px 2px rgba(0,0,0,.06);
148+
background:clear;
149+
color: white;
150+
width:100%;
151+
height:50%;
152+
-webkit-user-select: none;
153+
pointer-events: none;
154+
content:attr(data-failed);
155+
}
156+
157+
span.img_container.failed.largeFail::after {
158+
padding:62px 0 0 0;
159+
}
160+
161+
span.img_container.failed.smallFail::after {
162+
content:attr(data-failed);
163+
}
164+
165+
/* Image editing overlay styles */
166+
.edit-container {
167+
position: relative;
168+
display: inline-block;
169+
-webkit-user-select: none;
170+
overflow: hidden;
171+
}
172+
173+
.edit-container img {
174+
-webkit-filter: blur(4px) grayscale(0.3);
175+
margin:-1px; /*tiny margin to keep crisp edges when blurring the image*/
176+
padding:1px;
177+
}
178+
179+
/* default. use when images are > 100px w/h */
180+
.edit-container .edit-overlay {
181+
position: absolute;
182+
width:100%;
183+
top: 50%;
184+
-webkit-transform: translateY(-50%);
185+
width:100%;
186+
z-index: 100;
187+
height:95px;
188+
background:url('data:image/svg+xml;utf8,<svg width="60px" height="60px" viewBox="0 0 120 120" version="1.1" opacity="0.9" xmlns="http://www.w3.org/2000/svg"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(2.000000, 2.000000)"><circle stroke="#FFFFFF" stroke-width="4" cx="58" cy="58" r="58"></circle><path d="M31.28125,85.4375 L49.28125,85.4375 L85.28125,49.4375 L67.28125,31.4375 L31.28125,67.4375 L31.28125,85.4375 Z M71.1383929,43.0089286 L47.2321429,66.9151786 L43.375,63.0580357 L67.28125,39.1517857 L71.1383929,43.0089286 Z M53.6607143,73.34375 L49.8035714,69.4866071 L73.7098214,45.5803571 L77.5669643,49.4375 L53.6607143,73.34375 Z M36.4241071,72.0089286 L41.5669643,66.8660714 L51.8526786,77.1517857 L46.7098214,82.2946429 L36.4241071,72.0089286 Z" fill="#FFFFFF"></path></g></g></svg>') no-repeat center top;
189+
min-height: 95px;
190+
min-width: 60px;
191+
}
192+
193+
/* use when the image is < 100px w/h */
194+
.edit-container.small .edit-overlay {
195+
height:27px;
196+
min-height: 27px;
197+
min-width: 27px;
198+
background:url('data:image/svg+xml;utf8,<svg width="27px" height="27px" viewBox="0 0 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg" opacity="0.9"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g fill="#FFFFFF"><path d="M0,54 L18,54 L54,18 L36,0 L0,36 L0,54 Z M39.8571429,11.5714286 L15.9508929,35.4776786 L12.09375,31.6205357 L36,7.71428571 L39.8571429,11.5714286 Z M22.3794643,41.90625 L18.5223214,38.0491071 L42.4285714,14.1428571 L46.2857143,18 L22.3794643,41.90625 Z M5.14285714,40.5714286 L10.2857143,35.4285714 L20.5714286,45.7142857 L15.4285714,50.8571429 L5.14285714,40.5714286 Z"></path></g></g></svg>') no-repeat center top;
199+
}
200+
201+
.edit-container.small .edit-content {
202+
display:none;
203+
}
204+
205+
.edit-container .edit-content {
206+
font-size:20px;
207+
font-weight:600;
208+
text-align: center;
209+
text-shadow: 0px 1px 2px rgba(0,0,0,.06);
210+
color: white;
211+
-webkit-user-select: none;
212+
pointer-events: none;
213+
position: absolute;
214+
bottom: 0;
215+
width:100%;
216+
}
217+
218+
progress.wp_media_indicator {
219+
/* Reset the default appearance */
220+
-webkit-appearance: none;
221+
-webkit-user-select: none;
222+
appearance: none;
223+
position: absolute;
224+
top:-2pt; height:2pt;
225+
left:0px; width:100%;
226+
}
227+
228+
progress.wp_media_indicator::-webkit-progress-bar {
229+
background-color: rgba(232,240,247,1.0);
230+
}
231+
232+
progress.wp_media_indicator::-webkit-progress-value {
233+
background-color:rgba(0,135,190,1.0);
234+
border-radius: 0 2pt 2pt 0;
235+
}
236+
237+
progress.wp_media_indicator.failed::-webkit-progress-bar {
238+
background-color: rgba(232,232,232,1.0);
239+
}
240+
241+
progress.wp_media_indicator.failed::-webkit-progress-value {
242+
background-color:rgba(135,135,135,1.0);
243+
border-radius: 0 2pt 2pt 0;
244+
}
245+
246+
247+
div.field[contenteditable] {
248+
padding: 15px 10px 5px 10px;
249+
box-sizing: border-box;
250+
font-size: 16px;
251+
}
252+
253+
div.field[placeholderText][contenteditable=true]:empty:before {
254+
content: attr(placeholderText);
255+
transition: 0.2s ease opacity;
256+
}
257+
258+
div.field[placeholderText][contenteditable=true]:empty:focus:before {
259+
opacity: 0.6;
260+
}
261+
262+
#separatorDiv {
263+
-webkit-user-select: none;
264+
padding-left: 10px;
265+
padding-right: 10px;
266+
}
267+
268+
#zss_field_title, #zss_field_title p {
269+
font-family:'Merriweather', serif;
270+
font-weight: bold;
271+
font-size: 18px;
272+
margin-bottom: 0px;
273+
}
274+
275+
#zss_field_content {
276+
margin-bottom: 10px;
277+
}
278+
279+
.wp-temp[data-wp-temp="caption"] {
280+
-webkit-user-select: none;
281+
}
282+
283+
.wp-caption {
284+
padding: 0px 10px 10px 0px;
285+
font-size: 75%;
286+
font-style: italic;
287+
cursor: none;
288+
}
289+
290+
.ipad_body {
291+
padding-left: 80px;
292+
padding-right: 80px;
293+
}
294+
295+
.ipad_field_title {
296+
font-size: 1.3em;
297+
}
298+
299+
.ipad_field_content {
300+
font-size: 1.125em;
301+
line-height: 28px;
302+
}
303+
}

libs/editor-common/assets/jquery-2.0.3.min.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

libs/editor-common/assets/jquery-2.1.3.min.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)