fmartingr
/
minecraftcodex
mirror of https://github.com/fmartingr/minecraftcodex.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Camera type is now selectable with radio buttons instead of a select

This commit is contained in:
Felipe Martín 2013-05-31 10:20:57 +02:00
parent 6c539f60e5
commit b5f6366229
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minecraftcodex/studio/static/lib/flatui/less/flat-ui.less
View File

@ -2,7 +2,7 @@
// Loading custom fonts // Loading custom fonts
//@import url("https://fonts.googleapis.com/css?family=Lato:400,700,700italic,900,400italic,300"); //@import url("https://fonts.googleapis.com/css?family=Lato:400,700,700italic,900,400italic,300");
//@import "icon-font"; @import "icon-font";
// Loading config with variables (changing them leads to changing a color scheme) // Loading config with variables (changing them leads to changing a color scheme)
@import "config"; @import "config";

29
minecraftcodex/studio/templates/studio/main.html
View File

@ -34,11 +34,11 @@ window.onload = function() {
// Texture search // Texture search
$('.texture-list .item').hover(function() { $('.texture-list .item').hover(function() {
$('div.texture-name').html($(this).attr('data-name')) $('.texture-name').html($(this).attr('data-name'))
}) })
$('div.texture-list').on('mouseout', function() { $('div.texture-list').on('mouseout', function() {
$('div.texture-name').html('') $('.texture-name').html('Mouseover a texture')
}) })
$('input.texture-search').on('keyup', function(event) { $('input.texture-search').on('keyup', function(event) {
@ -59,7 +59,7 @@ window.onload = function() {
}) })
$("select.flatui").selectpicker({style: 'btn-primary', menuStyle: 'dropdown-inverse'}); $("select.flatui").selectpicker({style: 'btn-primary', menuStyle: 'dropdown-inverse'});
$("select.camera-type").change(function() { $('input[name="cameraType"]').change(function() {
mcstudio.onCameraChange($(this).val()) mcstudio.onCameraChange($(this).val())
}) })
$("select.camera-type").change() $("select.camera-type").change()
@ -143,7 +143,7 @@ window.onload = function() {
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="texture-name text-center"></div> <div class="text-center"><span class="texture-name badge">Mouseover a texture</span></div>
</div> </div>
</div> </div>
<div class="panel panel-canvas"> <div class="panel panel-canvas">
@ -160,11 +160,22 @@ window.onload = function() {
<div class="clearfix"></div> <div class="clearfix"></div>
<div id="camera" class="text-right"> <div id="camera" class="text-right">
<hr /> <hr />
Type: <div class="row-fluid">
<select name="select" class="flatui camera-type "> <div class="span6 text-center">
<option value="orthographic">Orthographic</option> <span class="radio">
<option value="perspective">Perspective</option> <input type="radio" name="cameraType" value="perspective"
</select> data-toggle="radio">
Perspective
</span>
</div>
<div class="span6 text-center">
<span class="radio">
<input type="radio" name="cameraType" value="orthographic"
data-toggle="radio">
Orthograpic
</span>
</div>
</div>
</div> </div>
</div> </div>
<div class="well"> <div class="well">