Skip to content

Fixes #190 panel title for multiple components #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2016
Merged

Fixes #190 panel title for multiple components #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fixes #190 panel title for multiple components
  • Loading branch information
@fernandojsg
fernandojsg committed Jul 11, 2016
commit 1842c6da35641123256bda38bef6e499a1e36e84
6 changes: 0 additions & 6 deletions example/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@
<img id="floorimg" src="assets/textures/grasslight-big.jpg">
<img id="floorimg2" src="assets/textures/grasslight-big.jpg">
</a-assets>
<!-- <a-entity id="soundcube" position="0 0 -10" rotation="45 30 0"
sound__1="autoplay: true; src: assets/sounds/321103__nsstudios__blip1.wav;"
sound__2="autoplay: true; src: assets/sounds/Laser-SoundBible.com-602495617.com-602495617.ogg;"
geometry="primitive: box; height: 8; width: 8; depth: 8;"
material="color: #167341; roughness: 1.0; metalness: 0.2;">
</a-entity>-->
<a-entity position="0 1 8">
<a-entity camera look-controls wasd-controls>
<a-entity visible="true" position="0 0 -2" geometry="primitive: ring; radiusOuter: 0.016; radiusInner: 0.01" material="color: #ff9; shader: flat; transparent: true; opacity: 0.5" scale="2 2 2" raycaster="">
Expand Down
2 changes: 1 addition & 1 deletion src/components/attributes/Component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default class Component extends React.Component {
return (
<Collapsible>
<div className='collapsible-header'>
<span>{componentName} <span className='subcomponent'>{subComponentName}</span></span>
<span title={subComponentName || componentName}>{subComponentName || componentName}</span>
<div className='dropdown menu'>
<div className='dropdown-content'>
<a href='#' onClick={this.deleteComponent}>Delete</a>
Expand Down
3 changes: 3 additions & 0 deletions src/css/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ div.vec3 {

.collapsible-header span {
float: left;
max-width: 180px;
overflow: hidden;
text-overflow: ellipsis;
text-transform: uppercase;
}

Expand Down