Browse Source

Merge branch 'master' into t/93

Aleksander Nowodzinski 8 years ago
parent
commit
373c9797c3

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

@@ -11,7 +11,7 @@
     "@ckeditor/ckeditor5-dev-lint": "^3.0.0",
     "@ckeditor/ckeditor5-utils": "^0.9.1",
     "eslint-config-ckeditor5": "^1.0.0",
-    "gulp": "^3.9.0",
+    "gulp": "^3.9.1",
     "guppy-pre-commit": "^0.4.0"
   },
   "engines": {

+ 23 - 23
packages/ckeditor5-theme-lark/tests/manual/theme.js

@@ -24,29 +24,29 @@ import italicIcon from '@ckeditor/ckeditor5-basic-styles/theme/icons/italic.svg'
 import '../../theme/theme.scss';
 
 testUtils.createTestUIView( {
-	'iconPlain1':					'#icon-plain-1',
-	'iconPlain2':					'#icon-plain-2',
-	'iconColor1':					'#icon-color-1',
-	'iconColor2':					'#icon-color-2',
-
-	'buttonStates':					'#button-states',
-	'buttonTypes':					'#button-types',
-	'buttonIcon':					'#button-icon',
-	'buttonCustom':					'#button-custom',
-	'buttonIconCustom':				'#button-icon-custom',
-	'buttonIconStates':				'#button-icon-states',
-	'buttonResponsive1':			'#button-responsive-1',
-	'buttonResponsive2':			'#button-responsive-2',
-	'buttonResponsive3':			'#button-responsive-3',
-
-	dropdown:						'#dropdown',
-
-	'toolbarText':					'#toolbar-text',
-	'toolbarButton':				'#toolbar-button',
-	'toolbarRounded':				'#toolbar-rounded',
-	'toolbarWrap':					'#toolbar-wrap',
-	'toolbarSeparator':				'#toolbar-separator',
-	'toolbarMultiRow':				'#toolbar-multi-row'
+	'iconPlain1': '#icon-plain-1',
+	'iconPlain2': '#icon-plain-2',
+	'iconColor1': '#icon-color-1',
+	'iconColor2': '#icon-color-2',
+
+	'buttonStates': '#button-states',
+	'buttonTypes': '#button-types',
+	'buttonIcon': '#button-icon',
+	'buttonCustom': '#button-custom',
+	'buttonIconCustom': '#button-icon-custom',
+	'buttonIconStates': '#button-icon-states',
+	'buttonResponsive1': '#button-responsive-1',
+	'buttonResponsive2': '#button-responsive-2',
+	'buttonResponsive3': '#button-responsive-3',
+
+	dropdown: '#dropdown',
+
+	'toolbarText': '#toolbar-text',
+	'toolbarButton': '#toolbar-button',
+	'toolbarRounded': '#toolbar-rounded',
+	'toolbarWrap': '#toolbar-wrap',
+	'toolbarSeparator': '#toolbar-separator',
+	'toolbarMultiRow': '#toolbar-multi-row'
 } ).then( ui => {
 	renderIcon( ui );
 	renderButton( ui );

+ 7 - 0
packages/ckeditor5-theme-lark/theme/components/button.scss

@@ -66,6 +66,13 @@ a.ck-button {
 		float: left;
 	}
 
+	// https://github.com/ckeditor/ckeditor5-theme-lark/issues/70
+	&.ck-disabled {
+		@include ck-button-icon {
+			@include ck-disabled;
+		}
+	}
+
 	&.ck-button_with-text {
 		padding: ck-spacing( 'small' ) ck-spacing();
 

+ 9 - 0
packages/ckeditor5-theme-lark/theme/components/dropdown.scss

@@ -14,6 +14,15 @@
 		// A space to accommodate the triangle.
 		padding-right: 2 * ck-spacing();
 
+		// https://github.com/ckeditor/ckeditor5-theme-lark/issues/70
+		&.ck-disabled {
+			@include ck-button-colors( 'background', 10 );
+
+			.ck-button__label {
+				@include ck-disabled;
+			}
+		}
+
 		// #23
 		.ck-button__label {
 			width: 7em;

+ 7 - 2
packages/ckeditor5-theme-lark/theme/helpers/_states.scss

@@ -12,10 +12,15 @@ $ck-focus-outer-shadow: 0 0 3px 2px lighten( ck-color( 'focus' ), 10% );
 $ck-focus-ring: 1px solid ck-color( 'focus' );
 
 /**
+ * An opacity value of disabled UI item.
+ */
+$ck-disabled-opacity: .5;
+
+/**
  * A class which indicates that an element holding it is disabled.
  */
-.ck-disabled {
-	opacity: .5;
+@mixin ck-disabled {
+	opacity: $ck-disabled-opacity;
 }
 
 /**