diff --git a/nerfactory/viewer/app/package.json b/nerfactory/viewer/app/package.json index 4ac52a07f..784a5d504 100644 --- a/nerfactory/viewer/app/package.json +++ b/nerfactory/viewer/app/package.json @@ -6,6 +6,7 @@ "dependencies": { "@emotion/react": "^11.10.4", "@emotion/styled": "^11.10.4", + "@mui/icons-material": "^5.10.3", "@mui/material": "^5.10.3", "@reduxjs/toolkit": "^1.8.3", "@testing-library/jest-dom": "^5.16.4", diff --git a/nerfactory/viewer/app/src/index.scss b/nerfactory/viewer/app/src/index.scss index f000aee56..74acb2f9c 100644 --- a/nerfactory/viewer/app/src/index.scss +++ b/nerfactory/viewer/app/src/index.scss @@ -20,13 +20,13 @@ code { } $base-color1: #292d39; -$base-color2: #181c20; -$base-color3: #373c4b; +$base-color2: #222831; +$base-color3: #393e46; $accent-color1: #db5200; $accent-color2: #ff8600; -$accent-color3: #ffd65c; +$accent-color3: #ffd369; $highlight-color1: #606980; -$highlight-color2: #d1d4db; +$highlight-color2: #eeeeee; $highlight-color3: #ffffff; .banner { @@ -43,6 +43,12 @@ $highlight-color3: #ffffff; margin: 10px; float: left; } + + .banner-logo { + margin: 10px; + margin-right: 120px; + float: right; + } } .App-body { @@ -85,7 +91,7 @@ $custom-border: solid 1px $base-color1; } // Your variable overrides -$sidebar-color: #b71f0b !default; +$sidebar-color: $accent-color3 !default; $sidebar-width: 100% !default; @import '~react-pro-sidebar/dist/scss/styles.scss'; @@ -93,18 +99,16 @@ $sidebar-width: 100% !default; // Status Panel styling .StatusPanel { display: block; + background-color: $base-color1; // height: 170px; } -.StatusPanel-title { - margin: 5px; - text-align: center; - font-size: 1em; - font-weight: bold; +.StatusPanel .StatusPanel-button-group { + margin: 12px; } -.StatusPanel .StatusPanel-button { - margin: 20px; +.StatusPanel .StatusPanel-hide-scene-button { + margin: 12px; } .StatusPanel .WebSocketUrlField { @@ -114,14 +118,18 @@ $sidebar-width: 100% !default; } .StatusPanel-metrics { - background-color: $base-color1; + background-color: $base-color2; + margin: 5px; + padding: 10px; } .StatusPanel-metrics div { position: relative; - font-size: 16px; + font-size: 14px; display: block; text-align: left; + margin-top: 3px; + margin-left: 5px; } // ------------------------------------ diff --git a/nerfactory/viewer/app/src/modules/Banner/Banner.jsx b/nerfactory/viewer/app/src/modules/Banner/Banner.jsx index 17062fafb..84fa23b76 100644 --- a/nerfactory/viewer/app/src/modules/Banner/Banner.jsx +++ b/nerfactory/viewer/app/src/modules/Banner/Banner.jsx @@ -4,6 +4,8 @@ import { useDispatch } from 'react-redux'; import Button from '@mui/material/Button'; import Menu from '@mui/material/Menu'; import MenuItem from '@mui/material/MenuItem'; +import GitHubIcon from '@mui/icons-material/GitHub'; +import DescriptionRoundedIcon from '@mui/icons-material/DescriptionRounded'; import LandingModal from '../LandingModal'; function getParam(param_name) { @@ -77,6 +79,34 @@ export default function Banner() { + } + target="_blank" + href="https://github.com/plenoptix/nerfactory" + size="small" + > + Github + + } + target="_blank" + href="https://plenoptix-nerfactory.readthedocs-hosted.com/en/latest/" + size="small" + > + Documentation + + +
+ {text_2}
- Other Resources: - -