Skip to content
This repository was archived by the owner on Jan 15, 2024. It is now read-only.

Commit 496db02

Browse files
leJsboureauleJsboureau
committed
Pull request #45: style(app) refactor CSS.
Merge in WS/iink-js from MSIS-2936 to master * commit '4b1a52adecc9dd2ed3f7161a66b9f1d2b25b74a6': fix playwright to have test on firefox MSIS-3135 style(app) refactor CSS. Should not be global and can be customized MSIS-2936
2 parents d61bf6b + 4b1a52a commit 496db02

19 files changed

+645
-287
lines changed

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ test-e2e:
4545
EXAMPLES_IP=$$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $(TEST_DOCKER_EXAMPLES_INSTANCE_NAME)); \
4646
fi && \
4747
docker run -i --rm \
48-
-v $(CURRENT_PWD):/tests \
48+
-v $(CURRENT_PWD):/home/pwuser/tests \
49+
--ipc=host \
4950
-e LAUNCH_URL="http://$${EXAMPLES_IP}:$(EXAMPLES_LISTEN_PORT)" \
5051
-e BROWSER=$(BROWSER) \
51-
--ipc=host \
52-
-w "/tests" \
53-
--name "playwright-$(BROWSER)" mcr.microsoft.com/playwright:v1.15.2-bionic \
54-
npm run test:e2e
52+
-w "/home/pwuser/tests" \
53+
--name "playwright-$(BROWSER)-$(BUILDID)" mcr.microsoft.com/playwright:v1.16.0 \
54+
yarn test:e2e
5555

5656
dev-all: dev-examples ## Launch all the requirements for launching tests.
5757

‎dist/iink.esm.js‎

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

‎dist/iink.esm.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iink.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iink.min.js‎

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

‎dist/iink.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docker/examples/entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "HMACKEY=${DEV_HMACKEY}"
1414
sed -i -e "s/\(listen\s\+\)\(80;\)/\1${LISTEN_PORT};/g" /etc/nginx/conf.d/default.conf
1515
cat /etc/nginx/conf.d/default.conf
1616

17-
for filename in /usr/share/nginx/html/examples/**; do
17+
for filename in /usr/share/nginx/html/examples/**/*.*; do
1818
sed -i "s/scheme: 'https'/scheme: '${APISCHEME}'/g" "${filename}"
1919

2020
sed -i "s/webdemoapi.myscript.com/${APIHOST}/g" "${filename}"

‎examples/examples.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ select:focus {
190190
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjE2cHgiIGhlaWdodD0iMTZweCIgdmlld0JveD0iMCAwIDE4IDE4IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA0MCAoMzM3NjIpIC0gaHR0cDovL3d3dy5ib2hlbWlhbmNvZGluZy5jb20vc2tldGNoIC0tPgogICAgPHRpdGxlPnVwbG9hZDwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSJTeW1ib2xzIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8ZyBpZD0idXBsb2FkIiBmaWxsPSIjRkZGRkZGIj4KICAgICAgICAgICAgPHBhdGggZD0iTTgsNS40MTQyMTM1NiBMOCwxMiBDOCwxMi41NTIyODQ3IDguNDQ3NzE1MjUsMTMgOSwxMyBDOS41NTIyODQ3NSwxMyAxMCwxMi41NTIyODQ3IDEwLDEyIEwxMCw1LjQxNDIxMzU2IEwxMi4yOTI4OTMyLDcuNzA3MTA2NzggQzEyLjY4MzQxNzUsOC4wOTc2MzEwNyAxMy4zMTY1ODI1LDguMDk3NjMxMDcgMTMuNzA3MTA2OCw3LjcwNzEwNjc4IEMxNC4wOTc2MzExLDcuMzE2NTgyNDkgMTQuMDk3NjMxMSw2LjY4MzQxNzUxIDEzLjcwNzEwNjgsNi4yOTI4OTMyMiBMOS44Nzg5ODE3OCwyLjQ2NDc2ODIyIEM5LjQwMTkzMDIzLDEuOTg3NzE2NjcgOC42MDg0NDcwOCwxLjk3NzMzOTM2IDguMTIxMDE4MjIsMi40NjQ3NjgyMiBMNC4yOTI4OTMyMiw2LjI5Mjg5MzIyIEMzLjkwMjM2ODkzLDYuNjgzNDE3NTEgMy45MDIzNjg5Myw3LjMxNjU4MjQ5IDQuMjkyODkzMjIsNy43MDcxMDY3OCBDNC42ODM0MTc1MSw4LjA5NzYzMTA3IDUuMzE2NTgyNDksOC4wOTc2MzEwNyA1LjcwNzEwNjc4LDcuNzA3MTA2NzggTDgsNS40MTQyMTM1NiBaIE0xNCwxNiBDMTQuNTUyMjg0NywxNiAxNSwxNS41NTIyODQ3IDE1LDE1IEMxNSwxNC40NDc3MTUzIDE0LjU1MjI4NDcsMTQgMTQsMTQgTDQsMTQgQzMuNDQ3NzE1MjUsMTQgMywxNC40NDc3MTUzIDMsMTUgQzMsMTUuNTUyMjg0NyAzLjQ0NzcxNTI1LDE2IDQsMTYgTDE0LDE2IFoiIGlkPSJDb21iaW5lZC1TaGFwZSI+PC9wYXRoPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+Cg==) center center no-repeat;
191191
}
192192

