Skip to content
This repository has been archived by the owner on Nov 20, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1 from criticalstack/cb/updates
Browse files Browse the repository at this point in the history
Namespace and create drawer fixes
  • Loading branch information
ktravis authored Nov 17, 2020
2 parents 6fb19fa + ddf0ac1 commit 9701708
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 30 deletions.
8 changes: 4 additions & 4 deletions client/css/section-editor.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ div.section-editor {

.cs-tabs div.section-editor {
position: absolute;
top: 134px;
bottom: 20px;
left: 20px;
right: 20px;
top: 0;
bottom: 0;
left: 0;
right: 0;
display: grid;
grid-template-columns: 340px 1fr;
grid-template-rows: minmax(55px, max-content);
Expand Down
5 changes: 5 additions & 0 deletions client/css/tabs.css
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,8 @@
padding: 20px;
background: #fff;
}

.create-drawer .cs-tabs .react-tabs__tab-panel--selected {
position: relative;
flex-grow: 1;
}
4 changes: 3 additions & 1 deletion client/lib/helpers/session.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ export default {
let result = data.context.result;
window.localStorage["cs-config"] = JSON.stringify(result);
window.localStorage["csos-user"] = JSON.stringify(result.user);
window.localStorage["csos-namespace"] = _.get(result.user, "defaultNamespace", "default");
if (!window.localStorage["csos-namespace"]) {
window.localStorage["csos-namespace"] = _.get(result.user, "defaultNamespace", "default");
}
h.Vent.emit("main-menu:update");
return callback(true);
},
Expand Down
10 changes: 7 additions & 3 deletions client/lib/layout/create/create-content.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,18 @@ class CreateContent extends React.Component {
style={{
border: 0,
padding: "20px",
height: "100%",
marginBottom: "60px"
flexGrow: "1",
marginBottom: "0",
display: "flex",
flexDirection: "column"
}}
>
<Tabs
className="cs-tabs"
style={{
height: "100%"
flexGrow: "1",
display: "flex",
flexDirection: "column"
}}
selectedIndex={this.state.index}
onSelect={(tab) => this.handleTabClick(tab)}
Expand Down
19 changes: 1 addition & 18 deletions client/lib/layout/create/create-drawer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,6 @@ import h from "../../helpers";
import CreateContent from "./create-content";

const useStyles = makeStyles(() => ({
root: {
display: "flex",
position: "fixed",
bottom: "10px",
right: "20px",
zIndex: 1000
},
drawer: {
width: "100%",
height: "100%",
flexShrink: 0,
},
drawerPaper: {
width: "100%",
height: "100%",
Expand All @@ -28,18 +16,13 @@ const useStyles = makeStyles(() => ({
display: "flex",
alignItems: "center",
justifyContent: "space-between",
paddingRight: "20px",
paddingBottom: "20px",
padding: "10px 7px 10px 20px",
backgroundColor: "#31383d"
},
drawerHeaderTitle: {
float: "left",
marginLeft: "19px",
display: "flex",
justifyContent: "center",
alignItems: "center",
fontSize: "40px",
marginBottom: "-10px",
color: "#fff"
},
drawerHeaderDefault: {
Expand Down
8 changes: 4 additions & 4 deletions client/lib/layout/create/wizards.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import resourceMetadata from "../../../shared/manifests/resource-metadata";
const useStyles = makeStyles(() => ({
root: {
position: "absolute",
top: "134px",
bottom: "20px",
left: "20px",
right: "20px"
top: "0",
bottom: "0",
left: "0",
right: "0"
},
content: {
padding: "40px",
Expand Down

0 comments on commit 9701708

Please sign in to comment.