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

Commit

Permalink
Merge branch 'master' into t/93
Browse files Browse the repository at this point in the history
  • Loading branch information
oleq committed May 18, 2017
2 parents 68f5579 + d36bbe7 commit 2daec4b
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 26 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
46 changes: 23 additions & 23 deletions tests/manual/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
7 changes: 7 additions & 0 deletions theme/components/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
9 changes: 9 additions & 0 deletions theme/components/dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 7 additions & 2 deletions theme/helpers/_states.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,16 @@ $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;
}

/**
Expand Down

0 comments on commit 2daec4b

Please sign in to comment.