Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

merge follow-up

Browse source
This commit is contained in:
David Back 2018-11-12 17:30:21 -08:00
parent c5023b1086
commit b3ccce9a3f
2 changed files with 5 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
scripts/system/html/css/edit-style.css
View file

@ -876,7 +876,6 @@ div.refresh input[type="button"] {
}
.rgb div.legend + * {
clear: both;
<<<<<<< HEAD
}
.draggable-number {
@ -904,8 +903,6 @@ div.refresh input[type="button"] {
.draggable-number input::-webkit-inner-spin-button {
-webkit-appearance: none;
visibility: hidden;
=======
>>>>>>> a787f55506f73c2617ce12e5fd6b2d129c9bb03e
}
.row .property {
@ -1444,32 +1441,6 @@ th#entity-hasScript {
display: inline-block;
}
<<<<<<< HEAD
/*
#properties-base #div-property-locked {
position: absolute;
top: 6px;
right: 140px;
display: table-cell;
vertical-align: middle;
}
#properties-base #div-property-visible {
position: absolute;
top: 26px;
right: 20px;
display: table-cell;
vertical-align: middle;
}
#properties-base #div-property-locked label,
#properties-base #div-property-visible label {
background-position-y: 1px;
}
*/
=======
>>>>>>> a787f55506f73c2617ce12e5fd6b2d129c9bb03e
#properties-base .checkbox label span {
font-family: HiFi-Glyphs;
font-size: 20px;
@ -1708,8 +1679,6 @@ input.number-slider {
#toggle-space-mode.space-mode-world::before {
content: "\e02c";
}
<<<<<<< HEAD
=======
.container {
display: flex;
@ -1808,4 +1777,3 @@ input.number-slider {
display: flex;
width: 100%;
}
>>>>>>> a787f55506f73c2617ce12e5fd6b2d129c9bb03e

22
scripts/system/html/js/entityProperties.js
View file

@ -1390,11 +1390,6 @@ const COLOR_ELEMENTS = {
BLUE_INPUT: 3,
};
const ICON_ELEMENTS = {
ICON: 0,
LABEL: 1,
};
const TEXTURE_ELEMENTS = {
IMAGE: 0,
TEXT_INPUT: 1,
@ -1622,7 +1617,9 @@ function updateVisibleSpaceModeProperties() {
let propertySpaceMode = property.spaceMode;
if (propertySpaceMode !== PROPERTY_SPACE_MODE.ALL) {
showPropertyElement(propertyID, propertySpaceMode === currentSpaceMode);
}
} else {
showPropertyElement(propertyID, true);
}
}
}
}
@ -2189,9 +2186,7 @@ function createProperty(propertyData, propertyElementID, propertyName, propertyI
break;
}
case 'icon': {
let elIcon = createIconProperty(property, elProperty);
property.elSpan = elIcon[ICON_ELEMENTS.ICON];
property.elLabel = elIcon[ICON_ELEMENTS.LABEL];
property.elSpan = createIconProperty(property, elProperty);
break;
}
case 'texture': {
@ -2853,7 +2848,6 @@ function loaded() {
let property = createProperty(innerPropertyData, propertyElementID, propertyName, propertyID, elWrapper.childNodes[0]);
property.isParticleProperty = group.id.includes("particles");
property.elContainer = elContainer;
property.spaceMode = propertySpaceMode;
if (property.type !== 'placeholder') {
@ -2978,7 +2972,6 @@ function loaded() {
let typeProperty = properties["type"];
typeProperty.elSpan.innerHTML = typeProperty.data.icons[type];
typeProperty.elSpan.style.display = "inline-block";
typeProperty.elLabel.innerHTML = type + " (" + data.selections.length + ")";
disableProperties();
} else {
@ -3025,7 +3018,6 @@ function loaded() {
let isPropertyNotNumber = false;
switch (propertyData.type) {
case 'number':
case 'slider':
isPropertyNotNumber = isNaN(propertyValue) || propertyValue === null;
break;
case 'vec3':
@ -3057,8 +3049,7 @@ function loaded() {
}
break;
}
case 'number':
case 'slider': {
case 'number': {
let multiplier = propertyData.multiplier !== undefined ? propertyData.multiplier : 1;
let value = propertyValue / multiplier;
if (propertyData.round !== undefined) {
@ -3069,9 +3060,6 @@ function loaded() {
} else {
property.elInput.value = value;
}
if (property.elSlider !== undefined) {
property.elSlider.value = property.elInput.value;
}
break;
}
case 'vec3':