diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-12-24 22:11:36 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2017-12-24 22:11:36 +0100 |
| commit | df44b69c4655415fe1e44689ece443ec06ef0f52 (patch) | |
| tree | e677ed5f5328bb3b14bc976c7392d8e259f89034 /src/components/ui/Button.js | |
| parent | [wip] add icon upload (diff) | |
| parent | Merge pull request #494 from heavypackets/websecurity-enable-patch (diff) | |
| download | ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.tar.gz ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.tar.zst ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.zip | |
Merge branch 'develop' into feature/icon-upload
Diffstat (limited to 'src/components/ui/Button.js')
| -rw-r--r-- | src/components/ui/Button.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js index 07e94192f..554206cb7 100644 --- a/src/components/ui/Button.js +++ b/src/components/ui/Button.js | |||
| @@ -68,7 +68,7 @@ export default class Button extends Component { | |||
| 68 | loaded={loaded} | 68 | loaded={loaded} |
| 69 | lines={10} | 69 | lines={10} |
| 70 | scale={0.4} | 70 | scale={0.4} |
| 71 | color={buttonType === '' ? '#FFF' : '#373a3c'} | 71 | color={buttonType !== 'secondary' ? '#FFF' : '#373a3c'} |
| 72 | component="span" | 72 | component="span" |
| 73 | /> | 73 | /> |
| 74 | {label} | 74 | {label} |