Rearrange animation checkboxes and spinners to be in two columns

This commit is contained in:
David Rowe 2016-04-09 17:39:31 +12:00
parent e5d65fb159
commit 7d068a31a6
2 changed files with 46 additions and 23 deletions

View file

@ -767,6 +767,13 @@ tuple, .blue:focus, .tuple .z:focus, .tuple .roll:focus {
display: table-cell; display: table-cell;
width: 50%; width: 50%;
} }
.column {
vertical-align: top;
}
.indent {
margin-left: 24px;
}
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 10px; width: 10px;
@ -977,3 +984,7 @@ input#dimension-rescale-button {
min-width: 50px; min-width: 50px;
margin-left: 6px; margin-left: 6px;
} }
#animation-fps {
margin-top: 51px;
}

View file

@ -1537,7 +1537,7 @@
</div> </div>
<div class="behavior-group two-column"> <div class="behavior-group two-column">
<div class="column-1"> <div class="column">
<div class="sub-section-header"> <div class="sub-section-header">
<span>Collides With</span> <span>Collides With</span>
</div> </div>
@ -1568,7 +1568,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="column-2"> <div class="column">
<div class="sub-section-header"> <div class="sub-section-header">
<span>Grabbing</span> <span>Grabbing</span>
</div> </div>
@ -1644,28 +1644,40 @@
<input type="text" id="property-model-animation-url"> <input type="text" id="property-model-animation-url">
<input type="button" class="update-url-version glyph" value="F" /> <input type="button" class="update-url-version glyph" value="F" />
</div> </div>
<div class="model-group model-section property checkbox">
<input type="checkbox" id="property-model-animation-playing"> <div class="model-group model-section two-column">
<label for="property-model-animation-playing">Animation playing</label> <div class="column">
</div> <div class="property checkbox">
<div class="model-group model-section property number"> <input type="checkbox" id="property-model-animation-playing">
<label>Animation FPS</label> <label for="property-model-animation-playing">Animation playing</label>
<input type="number" id="property-model-animation-fps"> </div>
</div> <div class="property checkbox indent">
<div class="model-group model-section property number"> <input type="checkbox" id="property-model-animation-loop">
<div class="tuple"> <label for="property-model-animation-loop">Animation loop</label>
<div><label>Animation frame</label><input type="number" id="property-model-animation-frame"></div> </div>
<div><label>First frame</label><input type="number" id="property-model-animation-first-frame"></div> <div class="property checkbox indent">
<div><label>Last frame</label><input type="number" id="property-model-animation-last-frame"></div> <input type="checkbox" id="property-model-animation-hold">
<label for="property-model-animation-hold">Animation hold</label>
</div>
<div id="animation-fps" class="property number">
<label>Animation FPS</label>
<input type="number" id="property-model-animation-fps">
</div>
</div>
<div class="column">
<div class="property number">
<label>Animation frame</label>
<input type="number" id="property-model-animation-frame">
</div>
<div class="property number">
<label>First frame</label>
<input type="number" id="property-model-animation-first-frame">
</div>
<div class="property number">
<label>Last frame</label>
<input type="number" id="property-model-animation-last-frame">
</div>
</div> </div>
</div>
<div class="model-group model-section property checkbox">
<input type="checkbox" id="property-model-animation-loop">
<label for="property-model-animation-loop">Animation loop</label>
</div>
<div class="model-group model-section property checkbox">
<input type="checkbox" id="property-model-animation-hold">
<label for="property-model-animation-hold">Animation hold</label>
</div> </div>
<hr class="model-group model-section" /> <hr class="model-group model-section" />
<div class="model-group model-section property textarea"> <div class="model-group model-section property textarea">