photowall/image-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P5-2309 Fix disabled buttons styling

Browse Source
This commit is contained in:
Anders Gustafsson
2018-03-23 10:48:43 +01:00
parent 1b9ad19ef6
commit ff9fae1e2a
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/image-editor.js
Vendored
+5 -5
View File
@@ -1671,6 +1671,8 @@ function TextButton(id, text, settings, isActive) {
_rect.setFill(_rectSettings[this.disabled ? 'disabledFill' : 'fill']);
_text.setFill(_textSettings[this.disabled ? 'disabledFill' : 'fill']);
this.hoverCursor = this.disabled ? config.textButton.disabledCursor : config.textButton.cursor;
};
if (_textSettings.text) {
@@ -1917,12 +1919,10 @@ module.exports = {
text: {
fill: '#ffffff',
activeFill: '#ffffff',
disabledFill: '#ffffff'
},
rect: {
fill: '#343434',
activeFill: '#494949',
disabledFill: '#999999'
},
},
@@ -1943,12 +1943,10 @@ module.exports = {
text: {
fill: '#ffffff',
activeFill: '#ffffff',
disabledFill: '#ffffff'
},
rect: {
fill: '#343434',
activeFill: '#494949',
disabledFill: '#999999'
},
}
@@ -2067,7 +2065,7 @@ module.exports = {
return {
fill: '#343434',
activeFill: '#494949',
disabledFill: '#999999',
disabledFill: '#494949',
originX: 'center',
originY: 'center',
width: width || 1,
@@ -2079,6 +2077,7 @@ module.exports = {
text: {
fill: '#ffffff',
disabledFill: '#999999',
fontFamily: 'breuer',
fontSize: 14,
originX: 'center',
@@ -2086,6 +2085,7 @@ module.exports = {
},
cursor: 'pointer',
disabledCursor: 'default',
padding: 20,
};
src/TextButton.js
+2
View File
@@ -111,6 +111,8 @@ function TextButton(id, text, settings, isActive) {
_rect.setFill(_rectSettings[this.disabled ? 'disabledFill' : 'fill']);
_text.setFill(_textSettings[this.disabled ? 'disabledFill' : 'fill']);
this.hoverCursor = this.disabled ? config.textButton.disabledCursor : config.textButton.cursor;
};
if (_textSettings.text) {
src/config/button-menu.js
-4
View File
@@ -7,12 +7,10 @@ module.exports = {
text: {
fill: '#ffffff',
activeFill: '#ffffff',
disabledFill: '#ffffff'
},
rect: {
fill: '#343434',
activeFill: '#494949',
disabledFill: '#999999'
},
},
@@ -33,12 +31,10 @@ module.exports = {
text: {
fill: '#ffffff',
activeFill: '#ffffff',
disabledFill: '#ffffff'
},
rect: {
fill: '#343434',
activeFill: '#494949',
disabledFill: '#999999'
},
}
src/config/text-button.js
+3 -1
View File
@@ -6,7 +6,7 @@ module.exports = {
return {
fill: '#343434',
activeFill: '#494949',
disabledFill: '#999999',
disabledFill: '#494949',
originX: 'center',
originY: 'center',
width: width || 1,
@@ -18,6 +18,7 @@ module.exports = {
text: {
fill: '#ffffff',
disabledFill: '#999999',
fontFamily: 'breuer',
fontSize: 14,
originX: 'center',
@@ -25,5 +26,6 @@ module.exports = {
},
cursor: 'pointer',
disabledCursor: 'default',
padding: 20,
};