Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 01:22:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12472 from 1P-Cusack/FogBugz/Case_4315_VFXTabSupport

Browse source 
[Case 4315] Resolves Particle Tab Color Picker visual inconstency
This commit is contained in:
Brad Hefta-Gaub 2018-03-09 08:49:07 -08:00 committed by GitHub
commit 8e44b429d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/particle_explorer/hifi-entity-ui.js
View file

@ -439,8 +439,9 @@ HifiEntityUI.prototype = {
$colPickContainer.colpick({
colorScheme: 'dark',
layout: 'hex',
colorScheme: (group.layoutColorScheme === undefined ? 'dark' : group.layoutColorScheme),
layout: (group.layoutType === undefined ? 'hex' : group.layoutType),
submit: (group.useSubmitButton === undefined ? true : group.useSubmitButton),
color: {
r: domArray[0].value,
g: domArray[1].value,

1
scripts/system/particle_explorer/particleExplorer.html
View file

@ -27,6 +27,7 @@
<link rel="stylesheet" type="text/css" href="../html/css/hifi-style.css">
<link rel="stylesheet" type="text/css" href="../html/css/edit-style.css">
<link rel="stylesheet" type="text/css" href="../html/css/colpick.css">
<link rel="stylesheet" type="text/css" href="particle-style.css">
</head>
<body>

20
scripts/system/particle_explorer/particleExplorer.js
View file

@ -236,7 +236,10 @@
red: 255,
green: 255,
blue: 255
}
},
layoutType: "hex",
layoutColorScheme: "dark",
useSubmitButton: false
},
{
type: "Row"
@ -249,7 +252,10 @@
red: 0,
green: 0,
blue: 0
}
},
layoutType: "hex",
layoutColorScheme: "dark",
useSubmitButton: false
},
{
type: "Row"
@ -262,7 +268,10 @@
red: 255,
green: 255,
blue: 255
}
},
layoutType: "hex",
layoutColorScheme: "dark",
useSubmitButton: false
},
{
type: "Row"
@ -275,7 +284,10 @@
red: 255,
green: 255,
blue: 255
}
},
layoutType: "hex",
layoutColorScheme: "dark",
useSubmitButton: false
},
{
type: "Row"