From ea28a7de3241259128d35aae2ebd5cedcf26c061 Mon Sep 17 00:00:00 2001 From: reyraa Date: Tue, 13 Feb 2018 18:15:35 +0100 Subject: [PATCH 1/5] Remove the unintended error message --- src/components/passphrase/confirm/confirm.css | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/passphrase/confirm/confirm.css b/src/components/passphrase/confirm/confirm.css index cc39f6fb7c..b081188f0b 100644 --- a/src/components/passphrase/confirm/confirm.css +++ b/src/components/passphrase/confirm/confirm.css @@ -53,6 +53,14 @@ & h2.done { max-width: 320px; } + + & h5 { + visibility: hidden; + opacity: 0; + font-size: 18px; + color: var(--color-error); + transition: all ease 500ms; + } } & .word { @@ -151,12 +159,6 @@ } & h5 { - visibility: hidden; - opacity: 0; - font-size: 18px; - color: var(--color-error); - transition: all ease 500ms; - &.visible { visibility: visible; opacity: 1; From c163e1de7e36183bb3faadd0952030d7cb0be58f Mon Sep 17 00:00:00 2001 From: reyraa Date: Wed, 14 Feb 2018 11:49:47 +0100 Subject: [PATCH 2/5] Fix the styling of checkbox with the list of FontIcons --- src/components/toolbox/checkbox/checkbox.css | 39 +++++++++++--------- src/components/toolbox/checkbox/index.js | 9 ++++- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/components/toolbox/checkbox/checkbox.css b/src/components/toolbox/checkbox/checkbox.css index 78b50266c2..7753bcdb46 100644 --- a/src/components/toolbox/checkbox/checkbox.css +++ b/src/components/toolbox/checkbox/checkbox.css @@ -24,9 +24,10 @@ & div { transition: all ease 300ms; width: calc(100% - calc(var(--element-height) / 2)); + height: 100%; position: relative; text-indent: calc(var(--element-height) / 3); - flex-flow: row wrap; + flex-flow: row nowrap; font-weight: bold; text-align: center; display: flex; @@ -42,28 +43,30 @@ width: 100%; } - &::after { - content: 'chevron_right chevron_right chevron_right chevron_right chevron_right chevron_right chevron_right'; - vertical-align: middle; - overflow: hidden; - letter-spacing: 8px; - text-indent: 20px; - font-size: 32px; - white-space: nowrap !important; - font-family: 'Material Icons'; - position: relative; - z-index: 0; - flex: 3 0px; - } - - & span { - text-indent: calc(var(--element-height) + 20px); + & > span { + text-indent: var(--element-height); flex: 0 auto; width: auto; font-size: var(--label-font-size); } - &:not(.hasArrows) { + & > span.arrows { + display: block; + text-indent: 0; + height: 100%; + overflow: hidden; + + & span { + padding-left: 15px; + font-size: 20px; + } + } + + & > span:not(.arrows) { + word-break: keep-all; + min-width: 200px; + z-index: 2; + &::after, &::before { display: none !important; diff --git a/src/components/toolbox/checkbox/index.js b/src/components/toolbox/checkbox/index.js index abeb2da1b5..5fac9a2d73 100644 --- a/src/components/toolbox/checkbox/index.js +++ b/src/components/toolbox/checkbox/index.js @@ -13,6 +13,7 @@ class SliderCheckbox extends React.Component { this.xOffset = 0; this.delta = 0; + this.arrows = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; } // eslint-disable-next-line class-methods-use-this @@ -129,8 +130,14 @@ class SliderCheckbox extends React.Component { { label ? -
+
{label} + { + hasSlidingArrows ? + + { this.arrows.map(key => ) } + : null + }
: '' } { From 5482e1bcd4419841ef447cc4ec7ca8cc950c4316 Mon Sep 17 00:00:00 2001 From: reyraa Date: Wed, 14 Feb 2018 11:50:41 +0100 Subject: [PATCH 3/5] Responsiveness fixings for checkbox --- src/components/passphrase/safekeeping/safekeeping.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/passphrase/safekeeping/safekeeping.css b/src/components/passphrase/safekeeping/safekeeping.css index 77209f1192..cf3229fbb8 100644 --- a/src/components/passphrase/safekeeping/safekeeping.css +++ b/src/components/passphrase/safekeeping/safekeeping.css @@ -292,7 +292,7 @@ width: 330px !important; top: calc(50vh - 48px); /* stylelint-disable-line */ - & div span { + & div > span:first-child { display: none; } } From b2abc8ec0e0c4d1bc08296ce48fb0a26de4f1398 Mon Sep 17 00:00:00 2001 From: reyraa Date: Wed, 14 Feb 2018 11:51:07 +0100 Subject: [PATCH 4/5] Fix a bug in calculating percentage --- src/components/passphrase/create/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/passphrase/create/index.js b/src/components/passphrase/create/index.js index cddcd6834b..58d6ca2c05 100644 --- a/src/components/passphrase/create/index.js +++ b/src/components/passphrase/create/index.js @@ -71,7 +71,9 @@ class Create extends React.Component { } componentDidUpdate() { - this.moveTitle(); + if (this.state.data) { + this.moveTitle(); + } } componentWillUnmount() { From c546fcf9956caf59332e71aa3bbe4e0d60fd76e2 Mon Sep 17 00:00:00 2001 From: reyraa Date: Wed, 14 Feb 2018 11:51:40 +0100 Subject: [PATCH 5/5] Fix a minor styling issue --- src/components/delegateList/delegateList.css | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/delegateList/delegateList.css b/src/components/delegateList/delegateList.css index 67ad7113af..79dc27b309 100644 --- a/src/components/delegateList/delegateList.css +++ b/src/components/delegateList/delegateList.css @@ -327,11 +327,6 @@ &:first-child { display: none !important; } - - &:nth-child(3) { - flex-basis: 58.3% !important; - max-width: 58.3% !important; - } } } @@ -432,6 +427,14 @@ & .filters .search { display: none; } + + & .delegatesList { + & .row li:nth-child(3), + & .tableHead li:nth-child(3) { + flex-basis: 58.3% !important; + max-width: 58.3% !important; + } + } } .search input {