From e8a978cb4caa2ee7e68de4e40c4da430270b43ce Mon Sep 17 00:00:00 2001 From: Rahul Gupta Date: Wed, 30 Oct 2024 15:23:27 -0700 Subject: [PATCH 1/6] logo image change --- .../components/Logo/Logo.component.jsx | 7 +++-- .../components/components/Logo/logos.jsx | 31 ------------------- src/editor/viewer-styles.css | 5 --- src/viewer-styles.css | 5 --- 4 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 src/editor/components/components/Logo/logos.jsx diff --git a/src/editor/components/components/Logo/Logo.component.jsx b/src/editor/components/components/Logo/Logo.component.jsx index 41a97592c..98fcd7faf 100644 --- a/src/editor/components/components/Logo/Logo.component.jsx +++ b/src/editor/components/components/Logo/Logo.component.jsx @@ -1,5 +1,3 @@ -import { EditorLogo, ViewerLogo } from './logos.jsx'; - import { Button } from '../Button'; import PropTypes from 'prop-types'; import styles from './Logo.module.scss'; @@ -13,7 +11,10 @@ import styles from './Logo.module.scss'; const Logo = ({ onToggleEdit, isEditor }) => (
- {isEditor ? : } + {/* + + */} + 3DStreet Logo
diff --git a/src/editor/components/components/Logo/Logo.component.jsx b/src/editor/components/components/Logo/Logo.component.jsx index 98fcd7faf..fbec03dc5 100644 --- a/src/editor/components/components/Logo/Logo.component.jsx +++ b/src/editor/components/components/Logo/Logo.component.jsx @@ -16,7 +16,7 @@ const Logo = ({ onToggleEdit, isEditor }) => ( */} 3DStreet Logo - diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js index 04e79f1a5..b8409c998 100644 --- a/src/editor/components/scenegraph/Toolbar.js +++ b/src/editor/components/scenegraph/Toolbar.js @@ -309,6 +309,7 @@ export default class Toolbar extends Component { leadingIcon={} onClick={this.newHandler} disabled={this.state.isSavingScene} + variant="toolbtn" >
New
@@ -319,6 +320,7 @@ export default class Toolbar extends Component { leadingIcon={} onClick={this.toggleSaveActionState.bind(this)} disabled={this.state.isSavingScene} + variant="toolbtn" >
Save
@@ -348,6 +350,7 @@ export default class Toolbar extends Component { leadingIcon={} onClick={this.handleUnsignedSaveClick} disabled={this.state.isSavingScene} + variant="toolbtn" >
Save
@@ -356,6 +359,7 @@ export default class Toolbar extends Component { @@ -366,6 +370,7 @@ export default class Toolbar extends Component { this.makeScreenshot(); Events.emit('openscreenshotmodal'); }} + variant="toolbtn" >
Share
From 94af004209ce3721795ed3a3eca2fc70e8bab47c Mon Sep 17 00:00:00 2001 From: Kieran Farr Date: Fri, 1 Nov 2024 21:30:52 -0700 Subject: [PATCH 3/6] remove unused inline svg --- src/editor/components/components/Logo/Logo.component.jsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/editor/components/components/Logo/Logo.component.jsx b/src/editor/components/components/Logo/Logo.component.jsx index fbec03dc5..9584d0785 100644 --- a/src/editor/components/components/Logo/Logo.component.jsx +++ b/src/editor/components/components/Logo/Logo.component.jsx @@ -11,10 +11,7 @@ import styles from './Logo.module.scss'; const Logo = ({ onToggleEdit, isEditor }) => (
- {/* - - */} - 3DStreet Logo + 3DStreet Logo
diff --git a/ui_assets/3DSt-stacked-icon.png b/ui_assets/3DSt-stacked-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..27e3ac7b41b2d0f7efd3ea60dc8f4c9425add4e9 GIT binary patch literal 6607 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 literal 0 HcmV?d00001 From 35e2cda428aa874085facbc0de408ba7e255dc2d Mon Sep 17 00:00:00 2001 From: Kieran Farr Date: Fri, 1 Nov 2024 21:31:26 -0700 Subject: [PATCH 5/6] fix styling --- .../components/components/Logo/Logo.module.scss | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/editor/components/components/Logo/Logo.module.scss b/src/editor/components/components/Logo/Logo.module.scss index 58fde3bd8..83d4d52f2 100644 --- a/src/editor/components/components/Logo/Logo.module.scss +++ b/src/editor/components/components/Logo/Logo.module.scss @@ -12,15 +12,17 @@ column-gap: 1.5rem; } +.logo { + img { + width: 48px; + height: 48px; + object-fit: contain; + } +} @media screen and (max-width: 1268px) { .wrapper { - column-gap: 0rem; - flex-direction: column; + column-gap: 1.5rem; row-gap: 12px; left: 20px; - top: 24px; - .btn { - width: 100%; - } } } From b02a896da33016c9affaf60b49853a77bfd268e6 Mon Sep 17 00:00:00 2001 From: Kieran Farr Date: Fri, 1 Nov 2024 21:43:44 -0700 Subject: [PATCH 6/6] 128x128 logo size --- index.html | 2 +- .../components/Logo/Logo.component.jsx | 2 +- ui_assets/3D-St-stacked-128.png | Bin 0 -> 4935 bytes ui_assets/3DSt-stacked-icon.png | Bin 6607 -> 0 bytes 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 ui_assets/3D-St-stacked-128.png delete mode 100644 ui_assets/3DSt-stacked-icon.png diff --git a/index.html b/index.html index 6f30ddd41..9d4791808 100644 --- a/index.html +++ b/index.html @@ -51,7 +51,7 @@
diff --git a/src/editor/components/components/Logo/Logo.component.jsx b/src/editor/components/components/Logo/Logo.component.jsx index 9584d0785..f542159be 100644 --- a/src/editor/components/components/Logo/Logo.component.jsx +++ b/src/editor/components/components/Logo/Logo.component.jsx @@ -11,7 +11,7 @@ import styles from './Logo.module.scss'; const Logo = ({ onToggleEdit, isEditor }) => (
- 3DStreet Logo + 3DStreet Logo