Skip to content
This repository was archived by the owner on Jun 26, 2020. It is now read-only.

Commit 0705945

Browse files
committed
Fix: Missing marker-yellow CSS class definition in tests and docs.
1 parent 0112fd1 commit 0705945

File tree

7 files changed

+23
-15
lines changed

7 files changed

+23
-15
lines changed

docs/_snippets/features/build-highlight-source.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<style>
2-
.marker {
2+
.marker-yellow {
33
background-color: #fdfd77;
44
}
55

docs/_snippets/features/highlight-buttons.html

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<div id="snippet-highlight-buttons">
2-
<h2>Highlight feature sample.</h2>
3-
2+
<p>Highlight feature example.</p>
43
<p>
54
Here are some markers:
6-
<mark class="marker">yellow one</mark>, <mark class="marker-pink">pink one</mark> and <mark class="marker-green">green one</mark>.
75
</p>
6+
<ul>
7+
<li>the <mark class="marker-yellow">yellow</mark> one,</li>
8+
<li>the <mark class="marker-pink">pink</mark> one,</li>
9+
<li>the <mark class="marker-green">green</mark> one,</li>
10+
<li>the <mark class="marker-blue">blue</mark> one</li>
11+
</ul>
812
<p>
913
Here are some pens:
1014
<mark class="pen-red">red pen</mark> and <mark class="pen-green">green one</mark>.

docs/_snippets/features/highlight.html

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<div id="snippet-highlight">
2-
<h2>Highlight feature sample.</h2>
3-
2+
<p>Highlight feature example.</p>
43
<p>
54
Here are some markers:
6-
<mark class="marker">yellow one</mark>, <mark class="marker-pink">pink one</mark> and <mark class="marker-green">green one</mark>.
75
</p>
6+
<ul>
7+
<li>the <mark class="marker-yellow">yellow</mark> one,</li>
8+
<li>the <mark class="marker-pink">pink</mark> one,</li>
9+
<li>the <mark class="marker-green">green</mark> one,</li>
10+
<li>the <mark class="marker-blue">blue</mark> one</li>
11+
</ul>
812
<p>
913
Here are some pens:
1014
<mark class="pen-red">red pen</mark> and <mark class="pen-green">green one</mark>.

docs/features/highlight.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ The {@link module:highlight/highlight~Highlight} plugin registers:
106106
You can change the highlight of the current selection by executing the command with a desired value:
107107

108108
```js
109-
editor.execute( 'highlight', { value: 'marker' } );
109+
editor.execute( 'highlight', { value: 'yellowMarker' } );
110110
```
111111

112112
The `value` corresponds to the `model` property in configuration object. For the default configuration:

src/highlight.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export default class Highlight extends Plugin {
8787
* The available highlighters options. The default value is:
8888
*
8989
* options: [
90-
* { model: 'marker', class: 'marker', title: 'Marker', color: '#fdfd77', type: 'marker' },
90+
* { model: 'yellowMarker', class: 'marker-yellow', title: 'Yellow marker', color: '#fdfd77', type: 'marker' },
9191
* { model: 'greenMarker', class: 'marker-green', title: 'Green marker', color: '#63f963', type: 'marker' },
9292
* { model: 'pinkMarker', class: 'marker-pink', title: 'Pink marker', color: '#fc7999', type: 'marker' },
9393
* { model: 'blueMarker', class: 'marker-blue', title: 'Blue marker', color: '#72cdfd', type: 'marker' },

tests/manual/highlight-buttons.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<style>
2-
.marker {
2+
.marker-yellow {
33
background-color: #fdfd77;
44
}
55

@@ -32,7 +32,7 @@
3232
Here are some markers:
3333
</p>
3434
<ul>
35-
<li>the <mark class="marker">yellow</mark> one,</li>
35+
<li>the <mark class="marker-yellow">yellow</mark> one,</li>
3636
<li>the <mark class="marker-pink">pink</mark> one,</li>
3737
<li>the <mark class="marker-green">green</mark> one,</li>
3838
<li>the <mark class="marker-blue">blue</mark> one</li>
@@ -43,6 +43,6 @@
4343
</p>
4444
<figure class="image">
4545
<img src="sample.jpg" alt="CKEditor logo" />
46-
<figcaption>Some image with caption and <mark class="marker">highlighted text</mark>.</figcaption>
46+
<figcaption>Some image with caption and <mark class="marker-yellow">highlighted text</mark>.</figcaption>
4747
</figure>
4848
</div>

tests/manual/highlight.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<style>
2-
.marker {
2+
.marker-yellow {
33
background-color: #fdfd77;
44
}
55

@@ -32,7 +32,7 @@
3232
Here are some markers:
3333
</p>
3434
<ul>
35-
<li>the <mark class="marker">yellow</mark> one,</li>
35+
<li>the <mark class="marker-yellow">yellow</mark> one,</li>
3636
<li>the <mark class="marker-pink">pink</mark> one,</li>
3737
<li>the <mark class="marker-green">green</mark> one,</li>
3838
<li>the <mark class="marker-blue">blue</mark> one</li>
@@ -43,6 +43,6 @@
4343
</p>
4444
<figure class="image">
4545
<img src="sample.jpg" alt="CKEditor logo" />
46-
<figcaption>Some image with caption and <mark class="marker">highlighted text</mark>.</figcaption>
46+
<figcaption>Some image with caption and <mark class="marker-yellow">highlighted text</mark>.</figcaption>
4747
</figure>
4848
</div>

0 commit comments

Comments
 (0)