Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/i/3204-table-caption' into i/908…
Browse files Browse the repository at this point in the history
…5-table-caption-docs
  • Loading branch information
maxbarnas committed Apr 22, 2021
2 parents f629562 + 2d8fa7f commit 75d586c
Show file tree
Hide file tree
Showing 268 changed files with 8,068 additions and 2,256 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true

[*.{js,jsx,ts}]
quote_type = single

[package.json]
indent_style = space
tab_width = 2
24 changes: 7 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,27 @@
sudo: required
dist: xenial
addons:
chrome: stable
language: node_js
services:
- xvfb
cache:
yarn: true
node_js:
- "12"
cache:
- node_modules
cache: yarn
before_install:
- export START_TIME=$( date +%s )
- export COVERALLS_SERVICE_JOB_ID=$( TRAVIS_JOB_ID )
- export COVERALLS_SERVICE_NAME="CKEditor5 code coverage"
- npm i -g yarn
install:
- yarn install
# The "./manual/all-features-dll.js" test requires building DLL.
- yarn run dll:build
script:
- node ./scripts/continuous-integration-script.js
- yarn run lint
- yarn run stylelint
- ./scripts/check-manual-tests.sh -r ckeditor5 -f ckeditor5
- yarn run docs --strict
- 'if [ $TRAVIS_TEST_RESULT -eq 0 ]; then
travis_wait 30 yarn run docs:build-and-publish-nightly;
fi'
- ./scripts/ci/travis-check.js
# "travis_wait" does not work in child processes. Hence, it must be called from the configuration file.
- if [[ $TRAVIS_JOB_TYPE == "Validation" && $TRAVIS_TEST_RESULT -eq 0 ]]; then travis_wait 30 yarn run docs:build-and-publish-nightly; fi
after_script:
- export END_TIME=$( date +%s )
- ckeditor5-dev-tests-notify-travis-status
env:
global:
- secure: RO140EQDHmEOPJPikk8eCY5IdHpnEKGm41p5U1ewAbeZv1DpCG+rSumR2JdYl75kFAaZvCSm1NuVMM+kmYd+/z+LQbKj7QH5G/UHNho3H89blIU6WlJhT0YR5vclm9rvnEvOtxnfODca1Qrw+CaCoJks2o4VYbJB7mOBVNsh7Bc=
jobs:
- TRAVIS_JOB_TYPE=Tests
- TRAVIS_JOB_TYPE=Validation
142 changes: 141 additions & 1 deletion CHANGELOG.md

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,18 @@ See CKEditor 5 release blog posts [on the CKEditor blog](https://ckeditor.com/bl
</td>
</tr>

<tr>
<td>
<a href="https://github.com/ckeditor/ckeditor5/tree/master/packages/ckeditor5-language"><code>@ckeditor/ckeditor5-language</code></a>
</td>
<td>
<a href="https://www.npmjs.com/package/@ckeditor/ckeditor5-language"><img src="https://img.shields.io/npm/v/@ckeditor/ckeditor5-language.svg" alt="@ckeditor/ckeditor5-language npm package badge"></a>
</td>
<td>
The text part language feature.
</td>
</tr>

<tr>
<td>
<a href="https://github.com/ckeditor/ckeditor5/tree/master/packages/ckeditor5-link"><code>@ckeditor/ckeditor5-link</code></a>
Expand Down
5 changes: 3 additions & 2 deletions docs/_snippets/builds/frameworks/framework-integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@

/* globals document */

// Sometimes the request to `badge.fury.io` fails for unknown reason, so ignore it.
// Sometimes the request to external resources (like `badge.fury.io` or `emojics.com`) fails for unknown reasons,
// so ignore all navigation timeouts for framework integration docs.
const metaElement = document.createElement( 'meta' );

metaElement.name = 'x-cke-crawler-ignore-patterns';
metaElement.content = JSON.stringify( {
'request-failure': 'badge.fury.io'
'navigation-error': 'timeout'
} );

document.head.appendChild( metaElement );
7 changes: 5 additions & 2 deletions docs/_snippets/features/wproofreader.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<div id="snippet-wproofreader">
<p>Typos hapen. We striving to correct them. Hover on the marked words for instant correction suggestions or click the dialoge icon in the bottom right corner to have the whole text proofread at once.</p>
<p>You can also paste your own text here to have its spelling and grammar checked.</p>
<p>Warsaw is the capital adn largest city of Poland. The metropolis stands on the Vistula River in east-central Poland and its population is officially estimatd at 1.8 million residents within a greater metropolitan area of 3.1 million residents, which makes Warsaw the 7th most-populous capital city in the European Union. Warsaw is an alpha-global city, a major international tourist destination, and a significaant cultural, political, and economic hub. Its historical Old Town was designated a UNESCO World Heritage Site.</p>

<p>Warschau ist seit 1596 die Hauptstadt Polens und die fl&auml;chenm&auml;&szlig;ig gr&ouml;&szlig;te sowie mit &uuml;ber 1,75 Mio. Einwonern bev&ouml;lkerungsreichste Staddt des Landes. Als eines der wichtigsten Verkehrs-, Wirtschafts- und Handelszentren Mittel- und Osteeuropas genie&szlig;t Warschau gro&szlig;e politische und kulturelle Bedetung. In der Stadt befinden sich zahlreiche Institutionen, Universit&auml;ten, Theater, Museen und Baudenkm&auml;ler.</p>

<p>Варша́ва является столицей и крупнейшим по населению, и территории городом Польшй. Город стал фактической столицей в 1596 году, коггда после пожара в Вавельском замке в Кракове король Сигизмунд III перёнёс свою резиденцию суда, при этом столичный статус города был подтверждён только в Конституции 1791 года. Через город протекает река Висла, разделяющая город приблизительно поровну.</p>
</div>
2 changes: 1 addition & 1 deletion docs/_snippets/features/wproofreader.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ClassicEditor
plugins: [ ArticlePluginSet, EasyImage, ImageUpload, CloudServices, WProofreader ],
wproofreader: {
serviceId: '1:Eebp63-lWHbt2-ASpHy4-AYUpy2-fo3mk4-sKrza1-NsuXy4-I1XZC2-0u2F54-aqYWd1-l3Qf14-umd',
lang: 'en_AI',
lang: 'auto',
srcUrl: 'https://svc.webspellchecker.net/spellcheck31/wscbundle/wscbundle.js'
},
cloudServices: CS_CONFIG,
Expand Down
Binary file added docs/assets/img/spellcheck-dictionary.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
124 changes: 64 additions & 60 deletions docs/builds/guides/integration/content-styles.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Below there is a full list of content styles used by the editor features. You ca

```css
/*
* CKEditor 5 (v26.0.0) content styles.
* Generated on Wed, 03 Mar 2021 08:21:28 GMT.
* CKEditor 5 (v27.0.0) content styles.
* Generated on Wed, 24 Mar 2021 08:00:59 GMT.
* For more information, check out https://ckeditor.com/docs/ckeditor5/latest/builds/guides/integration/content-styles.html
*/

Expand Down Expand Up @@ -82,6 +82,33 @@ Below there is a full list of content styles used by the editor features. You ca
.ck-content .text-huge {
font-size: 1.8em;
}
/* ckeditor5-code-block/theme/codeblock.css */
.ck-content pre {
padding: 1em;
color: hsl(0, 0%, 20.8%);
background: hsla(0, 0%, 78%, 0.3);
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
text-align: left;
direction: ltr;
tab-size: 4;
white-space: pre-wrap;
font-style: normal;
min-width: 200px;
}
/* ckeditor5-code-block/theme/codeblock.css */
.ck-content pre code {
background: unset;
padding: 0;
border-radius: 0;
}
/* ckeditor5-horizontal-line/theme/horizontalline.css */
.ck-content hr {
margin: 15px 0;
height: 4px;
background: hsl(0, 0%, 87%);
border: 0;
}
/* ckeditor5-highlight/theme/highlight.css */
.ck-content .marker-yellow {
background-color: var(--ck-highlight-marker-yellow);
Expand All @@ -108,6 +135,38 @@ Below there is a full list of content styles used by the editor features. You ca
color: var(--ck-highlight-pen-green);
background-color: transparent;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-side {
float: right;
margin-left: var(--ck-image-style-spacing);
max-width: 50%;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-left {
float: left;
margin-right: var(--ck-image-style-spacing);
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-center {
margin-left: auto;
margin-right: auto;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-right {
float: right;
margin-left: var(--ck-image-style-spacing);
}
/* ckeditor5-image/theme/imagecaption.css */
.ck-content .image > figcaption {
display: table-caption;
caption-side: bottom;
word-break: break-word;
color: hsl(0, 0%, 20%);
background-color: hsl(0, 0%, 97%);
padding: .6em;
font-size: .75em;
outline-offset: -1px;
}
/* ckeditor5-image/theme/image.css */
.ck-content .image {
display: table;
Expand All @@ -122,17 +181,6 @@ Below there is a full list of content styles used by the editor features. You ca
max-width: 100%;
min-width: 50px;
}
/* ckeditor5-image/theme/imagecaption.css */
.ck-content .image > figcaption {
display: table-caption;
caption-side: bottom;
word-break: break-word;
color: hsl(0, 0%, 20%);
background-color: hsl(0, 0%, 97%);
padding: .6em;
font-size: .75em;
outline-offset: -1px;
}
/* ckeditor5-image/theme/imageresize.css */
.ck-content .image.image_resized {
max-width: 100%;
Expand All @@ -147,33 +195,9 @@ Below there is a full list of content styles used by the editor features. You ca
.ck-content .image.image_resized > figcaption {
display: block;
}
/* ckeditor5-horizontal-line/theme/horizontalline.css */
.ck-content hr {
margin: 15px 0;
height: 4px;
background: hsl(0, 0%, 87%);
border: 0;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-side {
float: right;
margin-left: var(--ck-image-style-spacing);
max-width: 50%;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-left {
float: left;
margin-right: var(--ck-image-style-spacing);
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-center {
margin-left: auto;
margin-right: auto;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-right {
float: right;
margin-left: var(--ck-image-style-spacing);
/* ckeditor5-language/theme/language.css */
.ck-content span[lang] {
font-style: italic;
}
/* ckeditor5-block-quote/theme/blockquote.css */
.ck-content blockquote {
Expand Down Expand Up @@ -345,26 +369,6 @@ Below there is a full list of content styles used by the editor features. You ca
min-width: 15em;
font-style: normal;
}
/* ckeditor5-code-block/theme/codeblock.css */
.ck-content pre {
padding: 1em;
color: hsl(0, 0%, 20.8%);
background: hsla(0, 0%, 78%, 0.3);
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
text-align: left;
direction: ltr;
tab-size: 4;
white-space: pre-wrap;
font-style: normal;
min-width: 200px;
}
/* ckeditor5-code-block/theme/codeblock.css */
.ck-content pre code {
background: unset;
padding: 0;
border-radius: 0;
}
/* ckeditor5-mention/theme/mention.css */
.ck-content .mention {
background: var(--ck-color-mention-background);
Expand Down
Loading

0 comments on commit 75d586c

Please sign in to comment.