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

Design fixes

This commit is contained in:
Felipe Martín 2013-05-30 17:38:20 +02:00
parent 81829b1a83
commit 6c539f60e5
2 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
minecraftcodex/studio/static/sass/_fixes.sass
View File

@ -3,8 +3,11 @@
overflow: visible overflow: visible
// Dropdownss border radius // Dropdownss border radius
.dropdown-toggle .dropdown-toggle, .btn-round
border-radius: 6px !important border-radius: 6px !important
//.open > .dropdown-menu //.open > .dropdown-menu
// min-height: auto !important // min-height: auto !important
.valing-top
vertical-align: top

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

@ -68,6 +68,11 @@ window.onload = function() {
var texture = $(this).attr('data-texture') var texture = $(this).attr('data-texture')
mcstudio.changeTexture(texture) mcstudio.changeTexture(texture)
}) })
$('[data-action="toggle"]').click(function() {
var target = $(this).attr('data-target')
$(target).toggle('fast')
})
} }
</script> </script>
{% endblock %} {% endblock %}
@ -87,8 +92,7 @@ window.onload = function() {
<i class="icon-caret-down"></i> <i class="icon-caret-down"></i>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#">New</a></li> <li><a href="#" onclick="javascript:mcstudio.reset()">New</a></li>
<li><a href="#">Save</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a href="{{ url('homepage') }}">Exit</a></li> <li><a href="{{ url('homepage') }}">Exit</a></li>
</ul> </ul>
@ -123,12 +127,11 @@ window.onload = function() {
<div class="studio-workspace"> <div class="studio-workspace">
<div class="panel panel-left"> <div class="panel panel-left">
<div class="well"> <div class="well">
<div class="texture-name pull-right"></div> <div class="pull-right">
<h3 class="margin-none">Textures</h3>
<div class="text-center">
<input type="text" class="texture-search" placeholder="Search..." /> <input type="text" class="texture-search" placeholder="Search..." />
</div> </div>
<hr class="margin-none"/> <h3 class="margin-none">Textures</h3>
<div class="clearfix"></div>
<div class="texture-list"> <div class="texture-list">
{% for item in textures %} {% for item in textures %}
<div class="item" data-type="texture" data-name="{{ item.name }}" <div class="item" data-type="texture" data-name="{{ item.name }}"
@ -140,6 +143,7 @@ window.onload = function() {
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="texture-name text-center"></div>
</div> </div>
</div> </div>
<div class="panel panel-canvas"> <div class="panel panel-canvas">
@ -149,57 +153,45 @@ window.onload = function() {
<div class="well"> <div class="well">
<button type="button" <button type="button"
class="btn btn-danger btn-small pull-right" class="btn btn-danger btn-small pull-right"
data-toggle="collapse" data-target="#camera"> data-action="toggle" data-target="#camera">
Hide Toggle
</button> </button>
<h3 class="margin-none">Camera</h3> <h4 class="margin-none">Camera</h4>
<div id="camera" class="collapse in"> <div class="clearfix"></div>
<div class="text-right"> <div id="camera" class="text-right">
Type: <hr />
<select name="select" class="flatui camera-type "> Type:
<option value="orthographic">Orthographic</option> <select name="select" class="flatui camera-type ">
<option value="perspective">Perspective</option> <option value="orthographic">Orthographic</option>
</select> <option value="perspective">Perspective</option>
</div> </select>
{#<label class="radio">
<span class="icons">
<span class="first-icon fui-radio-unchecked"></span>
<span class="second-icon fui-radio-checked"></span>
</span>
<input name="optionsRadiosDisabled" id="optionsRadios4"
value="option2" data-toggle="radio" type="radio">
Orthogonal
</label>
<label class="radio">
<span class="icons">
<span class="first-icon fui-radio-unchecked"></span>
<span class="second-icon fui-radio-checked"></span>
</span>
<input name="optionsRadiosDisabled" id="optionsRadios4"
value="option2" data-toggle="radio" type="radio">
Perpective
</label>#}
</div> </div>
<hr /> </div>
<div class="well">
<button type="button" <button type="button"
class="btn btn-danger btn-small pull-right" class="btn btn-danger btn-small pull-right"
data-toggle="collapse" data-target="#objects"> data-action="toggle" data-target="#objects">
Hide Toggle
</button> </button>
<h3 class="margin-none">Objects</h3> <h4 class="margin-none">Objects</h4>
<div id="objects" class="collapse in"> <div id="objects" class="text-right">
// TODO <hr />
<select name="select" class="flatui object">
</select>
<button class="btn btn-primary btn-round valing-top">
<i class="icon-plus"></i>
</button>
</div> </div>
<hr /> </div>
<div class="well">
<button type="button" <button type="button"
class="btn btn-danger btn-small pull-right" class="btn btn-danger btn-small pull-right"
data-toggle="collapse" data-target="#lights"> data-action="toggle" data-target="#lights">
Hide Toggle
</button> </button>
<h3 class="margin-none">Lights</h3> <h4 class="margin-none">Lights</h4>
<div id="lights" class="collapse in"> <div id="lights">
// TODO <hr />
</div> </div>
</div> </div>
</div> </div>