Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 11:37:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

style fixes

Browse source
This commit is contained in:
Thijs Wenker 2018-10-15 21:17:41 +02:00 committed by David Back
parent 684f7d5689
commit b9cfa28c08
3 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -244,7 +244,7 @@ input.search:focus {
height: 26px; height: 26px;
margin-top: 1px; margin-top: 1px;
margin-bottom: 1px; margin-bottom: 1px;
box-shadow: 0 0 0px 1px #00b4ef; box-shadow: 0 0 0 1px #00b4ef;
} }
input:disabled, textarea:disabled { input:disabled, textarea:disabled {
@ -473,11 +473,11 @@ input[type=checkbox]:checked + label:hover {
#properties-list fieldset { #properties-list fieldset {
position: relative; position: relative;
/* 0.1px on the top is to prevent margin collapsing between this and it's first child */ /* 0.1px on the top is to prevent margin collapsing between this and it's first child */
margin: 21px -21px 0px -21px; margin: 21px -21px 0 -21px;
padding: 0.1px 21px 0px 21px; padding: 0.1px 21px 0 21px;
border: none; border: none;
border-top: 1px rgb(90,90,90) solid; border-top: 1px rgb(90,90,90) solid;
box-shadow: 0px -1px 0px rgb(37,37,37); 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 {
@ -487,7 +487,7 @@ input[type=checkbox]:checked + label:hover {
} }
#properties-list > fieldset[data-collapsed="true"] + fieldset { #properties-list > fieldset[data-collapsed="true"] + fieldset {
margin-top: 0px; margin-top: 0;
} }
#properties-list > fieldset[data-collapsed="true"] > *:not(legend) { #properties-list > fieldset[data-collapsed="true"] > *:not(legend) {
@ -495,14 +495,14 @@ input[type=checkbox]:checked + label:hover {
} }
#properties-list legend + fieldset { #properties-list legend + fieldset {
margin-top: 0px; margin-top: 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
} }
#properties-list > fieldset#properties-base { #properties-list > fieldset#properties-header {
margin-top: 0px; margin-top: 0;
padding-bottom: 0px; padding-bottom: 0;
} }
#properties-list > fieldset > legend { #properties-list > fieldset > legend {
@ -972,8 +972,8 @@ div.refresh input[type="button"] {
#properties-list .two-column fieldset legend { #properties-list .two-column fieldset legend {
display: table; display: table;
width: 100%; width: 100%;
margin: 21px -21px 0px -21px; margin: 21px -21px 0 -21px;
padding: 0px 0px 0px 21px; padding: 0 0 0 21px;
font-family: Raleway-Regular; font-family: Raleway-Regular;
font-size: 12px; font-size: 12px;
color: #afafaf; color: #afafaf;
@ -1005,6 +1005,10 @@ fieldset .checkbox-sub-props .property:first-child {
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
background-color: #2e2e2e; background-color: #2e2e2e;
} }
#entity-table-scroll::-webkit-scrollbar-track {
border-bottom-right-radius: 7px;
}
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background-color: #696969; background-color: #696969;
border: 2px solid #2e2e2e; border: 2px solid #2e2e2e;
@ -1065,11 +1069,12 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
#footer-text { #footer-text {
float: right; float: right;
margin-right: 0; padding-top: 12px;
padding-right: 22px;
} }
#entity-list-footer { #entity-list-footer {
padding-top: 38px; padding-top: 9px;
} }
#search-area { #search-area {
@ -1109,6 +1114,9 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
margin-top: 28px; margin-top: 28px;
border-left: 2px solid #575757; border-left: 2px solid #575757;
border-right: 2px solid #575757; border-right: 2px solid #575757;
border-bottom: 2px solid #575757;
border-bottom-left-radius: 7px;
border-bottom-right-radius: 7px;
background-color: #1c1c1c; background-color: #1c1c1c;
} }
@ -1125,8 +1133,7 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
background-color: #1c1c1c; background-color: #1c1c1c;
} }
#entity-table thead tr, #entity-table thead tr th, #entity-table thead tr, #entity-table thead tr th {
#entity-table tfoot tr, #entity-table tfoot tr td {
background: none; background: none;
} }
@ -1237,19 +1244,6 @@ th#entity-hasTransparent .sort-order {
top: -1px; top: -1px;
} }
#entity-table tfoot {
box-sizing: border-box;
border: 2px solid #575757;
border-bottom-left-radius: 7px;
border-bottom-right-radius: 7px;
border-top: 1px solid #575757;
position: absolute;
bottom: -21px;
left: 0;
width: 100%;
}
#col-type { #col-type {
width: 16%; width: 16%;
} }
@ -1444,3 +1438,12 @@ input#property-scale-button-reset {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
input[type=button]#export {
height: 38px;
width: 180px;
}
body#entity-list-body {
padding-bottom: 0;
}

7
scripts/system/html/entityList.html
View file

@ -18,7 +18,7 @@
<script type="text/javascript" src="js/listView.js"></script> <script type="text/javascript" src="js/listView.js"></script>
<script type="text/javascript" src="js/entityList.js"></script> <script type="text/javascript" src="js/entityList.js"></script>
</head> </head>
<body onload='loaded();'> <body onload='loaded();' id="entity-list-body">
<div id="entity-list-header"> <div id="entity-list-header">
<input type="button" class="glyph" id="refresh" value="F" /> <input type="button" class="glyph" id="refresh" value="F" />
<div> <div>
@ -86,11 +86,6 @@
<td class="id" style="display: none"></td> <td class="id" style="display: none"></td>
</tr> </tr>
</tbody> </tbody>
<tfoot>
<tr>
<td colspan="12"></td>
</tr>
</tfoot>
</table> </table>
<div id="no-entities"> <div id="no-entities">

4
scripts/system/html/js/entityList.js
View file

@ -20,7 +20,7 @@ const IMAGE_MODEL_NAME = 'default-image-model.fbx';
const COLLAPSE_EXTRA_INFO = "E"; const COLLAPSE_EXTRA_INFO = "E";
const EXPAND_EXTRA_INFO = "D"; const EXPAND_EXTRA_INFO = "D";
const FILTER_IN_VIEW_ATTRIBUTE = "pressed"; const FILTER_IN_VIEW_ATTRIBUTE = "pressed";
const WINDOW_NONVARIABLE_HEIGHT = 257; const WINDOW_NONVARIABLE_HEIGHT = 227;
const NUM_COLUMNS = 12; const NUM_COLUMNS = 12;
const EMPTY_ENTITY_ID = "0"; const EMPTY_ENTITY_ID = "0";
const DELETE = 46; // Key code for the delete key. const DELETE = 46; // Key code for the delete key.
@ -640,7 +640,7 @@ function loaded() {
data = JSON.parse(data); data = JSON.parse(data);
if (data.type === "clearEntityList") { if (data.type === "clearEntityList") {
clearEntities(); clearEntities();
} else if (data.type == "selectionUpdate") { } else if (data.type === "selectionUpdate") {
let notFound = updateSelectedEntities(data.selectedIDs); let notFound = updateSelectedEntities(data.selectedIDs);
if (notFound) { if (notFound) {
refreshEntities(); refreshEntities();