aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src/style
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-11-10 06:20:06 +0800
committerFabio Berger <me@fabioberger.com>2018-11-10 06:20:06 +0800
commit773cf3cd143769a93cea66b30d46cb9f4620b74d (patch)
tree549d12546b0076d5e69d1a4570ca7a42b628c5c1 /packages/instant/src/style
parent53d0f5b98ebd132d51b1fdf463fe57481c895ec4 (diff)
parentb4a11de097258d37fa9271e64fc28a1d012a8d26 (diff)
downloaddexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.gz
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.bz2
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.lz
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.xz
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.zst
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.zip
Merge branch 'development' into fixOrderValidation
* development: (25 commits) Publish Updated CHANGELOGS fix(instant): fix bug where we potentially fetch balance for the wrong account fix: Lock Ledger hw-transport to 4.24.0 fix: wrong prop names used chore: PR feedback fix: broken features because of merge fix: remove default props, fix lint problems chore: convert payment method to stateless component feat: add boxShadow on dropdown hover fix: various style issues fix: remove all:initial rule from all div based ui compoennts fix: token selector scrolling container height chore(instant): fix lint errors feat(instant): fetch balance at startup feat(instant): fetch account address at startup and drive account state changes chore: cleanup fix: restore button to previous state feat: implement copy-to-clipboard feat: add MetaMask sign, refactor Circle ...
Diffstat (limited to 'packages/instant/src/style')
-rw-r--r--packages/instant/src/style/theme.ts5
-rw-r--r--packages/instant/src/style/z_index.ts10
2 files changed, 11 insertions, 4 deletions
diff --git a/packages/instant/src/style/theme.ts b/packages/instant/src/style/theme.ts
index 8dada2d28..2653c38f7 100644
--- a/packages/instant/src/style/theme.ts
+++ b/packages/instant/src/style/theme.ts
@@ -15,6 +15,8 @@ export enum ColorOption {
white = 'white',
lightOrange = 'lightOrange',
darkOrange = 'darkOrange',
+ green = 'green',
+ red = 'red',
}
export const theme: Theme = {
@@ -28,9 +30,12 @@ export const theme: Theme = {
white: 'white',
lightOrange: '#F9F2ED',
darkOrange: '#F2994C',
+ green: '#3CB34F',
+ red: '#D00000',
};
export const transparentWhite = 'rgba(255,255,255,0.3)';
export const overlayBlack = 'rgba(0, 0, 0, 0.6)';
+export const completelyTransparent = 'rga(0, 0, 0, 0)';
export { styled, css, keyframes, withTheme, createGlobalStyle, ThemeProvider };
diff --git a/packages/instant/src/style/z_index.ts b/packages/instant/src/style/z_index.ts
index 03623f044..bd034182e 100644
--- a/packages/instant/src/style/z_index.ts
+++ b/packages/instant/src/style/z_index.ts
@@ -1,6 +1,8 @@
export const zIndex = {
- errorPopBehind: 1,
- mainContainer: 2,
- panel: 3,
- errorPopUp: 4,
+ errorPopBehind: 10,
+ mainContainer: 20,
+ dropdownItems: 30,
+ panel: 40,
+ errorPopup: 50,
+ overlayDefault: 100,
};