add customizeable colors to link portal and title (fixes #2930) #3106
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ngokevin
reviewed
Oct 2, 2017
docs/components/link.md
Outdated
| @@ -60,14 +60,16 @@ We also provide a link primitive with a different syntax: | |||
|
|
|||
| | Property | Description | Default Value | | |||
| |---------------------|----------------------------------------------------------------------------------------------------------------------------------------------|---------------| | |||
| | color | Background color of the portal. | white | | |||
| | borderColor | Border color of the portal. | white | | |||
| | innerColor | Inner (background) color of the portal. | red | | |||
ngokevin
reviewed
Oct 2, 2017
src/components/link.js
Outdated
| if (data.on !== oldData.on) { this.updateEventListener(); } | ||
| if (data.visualAspectEnabled && oldData.peekMode !== undefined && data.peekMode !== oldData.peekMode) { | ||
| this.updatePeekMode(); | ||
| } | ||
| if (!data.image || oldData.image === data.image) { return; } | ||
| el.setAttribute('material', 'pano', | ||
| typeof data.image === 'string' ? data.image : data.image.src); | ||
| typeof data.image === 'string' ? data.image : data.image.src); |
ngokevin
reviewed
Oct 2, 2017
src/components/link.js
Outdated
| @@ -92,15 +96,15 @@ module.exports.Component = registerComponent('link', { | |||
| semiSphereEl = this.semiSphereEl = this.semiSphereEl || document.createElement('a-entity'); | |||
|
|
|||
| // Set Portal | |||
| el.setAttribute('geometry', {primitive: 'circle', radius: 1.0, segments: 64}); | |||
| el.setAttribute('geometry', { primitive: 'circle', radius: 1.0, segments: 64 }); | |||
ngokevin
reviewed
Oct 2, 2017
src/components/link.js
Outdated
| pano: {type: 'map', is: 'uniform'}, | ||
| borderEnabled: {default: 1.0, type: 'int', is: 'uniform'}, | ||
| strokeColor: {default: 'white', type: 'color', is: 'uniform'} | ||
| pano: { type: 'map', is: 'uniform' }, |
There was a problem hiding this comment.
don't need to add spaces to objects
ngokevin
force-pushed
the
fix-link-color
branch
from
ba997df to
e38b749
Compare
ngokevin
changed the title
|
thanks! |
|
@ngokevin thanks and sorry about the weird spaces - working through some linting issues in my local dev env. Won't happen next time;) |
|
Nah don't care, just fixed it up to merge it quick |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Fixes #2930 + adds customisable title color prop
Changes proposed: