Skip to content

Commit

Permalink
Merge pull request #166 from dls-controls/drawer-component
Browse files Browse the repository at this point in the history
Drawer component
  • Loading branch information
TimGuiteDiamond committed Apr 9, 2020
2 parents 95b2b68 + 237672a commit 8543da2
Show file tree
Hide file tree
Showing 11 changed files with 616 additions and 26 deletions.
269 changes: 269 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"private": true,
"dependencies": {
"@babel/plugin-proposal-optional-chaining": "^7.8.3",
"@material-ui/core": "^4.9.9",
"@types/base64-js": "^1.2.5",
"@types/enzyme-adapter-react-16": "^1.0.5",
"@types/jest": "24.0.15",
Expand Down
Binary file added public/img/Diamond_logo_col.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions public/json/app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"type": "display",
"position": "relative",
"height": "100%",
"width": "100%",
"children": [
{
"type": "dynamicpage",
"position": "relative",
"routePath": "app"
},
{
"type": "drawer",
"position": "absolute",
"x": "10px",
"y": "10px",
"height": "4rem",
"width": "5rem",
"font": {
"size": "20",
"style": "bold"
},
"foregroundColor": "#ffcf00",
"backgroundColor": "#012265",
"border": {
"style": "none",
"width": 0,
"color": ""
},
"children": [
{
"type": "embeddedDisplay",
"position": "relative",
"width": "100%",
"file": "drawer.json",
"filetype": "json",
"defaultProtocol": "pva"
}
]
}
]
}
Loading

0 comments on commit 8543da2

Please sign in to comment.