Bladeren bron

Merge branch 'master' into t/ckeditor5-media-embed/35

Aleksander Nowodzinski 7 jaren geleden
bovenliggende
commit
c9b3db07e5

+ 3 - 0
packages/ckeditor5-theme-lark/.travis.yml

@@ -12,6 +12,9 @@ node_js:
 - '8'
 - '8'
 cache:
 cache:
 - node_modules
 - node_modules
+branches:
+   except:
+   - stable
 before_install:
 before_install:
 - export DISPLAY=:99.0
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
 - sh -e /etc/init.d/xvfb start

+ 16 - 0
packages/ckeditor5-theme-lark/CHANGELOG.md

@@ -1,6 +1,22 @@
 Changelog
 Changelog
 =========
 =========
 
 
+## [11.1.0](https://github.com/ckeditor/ckeditor5-theme-lark/compare/v11.0.0...v11.1.0) (2018-10-08)
+
+### Features
+
+* Added styles for error messages in the labeled inputs. See [ckeditor/ckeditor5-media-embed#1](https://github.com/ckeditor/ckeditor5-media-embed/issues/1). ([1b3ae62](https://github.com/ckeditor/ckeditor5-theme-lark/commit/1b3ae62))
+
+### Bug fixes
+
+* Buttons should override the `-webkit-appearance` property to work in the Bootstrap 4 environment. Closes [#189](https://github.com/ckeditor/ckeditor5-theme-lark/issues/189). ([a65dfbd](https://github.com/ckeditor/ckeditor5-theme-lark/commit/a65dfbd))
+* Removed the initial transform property of the text input with an error to allow the shake animation in Safari. Closes [ckeditor/ckeditor5-ui#443](https://github.com/ckeditor/ckeditor5-ui/issues/443). ([01491bc](https://github.com/ckeditor/ckeditor5-theme-lark/commit/01491bc))
+
+### Other changes
+
+* Added a subtle shake animation to the .ck-input-text when it gets an error. Closes [#198](https://github.com/ckeditor/ckeditor5-theme-lark/issues/198). ([f84102b](https://github.com/ckeditor/ckeditor5-theme-lark/commit/f84102b))
+
+
 ## [11.0.0](https://github.com/ckeditor/ckeditor5-theme-lark/compare/v10.1.0...v11.0.0) (2018-07-18)
 ## [11.0.0](https://github.com/ckeditor/ckeditor5-theme-lark/compare/v10.1.0...v11.0.0) (2018-07-18)
 
 
 ### Features
 ### Features

+ 1 - 1
packages/ckeditor5-theme-lark/CONTRIBUTING.md

@@ -1,4 +1,4 @@
 Contributing
 Contributing
 ========================================
 ========================================
 
 
-Information about contributing can be found at the following page: <https://github.com/ckeditor/ckeditor5/blob/master/CONTRIBUTING.md>.
+See the [official contributors' guide to CKEditor 5](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html) to learn more.

+ 19 - 19
packages/ckeditor5-theme-lark/package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "@ckeditor/ckeditor5-theme-lark",
   "name": "@ckeditor/ckeditor5-theme-lark",
-  "version": "11.0.0",
+  "version": "11.1.0",
   "description": "A bright theme for CKEditor 5.",
   "description": "A bright theme for CKEditor 5.",
   "keywords": [
   "keywords": [
     "ckeditor",
     "ckeditor",
@@ -9,26 +9,26 @@
     "ckeditor5-theme"
     "ckeditor5-theme"
   ],
   ],
   "dependencies": {
   "dependencies": {
-    "@ckeditor/ckeditor5-ui": "^11.0.0"
+    "@ckeditor/ckeditor5-ui": "^11.1.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
-    "@ckeditor/ckeditor5-alignment": "^10.0.2",
-    "@ckeditor/ckeditor5-basic-styles": "^10.0.2",
-    "@ckeditor/ckeditor5-cloud-services": "^10.0.2",
-    "@ckeditor/ckeditor5-core": "^11.0.0",
-    "@ckeditor/ckeditor5-editor-balloon": "^11.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^11.0.0",
-    "@ckeditor/ckeditor5-easy-image": "^10.0.2",
-    "@ckeditor/ckeditor5-font": "^10.0.2",
-    "@ckeditor/ckeditor5-heading": "^10.0.2",
-    "@ckeditor/ckeditor5-highlight": "^10.0.2",
-    "@ckeditor/ckeditor5-link": "^10.0.3",
-    "@ckeditor/ckeditor5-list": "^11.0.1",
-    "@ckeditor/ckeditor5-media-embed": "^0.0.1",
-    "@ckeditor/ckeditor5-paragraph": "^10.0.2",
-    "@ckeditor/ckeditor5-undo": "^10.0.2",
-    "@ckeditor/ckeditor5-utils": "^10.2.0",
-    "@ckeditor/ckeditor5-table": "^10.1.0",
+    "@ckeditor/ckeditor5-alignment": "^10.0.3",
+    "@ckeditor/ckeditor5-basic-styles": "^10.0.3",
+    "@ckeditor/ckeditor5-cloud-services": "^10.1.0",
+    "@ckeditor/ckeditor5-core": "^11.0.1",
+    "@ckeditor/ckeditor5-editor-balloon": "^11.0.1",
+    "@ckeditor/ckeditor5-editor-classic": "^11.0.1",
+    "@ckeditor/ckeditor5-easy-image": "^10.0.3",
+    "@ckeditor/ckeditor5-font": "^10.0.3",
+    "@ckeditor/ckeditor5-heading": "^10.1.0",
+    "@ckeditor/ckeditor5-highlight": "^10.0.3",
+    "@ckeditor/ckeditor5-link": "^10.0.4",
+    "@ckeditor/ckeditor5-list": "^11.0.2",
+    "@ckeditor/ckeditor5-media-embed": "^10.0.0",
+    "@ckeditor/ckeditor5-paragraph": "^10.0.3",
+    "@ckeditor/ckeditor5-undo": "^10.0.3",
+    "@ckeditor/ckeditor5-utils": "^11.0.0",
+    "@ckeditor/ckeditor5-table": "^11.0.0",
     "eslint": "^5.5.0",
     "eslint": "^5.5.0",
     "eslint-config-ckeditor5": "^1.0.7",
     "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",
     "husky": "^0.14.3",

+ 30 - 0
packages/ckeditor5-theme-lark/theme/ckeditor5-image/textalternativeform.css

@@ -3,6 +3,8 @@
  * For licensing, see LICENSE.md.
  * For licensing, see LICENSE.md.
  */
  */
 
 
+@import "../mixins/_rwd.css";
+
 .ck.ck-text-alternative-form {
 .ck.ck-text-alternative-form {
 	padding: var(--ck-spacing-standard);
 	padding: var(--ck-spacing-standard);
 
 
@@ -14,4 +16,32 @@
 	& > :not(:first-child) {
 	& > :not(:first-child) {
 		margin-left: var(--ck-spacing-standard);
 		margin-left: var(--ck-spacing-standard);
 	}
 	}
+
+	@mixin ck-media-phone {
+		padding: 0;
+		width: calc(.8 * var(--ck-input-text-width));
+
+		& .ck-labeled-input {
+			margin: var(--ck-spacing-standard) var(--ck-spacing-standard) 0;
+
+			& .ck-input-text {
+				min-width: 0;
+				width: 100%;
+			}
+		}
+
+		& .ck-button {
+			padding: var(--ck-spacing-standard);
+			margin-top: var(--ck-spacing-standard);
+			margin-left: 0;
+
+			border-radius: 0;
+			border: 0;
+			border-top: 1px solid var(--ck-color-base-border);
+
+			&:first-of-type {
+				border-right: 1px solid var(--ck-color-base-border);
+			}
+		}
+	}
 }
 }

+ 30 - 1
packages/ckeditor5-theme-lark/theme/ckeditor5-link/linkactions.css

@@ -7,6 +7,7 @@
 @import "@ckeditor/ckeditor5-ui/theme/mixins/_unselectable.css";
 @import "@ckeditor/ckeditor5-ui/theme/mixins/_unselectable.css";
 @import "../mixins/_focus.css";
 @import "../mixins/_focus.css";
 @import "../mixins/_shadow.css";
 @import "../mixins/_shadow.css";
+@import "../mixins/_rwd.css";
 
 
 .ck.ck-link-actions {
 .ck.ck-link-actions {
 	padding: var(--ck-spacing-standard);
 	padding: var(--ck-spacing-standard);
@@ -55,7 +56,35 @@
 		outline: none;
 		outline: none;
 	}
 	}
 
 
-	& > :not(:first-child) {
+	& .ck-button:not(.ck-link-actions__preview) {
 		margin-left: var(--ck-spacing-standard);
 		margin-left: var(--ck-spacing-standard);
 	}
 	}
+
+	@mixin ck-media-phone {
+		padding: 0;
+		width: calc(.8 * var(--ck-input-text-width));
+
+		& .ck-button.ck-link-actions__preview {
+			margin: var(--ck-spacing-standard) var(--ck-spacing-standard) 0;
+
+			& .ck-button__label {
+				min-width: 0;
+				max-width: 100%;
+			}
+		}
+
+		& .ck-button:not(.ck-link-actions__preview) {
+			padding: var(--ck-spacing-standard);
+			margin-top: var(--ck-spacing-standard);
+			margin-left: 0;
+
+			border-radius: 0;
+			border: 0;
+			border-top: 1px solid var(--ck-color-base-border);
+
+			&:first-of-type {
+				border-right: 1px solid var(--ck-color-base-border);
+			}
+		}
+	}
 }
 }

+ 31 - 0
packages/ckeditor5-theme-lark/theme/ckeditor5-link/linkform.css

@@ -3,6 +3,8 @@
  * For licensing, see LICENSE.md.
  * For licensing, see LICENSE.md.
  */
  */
 
 
+@import "../mixins/_rwd.css";
+
 .ck.ck-link-form {
 .ck.ck-link-form {
 	padding: var(--ck-spacing-standard);
 	padding: var(--ck-spacing-standard);
 
 
@@ -14,4 +16,33 @@
 	& > :not(:first-child) {
 	& > :not(:first-child) {
 		margin-left: var(--ck-spacing-standard);
 		margin-left: var(--ck-spacing-standard);
 	}
 	}
+
+	@mixin ck-media-phone {
+		padding: 0;
+		width: calc(.8 * var(--ck-input-text-width));
+
+		& .ck-labeled-input {
+			margin: var(--ck-spacing-standard) var(--ck-spacing-standard) 0;
+
+			& .ck-input-text {
+				min-width: 0;
+				width: 100%;
+			}
+		}
+
+		& .ck-button {
+			padding: var(--ck-spacing-standard);
+			margin-top: var(--ck-spacing-standard);
+			margin-left: 0;
+
+			border-radius: 0;
+			border: 0;
+			border-top: 1px solid var(--ck-color-base-border);
+
+			&:first-of-type {
+				border-right: 1px solid var(--ck-color-base-border);
+			}
+		}
+	}
 }
 }
+

+ 35 - 0
packages/ckeditor5-theme-lark/theme/ckeditor5-media-embed/mediaform.css

@@ -3,6 +3,8 @@
  * For licensing, see LICENSE.md.
  * For licensing, see LICENSE.md.
  */
  */
 
 
+@import "../mixins/_rwd.css";
+
 .ck.ck-media-form {
 .ck.ck-media-form {
 	padding: var(--ck-spacing-standard);
 	padding: var(--ck-spacing-standard);
 
 
@@ -13,4 +15,37 @@
 	& > :not(:first-child) {
 	& > :not(:first-child) {
 		margin-left: var(--ck-spacing-standard);
 		margin-left: var(--ck-spacing-standard);
 	}
 	}
+
+	@mixin ck-media-phone {
+		padding: 0;
+		width: calc(.8 * var(--ck-input-text-width));
+
+		& .ck-labeled-input {
+			margin: var(--ck-spacing-standard) var(--ck-spacing-standard) 0;
+
+			& .ck-input-text {
+				min-width: 0;
+				width: 100%;
+			}
+
+			/* Let the long error messages wrap in the narrow form. */
+			& .ck-labeled-input__error {
+				white-space: normal;
+			}
+		}
+
+		& .ck-button {
+			padding: var(--ck-spacing-standard);
+			margin-top: var(--ck-spacing-standard);
+			margin-left: 0;
+
+			border-radius: 0;
+			border: 0;
+			border-top: 1px solid var(--ck-color-base-border);
+
+			&:first-of-type {
+				border-right: 1px solid var(--ck-color-base-border);
+			}
+		}
+	}
 }
 }

+ 10 - 0
packages/ckeditor5-theme-lark/theme/mixins/_rwd.css

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+@define-mixin ck-media-phone {
+	@media screen and (max-width: 600px) {
+		@mixin-content;
+	}
+}