From 85711ca66db8fed670a40a951475827a2d2ebf23 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 28 Apr 2017 12:03:20 +0200 Subject: [PATCH 1/3] Adjust Portal background mask --- js/src/ui/Portal/portal.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/ui/Portal/portal.css b/js/src/ui/Portal/portal.css index 37b129d82..3a53fbdca 100644 --- a/js/src/ui/Portal/portal.css +++ b/js/src/ui/Portal/portal.css @@ -34,7 +34,7 @@ $popoverRight: $modalMargin; $popoverTop: 20vh; $popoverZ: 3600; -$backgroundFade: rgba(255, 255, 255, 0.35); +$backgroundFade: rgba(0, 0, 0, 0.35); $backgroundOverlay: rgba(255, 255, 255, 0.95); .backOverlay { From 0745c019a37c837b4f90b1d56c1278d2b6face3d Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 28 Apr 2017 12:17:19 +0200 Subject: [PATCH 2/3] AccountCard uses Container --- js/src/ui/AccountCard/accountCard.css | 3 --- js/src/ui/AccountCard/accountCard.js | 5 +++-- js/src/ui/Container/container.js | 4 +++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/src/ui/AccountCard/accountCard.css b/js/src/ui/AccountCard/accountCard.css index e6cafe656..6fc5ca565 100644 --- a/js/src/ui/AccountCard/accountCard.css +++ b/js/src/ui/AccountCard/accountCard.css @@ -17,7 +17,6 @@ .account { align-items: stretch; - background-color: rgba(0, 0, 0, 0.8); display: flex; flex-direction: row; height: 100%; @@ -32,7 +31,6 @@ &:focus { transform: scale(0.99); - background-color: rgba(0, 0, 0, 0.6); } &:first-child { @@ -45,7 +43,6 @@ &:hover { cursor: pointer; - background-color: rgba(0, 0, 0, 0.4); } } diff --git a/js/src/ui/AccountCard/accountCard.js b/js/src/ui/AccountCard/accountCard.js index de7cc3d18..2040d3441 100644 --- a/js/src/ui/AccountCard/accountCard.js +++ b/js/src/ui/AccountCard/accountCard.js @@ -19,6 +19,7 @@ import ReactDOM from 'react-dom'; import keycode from 'keycode'; import Balance from '~/ui/Balance'; +import Container from '~/ui/Container'; import IdentityIcon from '~/ui/IdentityIcon'; import IdentityName from '~/ui/IdentityName'; import Tags from '~/ui/Tags'; @@ -60,7 +61,7 @@ export default class AccountCard extends Component { : {}; return ( -
+ ); } diff --git a/js/src/ui/Container/container.js b/js/src/ui/Container/container.js index 068cccadf..5b6dbdcf9 100644 --- a/js/src/ui/Container/container.js +++ b/js/src/ui/Container/container.js @@ -35,13 +35,14 @@ export default class Container extends Component { light: PropTypes.bool, link: PropTypes.string, onClick: PropTypes.func, + onFocus: PropTypes.func, style: PropTypes.object, tabIndex: PropTypes.number, title: nodeOrStringProptype() } render () { - const { children, className, compact, light, link, onClick, style, tabIndex } = this.props; + const { children, className, compact, light, link, onClick, onFocus, style, tabIndex } = this.props; const props = {}; if (Number.isInteger(tabIndex)) { @@ -56,6 +57,7 @@ export default class Container extends Component { : styles.padded } onClick={ onClick } + onFocus={ onFocus } > { this.renderTitle() } { children } From dddefa9a728317722c0663ba016e23e1c635fbe9 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 28 Apr 2017 12:43:44 +0200 Subject: [PATCH 3/3] panel background (develop) --- js/src/views/ContractDevelop/contractDevelop.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/views/ContractDevelop/contractDevelop.css b/js/src/views/ContractDevelop/contractDevelop.css index 01395e622..d471f4a81 100644 --- a/js/src/views/ContractDevelop/contractDevelop.css +++ b/js/src/views/ContractDevelop/contractDevelop.css @@ -14,6 +14,7 @@ /* You should have received a copy of the GNU General Public License /* along with Parity. If not, see . */ + .outer, .page, .editor { flex: 1; display: flex; @@ -108,7 +109,6 @@ overflow: auto; .panel { - background-color: rgba(0, 0, 0, 0.5); padding: 1em; flex: 1; display: flex;