Skip to content

Commit

Permalink
Merge pull request #880 from AleziaKurdis/CreateAppToolTabUiAdjustments
Browse files Browse the repository at this point in the history 
Create App: Tools tab: CSS&HTML adjustments
  • Loading branch information
@ksuprynowicz
ksuprynowicz committed Mar 20, 2024
2 parents ff91b93 + ef6f273 commit aff59e5
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 39 deletions.
62 changes: 49 additions & 13 deletions scripts/system/html/css/edit-style.css
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
// edit-style.css
//
// Created by Ryan Huffman on 13 Nov 2014
// Created by Ryan Huffman on November 13th, 2014
// Copyright 2014 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors.
// Copyright 2022 Overte e.V.
// Copyright 2022-2024 Overte e.V.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
Expand Down Expand Up @@ -701,6 +701,17 @@ div.section-header, hr {
align-items: center;
}

div.simpleSeparator {
width: 97%;
height: 2px;
border: 0px;
margin-top: 4px;
margin-right: 8px;
margin-left: 8px;
margin-bottom: 4px;
background-color: #777777;
}

.section.minor {
margin: 0 21px;
box-shadow: 1px -1px 0 rgb(37,37,37);
Expand Down Expand Up @@ -1304,6 +1315,27 @@ div#grid-section, body#entity-list-body {
margin: 0px 8px 8px 8px;
}

#voxels-section {
padding-bottom: 0px;
margin: 8px 8px 8px 8px;
}

#mode-section {
padding: 3px;
height: 28px;
margin: 8px 8px 8px 8px;
color: #000000;
background-color: #999999;
font-family: Raleway-Bold;
font-size: 16px;
border-radius: 5px;
}
#creationModeLabel {
padding-top: 4px;
width: 156px;
}


#entity-list-header {
margin-bottom: 6px;
}
Expand Down Expand Up @@ -1433,6 +1465,11 @@ input[type=button].entity-list-menutitle {
background: linear-gradient(#343434 30%, #000 100%);
cursor: pointer;
}

#voxel-edit-mode {
width: 120px;
}

input[type=button].entity-list-menutitle:enabled:hover {
background: linear-gradient(#000, #000);
border: none;
Expand Down Expand Up @@ -2082,10 +2119,10 @@ div.entity-list-menu {
div.tools-select-menu {
position: relative;
display: none;
width: 370px;
width: 200px;
height: 0px;
top: 0px;
left: 8px;
top: -16px;
left: 124px;
right: 0;
bottom: 0;
border-style: solid;
Expand All @@ -2097,20 +2134,19 @@ div.tools-select-menu {
}

div.tools-help-popup {
font-family: FiraSans-SemiBold;
font-size: 15px;
font-family: Raleway-SemiBold;
font-size: 14px;
position: relative;
display: none;
width: 690px;
width: 96%;
padding: 5px;
height: auto;
top: 0px;
top: -16px;
left: 8px;
right: 0;
bottom: 0;
border-style: solid;
border-color: #505050;
border-width: 1px;
background-color: #404040;
border: 2px solid #c0c0c0;
background-color: #333333;
z-index: 2;
cursor: pointer;
}
Expand Down
55 changes: 29 additions & 26 deletions scripts/system/html/gridControls.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!--
// gridControls.html
//
// Created by Ryan Huffman on 6 Nov 2014
// Created by Ryan Huffman on November 6th, 2014
// Copyright 2014 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
// Copyright 2022-2024 Overte e.V.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
Expand All @@ -23,26 +23,28 @@
<body onload='loaded();'>
<div id="mode-section" class="section">
<div class="property container">
<label for="create-app-mode">Create app mode </label>
<div id="creationModeLabel">
CREATION MODE
</div>
<div class="property container">
<input name="create-app-mode" type="button" class="entity-list-menutitle" id="create-app-mode" value="Create app mode&#9662;" />
</div>
</div>
<div class="tools-select-menu" id="edit-mode-menu" >
<button class="menu-button" id="edit-mode-object" >
<div class = "menu-item">
<div class = "menu-item-caption">Object mode</div>
<div class = "menu-item-shortcut"></div>
</div>
</button>
<button class="menu-button" id="edit-mode-voxel" >
<div class = "menu-item">
<div class = "menu-item-caption">Voxel edit mode</div>
<div class = "menu-item-shortcut"></div>
</div>
</button>
</div>
</div>
<div class="tools-select-menu" id="edit-mode-menu" >
<button class="menu-button" id="edit-mode-object" >
<div class = "menu-item">
<div class = "menu-item-caption">Object mode</div>
<div class = "menu-item-shortcut"></div>
</div>
</button>
<button class="menu-button" id="edit-mode-voxel" >
<div class = "menu-item">
<div class = "menu-item-caption">Voxel edit mode</div>
<div class = "menu-item-shortcut"></div>
</div>
</button>
</div>
</div>
<div id="voxels-section" class="section">
<h2>Voxel edit settings</h2>
<div class="property container">
Expand Down Expand Up @@ -76,23 +78,24 @@ <h2>Voxel edit settings</h2>
</button>
</div>
<div class="property container">
<label for="voxel-remove">&nbsp;&nbsp;Remove voxels</label>
<div style="width: 100%">
<input type='checkbox' id="voxel-remove" style="width: 100%">
<label for="voxel-remove">Remove voxels</label>
<div style="width: 100%;">
<input type='checkbox' id="voxel-remove" style="width: 100%;">
<label for="voxel-remove">&nbsp;</label>
</div>
<div class="property container">
<input name="voxel-help-button" type="button" class="entity-list-menutitle" id="voxel-help-button" value="Voxel edit help&#9662;" />
</div>
</div>
<div class="tools-help-popup" id="voxel-help-popup" >
<p>To edit voxels, Voxel Edit Mode needs to be selected.</p>
<p>Desktop mode:</p>
<p>Click the left mouse button to add a voxel. Click the middle mouse button to remove a voxel. Hold the mouse button and move the mouse to add or remove voxels in a single plane. The plane is determined by the direction in which you are looking when first voxel is added or removed (for example, look downwards to draw in horizontal plane).</p>
<p>VR mode:</p>
<p>Press the trigger to add a voxel. Press the trigger while holding the grip to remove a voxel. Hold the trigger and move the controller to add or remove voxels in a single plane. The plane is determined by the direction in which the controller's ray points when the first voxel is added or removed (for example point downwards to draw in the horizontal plane). Hold both grips and move your hands together or apart to change the size of the edit sphere.</p>
To edit voxels, "<b>Voxel Edit Mode</b>" needs to be selected.<br><br>
<b>Desktop:</b><br>
Click the left mouse button to add a voxel. Click the middle mouse button to remove a voxel. Hold the mouse button and move the mouse to add or remove voxels in a single plane. The plane is determined by the direction in which you are looking when first voxel is added or removed (for example, look downwards to draw in horizontal plane).<br><br>
<b>VR:</b><br>
Press the trigger to add a voxel. Press the trigger while holding the grip to remove a voxel. Hold the trigger and move the controller to add or remove voxels in a single plane. The plane is determined by the direction in which the controller's ray points when the first voxel is added or removed (for example point downwards to draw in the horizontal plane). Hold both grips and move your hands together or apart to change the size of the edit sphere.
</div>
</div>
<div class="simpleSeparator"></div>
<div id="grid-section" class="section">
<h2>Grid settings</h2>
<div class="property container">
Expand Down

0 comments on commit aff59e5

Please sign in to comment.