Skip to content

Commit af673d0

Browse files
Mati365Mati365
committed
Merge remote-tracking branch 'origin' into ck/skip-block-filler-option
2 parents 5f486b7 + e8957d5 commit af673d0

File tree

186 files changed

+8858
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+8858
-214
lines changed

‎.circleci/template.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ parameters:
1414
default: false
1515

1616
commands:
17+
install_newest_emoji:
18+
steps:
19+
- run:
20+
name: Install the emoji font
21+
command: |
22+
sudo apt install fonts-noto-color-emoji
1723
halt_if_short_flow:
1824
steps:
1925
- run:

‎LICENSE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ The following libraries are included in CKEditor under the [MIT license](https:/
2121
* BlurHash - Copyright (c) 2018 Wolt Enterprises (MIT license).
2222
* color-convert - Copyright (c) 2011–2016 Heather Arthur <fayearthur@gmail.com>, copyright (c) 2016–2021 Josh Junon <josh@junon.me>.
2323
* color-parse - Copyright (c) 2015 Dmitry Ivanov.
24+
* emoji-picker-element-data - Copyright (c) 2020 Nolan Lawson.
25+
* Fuse.js - Copyright (c) 2017 Kirollos Risk.
2426
* Lodash - Copyright (c) JS Foundation and other contributors https://js.foundation/. Based on Underscore.js, copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors http://underscorejs.org/.
2527
* Marked - Copyright (c) 2018+, MarkedJS (https://github.com/markedjs/), copyright (c) 2011–2018, Christopher Jeffrey (https://github.com/chjj/).
2628
* Turndown - Copyright (c) 2017+ Dom Christie.

‎docs/_snippets/assets.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ window.attachTourBalloon = function( { target, text, editor, tippyOptions } ) {
8787
}
8888
} );
8989
}
90+
91+
return tooltip;
9092
};
9193

9294
/**

‎docs/_snippets/installation/plugins-mapping/plugins-mapping.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,14 +682,16 @@
682682
<p style="margin-left:0px;"><a href="https://ckeditor.com/cke4/addon/sourcearea">sourcearea</a></p>
683683
</td>
684684
<td>
685-
<p style="margin-left:0px;"><a href="https://ckeditor.com/docs/ckeditor5/latest/features/source-editing.html">Source editing</a></p>
685+
<p style="margin-left:0px;"><a href="https://ckeditor.com/docs/ckeditor5/latest/features/source-editing/source-editing.html">Source code editing</a></p>
686686
</td>
687687
</tr>
688688
<tr>
689689
<td>
690690
<p style="margin-left:0px;"><a href="https://ckeditor.com/cke4/addon/sourcedialog">sourcedialog</a></p>
691691
</td>
692-
<td>N/A</td>
692+
<td>
693+
<p style="margin-left:0px;"><a href="https://ckeditor.com/docs/ckeditor5/latest/features/source-editing/source-editing-enhanced.html">Enhanced source code editing</a></p>
694+
</td>
693695
</tr>
694696
<tr>
695697
<td>

‎docs/_snippets/updating/plugins-mapping/plugins-mapping.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,15 +774,15 @@
774774
<p style="margin-left:0px;"><a href="https://ckeditor.com/cke4/addon/sourcearea">sourcearea</a></p>
775775
</td>
776776
<td>
777-
<p style="margin-left:0px;"><a href="https://ckeditor.com/docs/ckeditor5/latest/features/source-editing.html">Source editing</a></p>
777+
<p style="margin-left:0px;"><a href="https://ckeditor.com/docs/ckeditor5/latest/features/source-editing/source-editing.html">Source code editing</a></p>
778778
</td>
779779
</tr>
780780
<tr>
781781
<td>
782782
<p style="margin-left:0px;"><a href="https://ckeditor.com/cke4/addon/sourcedialog">sourcedialog</a></p>
783783
</td>
784784
<td>
785-
<p>N/A</p>
785+
<p style="margin-left:0px;"><a href="https://ckeditor.com/docs/ckeditor5/latest/features/source-editing/source-editing-enhanced.html">Enhanced source code editing</a></p>
786786
</td>
787787
</tr>
788788
<tr>

‎docs/assets/snippet.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ window.getViewportTopOffsetConfig = function() {
129129
* **Note**: The tabs container requires a proper markup to work correctly.
130130
*
131131
* @param {HTMLElement} tabsContainer
132+
* @param {Function} onTabChange A callback executed when the tab is changed. It receives the index of the selected tab.
133+
* It also gets called after the tabs are created.
132134
*/
133-
window.createTabs = function( tabsContainer ) {
135+
window.createTabs = function( tabsContainer, onTabChange ) {
134136
const tabTextElements = Array.from( tabsContainer.querySelectorAll( '.tabs__list__tab-text' ) );
135137
const tabPanels = Array.from( tabsContainer.querySelectorAll( '.tabs__panel' ) );
136138

@@ -147,8 +149,20 @@ window.createTabs = function( tabsContainer ) {
147149
panel.classList.toggle( 'tabs__panel_selected', tabPanels.indexOf( panel ) === clickedIndex );
148150
} );
149151

152+
if ( onTabChange ) {
153+
onTabChange( clickedIndex );
154+
}
155+
150156
evt.preventDefault();
151157
} );
152158
} );
159+
160+
// Trigger the callback after the tabs are created.
161+
if ( onTabChange ) {
162+
const selectedTabTextElement = tabsContainer.querySelector( '.tabs__list__tab_selected .tabs__list__tab-text' ) ||
163+
tabsContainer.querySelector( '.tabs__list li:first-of-type .tabs__list__tab-text' );
164+
165+
onTabChange( tabTextElements.indexOf( selectedTabTextElement ) );
166+
}
153167
};
154168

