Update the styling for the Entity Properties window

This commit is contained in:
Ryan Huffman 2018-11-08 14:53:33 -08:00
parent bb2239c0bd
commit 536ba645b1
4 changed files with 716 additions and 578 deletions

View file

@ -70,12 +70,11 @@
}
body {
padding: 21px 21px 21px 21px;
color: #afafaf;
background-color: #404040;
font-family: Raleway-Regular;
font-size: 15px;
font-size: 12px;
-webkit-touch-callout: none;
-webkit-user-select: none;
@ -425,9 +424,9 @@ input[type=checkbox] {
}
input[type=checkbox] + label {
padding-left: 24px;
background-position-y: 6px;
background-repeat: no-repeat;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACpSURBVDhPY2xoaGD68+dPMSMjY9L////VgTQjAw4AlH8PxLOPHj1azWxjY1MBVNsBFBfBpwkEgNKcQGwtJyfHyATkF0KEiQdAzYlMQEIUyicFyDD9+/ePgRxMvsb///4zkIOZ/v0HmkAGHginYjGNGAzS+BpdkAj8mun/3//92DyPD//993cG88nTJ4+Zm5p/BSZeJYb/DEJADEzNOPF7hn8Mk69cvVIPAHN5pyfo70F5AAAAAElFTkSuQmCC);
cursor: pointer;
}
input[type=checkbox]:enabled + label:hover {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAClSURBVDhPY2hoaGD6//9/6b9//64D8T8gGycASr/7+/dv5/79+1kYgIxKqDjRAKiniRFIv2JgYBAFYlLAE0aQ66AckgDjjx8/yNP44cMH8jS+fPmSPI0PHz4kT+PNmzfJ03jp0iXyNJ46dYo8jYcPHyYnAbxm+vnzZz8wLhlIwd+/f5/BrKSkdExCQuLrnz9/lIBpUAiIQekXF34PTGmTT548WQ8AokXg+rhVtPYAAAAASUVORK5CYII=);
@ -455,6 +454,15 @@ input[type=checkbox]:checked + label:hover {
color: #ffffff;
}
.icon {
font-family: HiFi-Glyphs;
color: white;
}
#property-type-icon {
font-size: 50px;
}
.selectable {
-webkit-touch-callout: text;
-webkit-user-select: text;
@ -483,9 +491,11 @@ input[type=checkbox]:checked + label:hover {
#properties-list {
display: flex;
flex-direction: column;
margin-top: 16px;
}
#properties-list fieldset {
#properties-list .fieldset {
position: relative;
/* 0.1px on the top is to prevent margin collapsing between this and it's first child */
margin: 0 -21px 21px -21px;
@ -495,71 +505,101 @@ input[type=checkbox]:checked + label:hover {
box-shadow: 0 -1px 0 rgb(37,37,37);
}
#properties-list fieldset.fstuple, #properties-list fieldset.fsrow {
#properties-list .fieldset.fstuple, #properties-list .fieldset.fsrow {
margin-top: 21px;
border: none;
box-shadow: none;
}
#properties-list > fieldset[data-collapsed="true"] + fieldset {
#properties-list > .fieldset[data-collapsed="true"] + .fieldset {
margin-top: 0;
}
#properties-list > fieldset[data-collapsed="true"] > *:not(legend) {
#properties-list > .fieldset[data-collapsed="true"] > *:not(div.legend) {
display: none !important;
}
#properties-list legend + fieldset {
margin-top: 0;
border: none;
box-shadow: none;
}
#properties-list > fieldset > legend {
position: relative;
display: table;
width: 100%;
margin: 21px -21px 0 -21px;
padding: 14px 21px 0 21px;
font-family: Raleway-Regular;
font-size: 12px;
color: #afafaf;
height: 28px;
text-transform: uppercase;
outline: none;
background-color: #404040;
border: none;
.section-header {
padding: 0 16px;
border-top: 1px rgb(90,90,90) solid;
box-shadow: 0 -1px 0 rgb(37,37,37), 0 4px 4px 0 rgba(0,0,0,0.75);
box-shadow: 1px -1px 0 rgb(37,37,37);
border-bottom: 1px solid rgb(37, 37, 37);
}
div.section-header, hr {
display: table;
width: 100%;
margin: 21px -21px 0 -21px;
padding: 14px 21px 0 21px;
display: flex;
flex-flow: row nowrap;
padding: 10px 16px;
font-family: Raleway-Regular;
font-size: 12px;
color: #afafaf;
height: 28px;
text-transform: uppercase;
outline: none;
margin-bottom: 10px;
align-items: center;
}
div.section-header:first-child {
margin-top: -2px;
padding-top: 0;
background: none;
height: auto;
.section.minor {
margin: 0 21px;
box-shadow: 1px -1px 0 rgb(37,37,37);
border-left: 1px solid #575757;
}
#properties-list > fieldset > legend span, .section-header span {
font-family: HiFi-Glyphs;
.container.property {
padding: 0 16px;
}
.stretch {
width: 100%;
}
div.section-header .label {
width: 100%;
}
.section.minor div.section-header {
border-right: 0;
}
div.section[collapsed="true"] > .container {
display: none;
}
div.section[collapsed="true"], div.section[collapsed="true"] > .section-header {
margin-bottom: 0;
}
.section.major {
margin-bottom: 20px;
}
.section.minor.last {
margin-bottom: 20px;
border-bottom: 1px solid rgb(37,37,37);
}
.section-header {
background-color: #373737;
}
.section-header {
cursor: pointer;
}
.section-header span {
font-size: 30px;
float: right;
position: absolute;
top: 4px;
right: 13px;
font-family: HiFi-Glyphs;
}
.triple-label {
text-transform: uppercase;
padding: 6px 0;
}
.triple-item {
margin-right: 10px;
}
.section-header[collapsed="true"] {
@ -582,9 +622,6 @@ hr {
}
.property {
display: table;
width: 100%;
margin-top: 21px;
min-height: 28px;
}
@ -592,6 +629,10 @@ hr {
width: auto;
}
span.indented {
padding-left: 16px;
}
.property label, .number label {
display: table-cell;
vertical-align: middle;
@ -604,13 +645,13 @@ hr {
font-size: 13px;
}
.property legend, .number legend {
.property div.legend, .number div.legend {
display: table-cell;
vertical-align: middle;
font-family: Raleway-SemiBold;
font-size: 14px;
}
.property legend .unit, .number legend .unit {
.property div.legend .unit, .number div.legend .unit {
margin-left: 8px;
font-family: Raleway-Light;
font-size: 13px;
@ -623,16 +664,26 @@ hr {
.value label {
display: inline-block;
vertical-align: top;
width: 48px;
}
.value legend {
.value div.legend {
display: inline-block;
vertical-align: top;
width: 48px;
}
.value span {
font-family: FiraSans-SemiBold;
font-size: 15px;
margin-right: 4px;
}
#placeholder-property-type {
display: flex;
align-items: center;
width: auto;
margin-right: 20px;
}
#placeholder-property-locked {
margin-left: 6px;
}
.checkbox + .checkbox {
@ -659,33 +710,6 @@ hr {
height: 1.8rem;
}
.text label, .url label, .number label, .textarea label, .xy label, .wh label, .rgb label, .xyz label, .pyr label, .dropdown label, .gen label {
float: left;
margin-left: 1px;
margin-bottom: 3px;
margin-top: -2px;
}
.text legend, .url legend, .number legend, .textarea legend, .xy legend, .wh legend, .rgb legend, .xyz legend, .pyr legend, .dropdown legend, .gen legend {
float: left;
margin-left: 1px;
margin-bottom: 3px;
margin-top: -2px;
}
.xy > div, .wh > div, .xyz > div, .pyr > div, .gen > div {
clear: both;
}
.number > input {
clear: both;
float: left;
}
.number > span {
clear: both;
float: left;
}
.dropdown {
position: relative;
margin-bottom: -17px;
@ -697,6 +721,7 @@ hr {
.dropdown dl {
clear: both;
cursor: pointer;
}
.dropdown dl {
font-family: FiraSans-SemiBold;
@ -705,7 +730,7 @@ hr {
height: 28px;
padding: 0 28px 0 12px;
color: #afafaf;
background: linear-gradient(#7d7d7d 20%, #686a68 100%);
background: #575757;
position: relative;
}
.dropdown dl[dropped="true"] {
@ -812,27 +837,20 @@ div.refresh input[type="button"] {
.color-picker {
box-sizing: border-box;
float: left;
margin-bottom: 21px;
width: 36px;
height: 36px;
border: 4px solid #afafaf;
border-radius: 4px;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABTSURBVChTjcxBDoAwCETRwTs33sFjwB6uaCE1Ggvav5qQF7CSqu40dllHjYiOT3gh3yV8Ii+Fb+RNMEP9hm3sKENmBhG5P1aImWMH/EMerSAAOAFgTC/R8ZXSXAAAAABJRU5ErkJggg==);
background-position: bottom right;
background-repeat: no-repeat;
width: 26px;
height: 26px;
border: 3px solid #2B2B2B;
cursor: pointer;
}
.color-picker:focus {
outline: none;
}
.color-picker[active="true"] {
border-color: #000;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABDSURBVChTjcoLCkAhCETRNq0tf97Y5xGZ1gVJ45TH6njThIO+xk2UwhWFcEdH6JCqOuiQiMDi/hcii3crRRb/7ggAPvIMVihQwvSXAAAAAElFTkSuQmCC);
}
.color-picker[disabled="disabled"] {
border-color: #afafaf;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABTSURBVChTjcxBDoAwCETRwTs33sFjwB6uaCE1Ggvav5qQF7CSqu40dllHjYiOT3gh3yV8Ii+Fb+RNMEP9hm3sKENmBhG5P1aImWMH/EMerSAAOAFgTC/R8ZXSXAAAAABJRU5ErkJggg==);
}
.colpick[disabled="disabled"] {
@ -848,89 +866,15 @@ div.refresh input[type="button"] {
clear: both;
}
.rgb legend {
.rgb div.legend {
float: left;
margin-top: 10px;
margin-left: 21px;
}
.rgb legend + * {
.rgb div.legend + * {
clear: both;
}
.tuple div {
display: inline-block;
position: relative;
margin-right: 6px;
}
.tuple div:last-child {
margin-right: 0;
}
.tuple label {
margin-right: -6px;
}
.xy .tuple input {
padding-left: 25px;
}
.wh .tuple input {
padding-left: 45px;
}
.rgb .tuple input {
padding-left: 65px;
}
.xyz .tuple input {
padding-left: 25px;
}
.pyr .tuple input {
padding-left: 40px;
}
.tuple div > label:first-child {
float: left;
}
.tuple div > label + input {
clear: both;
float: left;
}
.tuple div input + label {
display: inline !important;
float: none !important;
position: absolute;
margin-top: 8px;
margin-left: 6px;
left: 0;
font-family: FiraSans-SemiBold;
font-size: 12px;
}
.tuple .red + label, .tuple .x + label, .tuple .pitch + label, .tuple .width + label {
color: #e2334d;
}
.tuple .green + label, .tuple .y + label, .tuple .yaw + label, .tuple .height + label {
color: #1ac567;
}
.tuple .blue + label, .tuple .z + label, .tuple .roll + label {
color: #1080b8;
}
.tuple .red:focus, .tuple .x:focus, .tuple .pitch:focus, .tuple .width:focus {
outline-color: #e2334d;
}
.tuple .green:focus, .tuple .y:focus, .tuple .yaw:focus, .tuple .height:focus {
outline-color: #1ac567;
}
.tuple .blue:focus, .tuple .z:focus, .tuple .roll:focus {
outline-color: #1080b8;
}
.xyz .buttons input {
margin-top: 14px;
}
.xyz .buttons span {
word-wrap: nowrap;
white-space: nowrap;
}
.row .property {
width: auto;
display: inline-block;
@ -984,12 +928,12 @@ div.refresh input[type="button"] {
width: 50%;
}
#properties-list fieldset .two-column {
#properties-list .fieldset .two-column {
padding-top: 10px;
display: flex;
}
#properties-list .two-column fieldset {
#properties-list .two-column .fieldset {
width: 50%;
margin: 0;
padding: 0;
@ -1002,7 +946,7 @@ div.refresh input[type="button"] {
top: -10px;
}
#properties-list .two-column fieldset legend {
#properties-list .two-column .fieldset div.legend {
width: 100%;
margin: 21px -21px 0 -21px;
padding: 16px 0 0 21px;
@ -1018,11 +962,11 @@ div.refresh input[type="button"] {
margin-top: 6px;
}
fieldset .checkbox-sub-props {
.fieldset .checkbox-sub-props {
margin-top: 0;
}
fieldset .checkbox-sub-props .property:first-child {
.fieldset .checkbox-sub-props .property:first-child {
margin-top: 0;
}
@ -1069,6 +1013,7 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
body#entity-list-body {
padding-bottom: 0;
margin: 16px;
}
#entity-list-header {
@ -1448,7 +1393,6 @@ th#entity-hasScript {
border-top: none !important;
box-shadow: none !important;
margin-bottom: 5px !important;
top: -15px;
}
#properties-base #property-type-icon {
@ -1467,6 +1411,7 @@ th#entity-hasScript {
display: inline-block;
}
/*
#properties-base #div-property-locked {
position: absolute;
top: 6px;
@ -1487,6 +1432,7 @@ th#entity-hasScript {
#properties-base #div-property-visible label {
background-position-y: 1px;
}
*/
#properties-base .checkbox label span {
font-family: HiFi-Glyphs;
@ -1513,16 +1459,17 @@ th#entity-hasScript {
}
input#property-scale-button-rescale {
margin-top: 6px;
min-width: 50px;
margin-left: 6px;
}
input#property-scale-button-reset {
margin-top: 6px;
margin-right: 0;
}
#property-userData-button-clear,
#property-userData-button-edit,
#property-materialData-button-clear {
margin-bottom: 10px;
margin: 6px 0 6px 0;
}
#property-userData-static,
@ -1544,15 +1491,6 @@ input#property-scale-button-reset {
display: none;
}
#div-property-serverScripts-status label {
position: relative;
top: 8px;
}
#property-serverScripts-status {
position: relative;
top: 5px;
right: -20px;
}
#div-property-collisionSoundURL[style*="display: none"] + .property {
margin-top: 0;
@ -1637,3 +1575,100 @@ input.rename-entity {
content: "\e02c";
}
.container {
display: flex;
flex-flow: row nowrap;
justify-content: space-around;
margin-bottom: 8px;
min-height: 28px;
}
.container > label {
margin-top: 6px;
width: 200px;
}
.container > div.checkbox {
padding-top: 6px;
}
.container > .value {
width: 100%;
}
.container .row {
display: flex;
flex-flow: row nowrap;
}
.container.shrink {
width: min-content;
}
.fstuple {
display: flex;
flex-flow: row;
}
.fstuple input {
margin-left: 4px;
margin-right: 10px;
}
.fstuple label.red, .fstuple label.x {
color: #C62147;
}
.fstuple label.green, .fstuple label.y {
color: #359D85;
}
.fstuple label.blue, .fstuple label.z {
color: #0093C5;
}
.xyz.fstuple, .pyr.fstuple {
position: relative;
left: -12px;
}
.rgb.fstuple .tuple {
display: none;
}
input.number-slider {
background: #575757;
border-radius: 4px;
color: white;
}
.fstuple > div {
display: flex;
align-items: center;
justify-content: left;
}
.flex-row {
display: flex;
flex-flow: row;
}
.flex-column {
display: flex;
flex-flow: column;
}
.flex-center {
align-items: center;
}
.flex-evenly-spaced {
flex: 1;
}
#property-serverScripts-status {
font-family: Raleway-Light;
font-size: 14px;
margin: 6px 0;
}
#property-name, #property-id {
display: flex;
width: 100%;
}

View file

@ -223,8 +223,6 @@ div.jsoneditor-tree table.jsoneditor-tree {
div.jsoneditor-outer {
width: 100%;
height: 100%;
min-height: 150px;
margin: -35px 0 0 0;
padding: 0 0 0 0;
-moz-box-sizing: border-box;
@ -233,20 +231,18 @@ div.jsoneditor-outer {
overflow-y: auto;
}
textarea.jsoneditor-text,
.ace-jsoneditor {
min-height: 150px;
min-height: 150px;
height: auto !important;
}
div.jsoneditor-tree {
width: 100%;
height: 100%;
position: relative;
}
textarea.jsoneditor-text {
width: 100%;
height: 100%;
margin: 0;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@ -931,4 +927,4 @@ table.jsoneditor-search button.jsoneditor-previous {
table.jsoneditor-search button.jsoneditor-previous:hover {
background-position: -148px -49px;
}
}

View file

@ -28,6 +28,19 @@
<body onload='loaded();'>
<div id="properties-list">
<div class='property container'>
<label id='placeholder-property-type'></label>
<div class='value'>
<div class='row flex-center' style='padding-bottom: 8px;'>
<div id="placeholder-property-name" class="stretch"></div>
<div id="placeholder-property-locked" class="shrink"></div>
<div id="placeholder-property-visible" class="shrink"></div>
</div>
<div class='row'>
<div id="placeholder-property-id" class="stretch"></div>
</div>
</div>
</div>
<!-- each property is added at runtime in entityProperties -->
</div>
</body>

File diff suppressed because it is too large Load diff