From 99602578165e51ce10cf4b5f352178c5faf09d50 Mon Sep 17 00:00:00 2001 From: Laurence Maultsby Date: Tue, 8 Nov 2016 10:35:34 -0500 Subject: [PATCH] RIFT-15038: SSH Keys styling fix for overlapping. Signed-off-by: Laurence Maultsby --- .../launchpad/src/ssh_keys/sshKeyCard.scss | 25 +++++++++++-------- .../launchpad/src/ssh_keys/sshKeys.jsx | 4 +-- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/skyquake/plugins/launchpad/src/ssh_keys/sshKeyCard.scss b/skyquake/plugins/launchpad/src/ssh_keys/sshKeyCard.scss index f72af71cb..cbb669157 100644 --- a/skyquake/plugins/launchpad/src/ssh_keys/sshKeyCard.scss +++ b/skyquake/plugins/launchpad/src/ssh_keys/sshKeyCard.scss @@ -1,5 +1,5 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,12 +17,20 @@ */ @import "style/_colors.scss"; +.sshKeyCards { + display:-ms-flexbox; + display:flex; + -ms-flex-direction:column; + flex-direction:column; +} + .sshKeyCard { display:-ms-flexbox; display:flex; -ms-flex-align: start; align-items: flex-start; - height:250px; + -ms-flex: 1 0 auto; + flex: 1 0 auto; border-top: 1px solid $neutral-white; &:nth-child(odd) { background:$gray-lighter; @@ -58,20 +66,15 @@ } &-key.sqTextInput { font-size:1rem; - -ms-flex-align: stretch; - -ms-grid-row-align: stretch; - align-items: stretch; - -ms-flex:1; - flex:1; + > textarea { padding:0.5rem; min-height:190px; } > .readonly { - -ms-flex: 1; - flex: 1; background: none !important; word-break: break-all; + height:auto; } } &-name { @@ -95,8 +98,8 @@ -ms-flex-align: center; -ms-grid-row-align: center; align-items: center; - height: 100%; - border-left: 1px solid $neutral-white; + -ms-flex-item-align: center; + align-self: center; >div { display:-ms-flexbox; display:flex; diff --git a/skyquake/plugins/launchpad/src/ssh_keys/sshKeys.jsx b/skyquake/plugins/launchpad/src/ssh_keys/sshKeys.jsx index 1676cff91..8f8945db5 100644 --- a/skyquake/plugins/launchpad/src/ssh_keys/sshKeys.jsx +++ b/skyquake/plugins/launchpad/src/ssh_keys/sshKeys.jsx @@ -1,5 +1,5 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -45,7 +45,7 @@ class SshKeys extends Component { let Store = self.Store; // return
test
return ( -
+
{ self.state.data && self.state.data.keys.map(function(k, i) { let sshKey = self.state.data.entities[k]; -- 2.25.1