‎docs/assets/styles.css‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ https://github.com/ckeditor/ckeditor5-build-decoupled-document/issues/12 */
7373
margin: 1.5em 0;
7474

7575
--tabs-active-background: hsl(0, 0%, 96%);
76-
--tabs-active-border: hsl(0, 0%, 80%);
76+
--tabs-active-border: hsl(231.35deg 89.21% 52.75%);
77+
--tabs-list-border-color: hsl(0deg 0% 91.37%);
7778
}
7879

7980
.tabs ul.tabs__list {
@@ -82,15 +83,15 @@ https://github.com/ckeditor/ckeditor5-build-decoupled-document/issues/12 */
8283
padding: 0;
8384
display: flex;
8485
flex-direction: row;
85-
justify-content: space-around;
86+
justify-content: flex-start;
87+
border-bottom: 1px solid var(--tabs-list-border-color);
8688
}
8789

8890
.tabs ul.tabs__list li {
8991
margin: 0;
9092
display: inline-block;
91-
flex-grow: 1;
9293
text-align: center;
93-
border-top: 3px solid transparent;
94+
border-bottom: 2px solid transparent;
9495
}
9596

9697
.tabs ul.tabs__list li a.tabs__list__tab-text {
@@ -99,22 +100,20 @@ https://github.com/ckeditor/ckeditor5-build-decoupled-document/issues/12 */
99100
display: flex;
100101
justify-content: center;
101102
align-items: center;
102-
padding: 8px;
103+
padding: 8px 16px;
103104
}
104105

105106
.tabs ul.tabs__list li.tabs__list__tab_selected {
106-
background: var(--tabs-active-background);
107-
border-top: 3px solid var(--tabs-active-border);
107+
border-bottom: 2px solid var(--tabs-active-border);
108108
}
109109

110110
.tabs ul.tabs__list li.tabs__list__tab_selected a.tabs__list__tab-text {
111-
font-weight: bold;
111+
color: var(--tabs-active-border);
112112
}
113113

114114
.tabs .tabs__panel {
115-
padding: 1.333em;
115+
padding: 1.333em 0;
116116
display: none;
117-
background: var(--tabs-active-background);
118117
}
119118

120119
.tabs .tabs__panel.tabs__panel_selected {

0 commit comments

Comments
 (0)