8
0
Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master' into i/1110

Marek Lewandowski 6 gadi atpakaļ
vecāks
revīzija
3bd76e43c3
7 mainītis faili ar 1181 papildinājumiem un 523 dzēšanām
  1. 3 0
      .stylelintrc
  2. 12 0
      README.md
  3. 40 40
      docs/assets/snippet-styles.css
  4. 1 0
      mrgit.json
  5. 8 1
      package.json
  6. 5 0
      scripts/switch-to-dev-dev.sh
  7. 1112 482
      yarn.lock

+ 3 - 0
.stylelintrc

@@ -0,0 +1,3 @@
+{
+	"extends": "stylelint-config-ckeditor5"
+}

+ 12 - 0
README.md

@@ -659,6 +659,18 @@ See CKEditor 5 release blog posts [on the CKEditor blog](https://ckeditor.com/bl
 
 <tr>
 	<td>
+		<a href="https://github.com/ckeditor/ckeditor5-restricted-editing"><code>@ckeditor/ckeditor5-restricted-editing</code></a>
+	</td>
+	<td>
+		<a href="https://www.npmjs.com/package/@ckeditor/ckeditor5-restricted-editing"><img src="https://img.shields.io/npm/v/@ckeditor/ckeditor5-restricted-editing.svg" alt="@ckeditor/ckeditor5-restricted-editing npm package badge"></a>
+	</td>
+	<td>
+		The restricted editing feature.
+	</td>
+</tr>
+
+<tr>
+	<td>
 		<a href="https://github.com/ckeditor/ckeditor5-special-characters"><code>@ckeditor/ckeditor5-special-characters</code></a>
 	</td>
 	<td>

+ 40 - 40
docs/assets/snippet-styles.css

@@ -69,6 +69,46 @@ It breaks CKEditor 5 (see how <p><code>[]</code></p> looks). */
 	margin-left: 0;
 }
 
+.demo-row {
+	width: 100%;
+	display: -ms-flexbox;
+	display: flex;
+}
+
+.demo-row__half {
+	width: 50%;
+}
+
+.demo-row__half:first-of-type {
+	padding-right: .5rem;
+}
+
+.demo-row__half:last-of-type {
+	padding-left: .5rem;
+}
+
+.demo-row__third {
+	width: 33.3333%;
+}
+
+.demo-row__third > div {
+	padding: 2.5rem;
+	border: 1px solid rgba(0, 0, 0, 0.15);
+}
+
+.demo-row__third:nth-of-type(2) {
+	padding-left: 1rem;
+	padding-right: 1rem;
+}
+
+.demo-row h3 {
+	margin: 0;
+}
+
+.demo-row p {
+	margin-bottom: 0;
+}
+
 /* examples/builds/inline-editor.html */
 .live-snippet .image-style-left, .live-snippet .image-style-right {
 	float: left;
@@ -162,43 +202,3 @@ https://github.com/ckeditor/ckeditor5/issues/1545 */
 .live-snippet .document-editor {
 	margin: 1.5em 0;
 }
-
-.demo-row {
-	width: 100%;
-	display: -ms-flexbox;
-	display: flex;
-}
-
-.demo-row__half {
-	width: 50%;
-}
-
-.demo-row__half:first-of-type {
-	padding-right: .5rem;
-}
-
-.demo-row__half:last-of-type {
-	padding-left: .5rem;
-}
-
-.demo-row__third {
-	width: 33.3333%;
-}
-
-.demo-row__third > div {
-	padding: 2.5rem;
-	border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
-.demo-row__third:nth-of-type(2) {
-	padding-left: 1rem;
-	padding-right: 1rem;
-}
-
-.demo-row h3 {
-	margin: 0;
-}
-
-.demo-row p {
-	margin-bottom: 0;
-}

+ 1 - 0
mrgit.json

@@ -43,6 +43,7 @@
     "@ckeditor/ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph",
     "@ckeditor/ckeditor5-paste-from-office": "ckeditor/ckeditor5-paste-from-office",
     "@ckeditor/ckeditor5-remove-format": "ckeditor/ckeditor5-remove-format",
+    "@ckeditor/ckeditor5-restricted-editing": "ckeditor/ckeditor5-restricted-editing",
     "@ckeditor/ckeditor5-special-characters": "ckeditor/ckeditor5-special-characters#i/1110",
     "@ckeditor/ckeditor5-table": "ckeditor/ckeditor5-table",
     "@ckeditor/ckeditor5-theme-lark": "ckeditor/ckeditor5-theme-lark#i/1110",

+ 8 - 1
package.json

@@ -61,6 +61,7 @@
     "@ckeditor/ckeditor5-paragraph": "^15.0.0",
     "@ckeditor/ckeditor5-paste-from-office": "^15.0.0",
     "@ckeditor/ckeditor5-remove-format": "^15.0.0",
+    "@ckeditor/ckeditor5-restricted-editing": "^0.0.1",
     "@ckeditor/ckeditor5-special-characters": "^0.0.1",
     "@ckeditor/ckeditor5-table": "^15.0.0",
     "@ckeditor/ckeditor5-theme-lark": "^15.0.0",
@@ -101,9 +102,11 @@
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
     "style-loader": "^1.0.0",
+    "stylelint": "^11.1.1",
+    "stylelint-config-ckeditor5": "^1.0.0",
     "svgo": "^1.1.0",
     "uglifyjs-webpack-plugin": "^1.3.0",
-    "umberto": "^1.0.0",
+    "umberto": "^1.2.0",
     "webpack": "^4.39.1"
   },
   "engines": {
@@ -120,6 +123,7 @@
   },
   "scripts": {
     "lint": "eslint --quiet '**/*.js'",
+    "stylelint": "stylelint --quiet --allow-empty-input 'packages/**/*.css' 'docs/**/*.css'",
     "test": "node --max_old_space_size=4096 node_modules/@ckeditor/ckeditor5-dev-tests/bin/test.js",
     "manual": "node --max_old_space_size=4096 node_modules/@ckeditor/ckeditor5-dev-tests/bin/test-manual.js",
     "bootstrap": "mrgit sync && yarn install",
@@ -144,6 +148,9 @@
   "lint-staged": {
     "**/*.js": [
       "eslint --quiet"
+    ],
+    "**/*.css": [
+      "stylelint --quiet --allow-empty-input"
     ]
   },
   "eslintIgnore": [

+ 5 - 0
scripts/switch-to-dev-dev.sh

@@ -38,6 +38,11 @@ echo "Linking eslint-config-ckeditor5..."
 rm -rf node_modules/eslint-config-ckeditor5
 ln -s ../../ckeditor5-dev/packages/eslint-config-ckeditor5 node_modules/
 
+echo "Linking stylelint-config-ckeditor5..."
+
+rm -rf node_modules/stylelint-config-ckeditor5
+ln -s ../../ckeditor5-dev/packages/stylelint-config-ckeditor5 node_modules/
+
 echo "Linking jsdoc-plugins..."
 
 rm -rf node_modules/@ckeditor/jsdoc-plugins

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1112 - 482
yarn.lock