Skip to content

Commit 840a102

Browse files
committed
fixed layout a bit (edito padding)
seperated game and main code output
1 parent 42326ba commit 840a102

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

client/templates/game.swig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
{% endblock %}
7070

7171
{% block extra_page_script %}
72+
<!-- build:js(client) scripts/odgame.js -->
73+
<script src="scripts/debugger/debugger.js" type="text/javascript" charset="utf-8"></script>
7274
<script src="scripts/game/game.js"></script>
7375
<script src="scripts/game/player.js"></script>
76+
<!-- endbuild -->
7477
{% endblock %}

client/templates/index.swig

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,22 @@
55
<section class="row">
66
<div class="col-md-6 col-sm-8 col-xs-7">
77
<div class="row">
8-
<div class="btn-group pull-right">
9-
<button id="debug" class="btn"> ⏏ Start Debuger</button>
10-
<button id="back" class="btn" disabled> &#8676; Back</button>
11-
<button id="step" class="btn" disabled> &#8677; Step</button>
12-
<button id="stop" class="btn" disabled> ■ Stop</button>
13-
<button id="run" class="btn"> ▶ Run</button>
14-
</div>
15-
<ul class="nav nav-tabs">
16-
<li class="active"><a href="#code" data-toggle="tab">Code</a></li>
17-
</ul>
18-
<div class="tab-content">
19-
<div class="tab-pane fade in active font-control" id="code">
20-
<textarea id="editor"></textarea>
21-
</div>
8+
<div class="col-md-12">
9+
<div class="btn-group pull-right">
10+
<button id="debug" class="btn"> ⏏ Start Debuger</button>
11+
<button id="back" class="btn" disabled> &#8676; Back</button>
12+
<button id="step" class="btn" disabled> &#8677; Step</button>
13+
<button id="stop" class="btn" disabled> ■ Stop</button>
14+
<button id="run" class="btn"> ▶ Run</button>
15+
</div>
16+
<ul class="nav nav-tabs">
17+
<li class="active"><a href="#code" data-toggle="tab">Code</a></li>
18+
</ul>
19+
<div class="tab-content">
20+
<div class="tab-pane fade in active font-control" id="code">
21+
<textarea id="editor"></textarea>
22+
</div>
23+
</div>
2224
</div>
2325
</div>
2426
</div>
@@ -55,6 +57,9 @@
5557
{% endblock %}
5658

5759
{% block extra_page_script %}
60+
<!-- build:js(client) scripts/main.js -->
61+
<script src="scripts/debugger/debugger.js" type="text/javascript" charset="utf-8"></script>
5862
<script src="scripts/debugger/user.js" type="text/javascript" charset="utf-8"></script>
63+
<!-- endbuild -->
5964
{% endblock %}
6065

client/templates/layouts/base.swig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@
8686
<!-- endbuild -->
8787

8888
<script src="scripts/brython/www/src/brython.js"></script>
89+
{% block extra_page_script %}
8990
<!-- build:js(client) scripts/main.js -->
9091
<script src="scripts/debugger/debugger.js" type="text/javascript" charset="utf-8"></script>
91-
{% block extra_page_script %}
92-
{% endblock %}
9392
<!-- endbuild -->
93+
{% endblock %}
9494

9595
<script>
9696
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

0 commit comments

Comments
 (0)