193-
#editor {
193+
.ms-editor {
194194
width: 100vw;
195195
height: calc(100vh - 152px);
196196
touch-action: none;

‎examples/index.html‎

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -168,29 +168,31 @@ <h3><a class="title" name="v4-ws-text">Text</a></h3>
168168
Get source code
169169
</a>
170170
</div>
171-
<p><strong>Custom pre-loaded resource</strong></p>
171+
<p><strong>Customize editor style</strong></p>
172172
<div class="center">
173-
<a href="v4/websocket_text_custom_resources.html" class="btn">
173+
<a href="v4/websocket_text_customize_editor_css.html" class="btn">
174174
<svg class="icn">
175175
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-play"></use>
176176
</svg>
177177
View example
178178
</a>
179-
<a href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_custom_resources.html" class="btn">
179+
<a
180+
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_customize_editor_css.html" class="btn">
180181
<svg class="icn">
181182
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-github"></use>
182183
</svg>
183184
Get source code
184185
</a>
185186
</div>
186-
<p><strong>Custom lexicon</strong></p>
187+
<p><strong>Custom pre-loaded resource</strong></p>
187188
<div class="center">
188-
<a href="v4/websocket_text_custom_lexicon.html" class="btn">
189+
<a href="v4/websocket_text_custom_resources.html" class="btn">
189190
<svg class="icn">
190191
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-play"></use>
191192
</svg>
192-
View example</a>
193-
<a href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket/websocket_text_custom_lexicon.html" class="btn">
193+
View example
194+
</a>
195+
<a href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_custom_resources.html" class="btn">
194196
<svg class="icn">
195197
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-github"></use>
196198
</svg>
@@ -242,6 +244,22 @@ <h3><a class="title" name="v4-ws-text">Text</a></h3>
242244
Get source code
243245
</a>
244246
</div>
247+
<p><strong>Eraser</strong></p>
248+
<div class="center">
249+
<a href="v4/websocket_text_iink_eraser.html" class="btn">
250+
<svg class="icn">
251+
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-play"></use>
252+
</svg>
253+
View example
254+
</a>
255+
<a
256+
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_iink_eraser.html" class="btn">
257+
<svg class="icn">
258+
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-github"></use>
259+
</svg>
260+
Get source code
261+
</a>
262+
</div>
245263
</div>
246264
<div class="grid-column-two">
247265
<p><strong>Searching text (without Smart Guide)</strong></p>
@@ -276,80 +294,78 @@ <h3><a class="title" name="v4-ws-text">Text</a></h3>
276294
Get source code
277295
</a>
278296
</div>
279-
<p><strong>Customize the style and change the font</strong></p>
297+
<p><strong>Customize font and style of stroke</strong></p>
280298
<div class="center">
281-
<a href="v4/websocket_text_customize_style.html" class="btn">
299+
<a href="v4/websocket_text_customize_stroke_style.html" class="btn">
282300
<svg class="icn">
283301
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-play"></use>
284302
</svg>
285303
View example
286304
</a>
287305
<a
288-
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_customize_style.html" class="btn">
306+
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_customize_stroke_style.html" class="btn">
289307
<svg class="icn">
290308
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-github"></use>
291309
</svg>
292310
Get source code
293311
</a>
294312
</div>
295-
<p><strong>Use multiple inputs fields</strong></p>
313+
<p><strong>Custom lexicon</strong></p>
296314
<div class="center">
297-
<a href="v4/websocket_text_multiple_inputs.html" class="btn">
315+
<a href="v4/websocket_text_custom_lexicon.html" class="btn">
298316
<svg class="icn">
299317
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-play"></use>
300318
</svg>
301-
View example
302-
</a>
303-
<a
304-
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_multiple_inputs.html" class="btn">
319+
View example</a>
320+
<a href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket/websocket_text_custom_lexicon.html" class="btn">
305321
<svg class="icn">
306322
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-github"></use>
307323
</svg>
308324
Get source code
309325
</a>
310326
</div>
311-
<p><strong>Use local storage to save text</strong></p>
327+
<p><strong>Use multiple inputs fields</strong></p>
312328
<div class="center">
313-
<a href="v4/websocket_text_local_storage_text.html" class="btn">
329+
<a href="v4/websocket_text_multiple_inputs.html" class="btn">
314330
<svg class="icn">
315331
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-play"></use>
316332
</svg>
317333
View example
318334
</a>
319335
<a
320-
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_local_storage_text.html" class="btn">
336+
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_multiple_inputs.html" class="btn">
321337
<svg class="icn">
322338
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-github"></use>
323339
</svg>
324340
Get source code
325341
</a>
326342
</div>
327-
<p><strong>Highlight words</strong></p>
343+
<p><strong>Use local storage to save text</strong></p>
328344
<div class="center">
329-
<a href="v4/websocket_text_highlight_words.html" class="btn">
345+
<a href="v4/websocket_text_local_storage_text.html" class="btn">
330346
<svg class="icn">
331347
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-play"></use>
332348
</svg>
333349
View example
334350
</a>
335351
<a
336-
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_highlight_words.html" class="btn">
352+
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_local_storage_text.html" class="btn">
337353
<svg class="icn">
338354
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-github"></use>
339355
</svg>
340356
Get source code
341357
</a>
342358
</div>
343-
<p><strong>Eraser</strong></p>
359+
<p><strong>Highlight words</strong></p>
344360
<div class="center">
345-
<a href="v4/websocket_text_iink_eraser.html" class="btn">
361+
<a href="v4/websocket_text_highlight_words.html" class="btn">
346362
<svg class="icn">
347363
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-play"></use>
348364
</svg>
349365
View example
350366
</a>
351367
<a
352-
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_iink_eraser.html" class="btn">
368+
href="https://github.com/MyScript/iinkJS/blob/master/examples/v4/websocket_text_highlight_words.html" class="btn">
353369
<svg class="icn">
354370
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-github"></use>
355371
</svg>

‎examples/non-version-specific/change_configuration.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,12 @@
343343
iinkSmartGuideElement.checked = false
344344
iinkGuidesElement.disabled = true
345345
iinkGuidesElement.checked = false
346+
} else {
347+
triggersExportContentElement.querySelector('option[value="POINTER_UP"]').disabled = false
348+
iinkSmartGuideElement.disabled = false
349+
iinkSmartGuideElement.checked = true
350+
iinkGuidesElement.disabled = false
351+
iinkGuidesElement.checked = true
346352
}
347353
})
348354

0 commit comments

Comments
 (0)