Kaynağa Gözat

Merge branch 'master' into t/ckeditor5/645

Aleksander Nowodzinski 8 yıl önce
ebeveyn
işleme
4b6b627ded

+ 1 - 1
packages/ckeditor5-theme-lark/.eslintrc.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

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

@@ -16,10 +16,10 @@
 	"@ckeditor/ckeditor5-engine": "^1.0.0-alpha.2",
 	"@ckeditor/ckeditor5-link": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-utils": "^1.0.0-alpha.2",
-    "eslint": "^4.8.0",
+    "eslint": "^4.15.0",
     "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",
-    "lint-staged": "^4.2.3"
+    "lint-staged": "^6.0.0"
   },
   "engines": {
     "node": ">=6.0.0",

+ 2 - 3
packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/editorui/editorui.css

@@ -32,14 +32,13 @@
 
 	/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/120 */
 	& > .ck-button,
-	& > * > .ck-button,
-	& .ck-dropdown__button {
+	& > * > .ck-button {
 		&:not(:hover):not(:focus):not(.ck-on),
 		&.ck-disabled {
 			background: transparent;
 		}
 
-		&.ck-on {
+		&.ck-on:not(.ck-button_with-text) {
 			@mixin ck-button-colors --ck-color-editor-toolbar-button-on;
 		}
 	}