summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2015-10-13 14:33:48 +0200
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2015-10-13 14:33:48 +0200
commit21b841891f40abaac661d084fd368edfb0ec25da (patch)
treec23c55c51536780bda2116bfb17aa8d5c7e0ef27
parentf48b45f5c7e040a7a6cbe243f6196f77c2b1e895 (diff)
Update Prolog screen layout to match Python
-rw-r--r--css/codeq.css35
-rw-r--r--index.html54
2 files changed, 65 insertions, 24 deletions
diff --git a/css/codeq.css b/css/codeq.css
index a404f11..d457089 100644
--- a/css/codeq.css
+++ b/css/codeq.css
@@ -185,6 +185,16 @@ body {
}
/* code_editor */
+ #screen_prolog .block.block2 {
+ min-height: 100%; height: 100%;
+ }
+
+ /* console */
+ #screen_prolog .block.block3 {
+ min-height: 100%; height: 100%;
+ }
+
+ /* code_editor */
#screen_python .block.block2 {
min-height: 100%; height: 100%;
}
@@ -207,6 +217,21 @@ body {
min-height: 50%; height: 50%;
}
+ .quadrants#screen_prolog > * > .block {
+ overflow: auto;
+ min-height: 100%; height: 100%;
+ }
+
+ /* code_editor */
+ #screen_prolog .block.block2 {
+ min-height: 50%; height: 50%;
+ }
+
+ /* console */
+ #screen_prolog .block.block3 {
+ min-height: 50%; height: 50%;
+ }
+
.quadrants#screen_python > * > .block {
overflow: auto;
min-height: 100%; height: 100%;
@@ -243,6 +268,16 @@ body {
border-right: 1px solid #ddd;
}
+ #screen_prolog .block.block1 {
+ min-height: 50%; height: 50%;
+ border-right: 0;
+ }
+
+ /* hints */
+ #screen_prolog .block.block4 {
+ min-height: 50%; height: 50%;
+ }
+
#screen_python .block.block1 {
min-height: 50%; height: 50%;
border-right: 0;
diff --git a/index.html b/index.html
index 84829a8..ec2c5dc 100644
--- a/index.html
+++ b/index.html
@@ -153,34 +153,40 @@
<!-- problem screen: prolog -->
<div class="container-fluid quadrants block1" id="screen_prolog" style="display: none;">
<div class="row">
- <div class="col-lg-3 col-md-6 col-sm-12 block block1">
- <div class="description-container">
- <h2 class="title" data-dict="prolog" data-tkey="slug"></h2>
- <div class="description" data-dict="prolog" data-tkey="description"></div>
+ <div class="col-lg-4 col-md-4 col-sm-12 block block-left">
+ <div class="col-lg-12 col-md-12 col-sm-12 block block1">
+ <div class="scrollable-content-container">
+ <div class="description-container">
+ <h2 class="title" data-dict="prolog" data-tkey="slug"></h2>
+ <div class="description" data-dict="prolog" data-tkey="description"></div>
+ </div>
+ </div>
+ <div class="block-label">Instructions</div>
</div>
- <div class="block-label">Instructions</div>
- </div>
- <div class="col-lg-3 col-md-6 col-sm-12 block block2">
- <nav class="navbar navbar-default block-toolbar">
- <div class="container-fluid">
- <button type="button" class="btn btn-default navbar-btn btn-plan" data-tkey="btn_plan">Plan</button>
- <button type="button" class="btn btn-default navbar-btn btn-hint" data-tkey="btn_hint">Hint</button>
- <button type="button" class="btn btn-default navbar-btn btn-test" data-tkey="btn_test">Test</button>
+ <div class="col-lg-12 col-md-12 col-sm-12 block block4">
+ <div class="scrollable-content-container">
+ <div class="hints"></div>
</div>
- </nav>
- <div class="code_editor"></div>
- <div class="block-statusbar"></div>
- <div class="block-label">Code</div>
- </div>
- <div class="col-lg-3 col-md-6 col-sm-12 block block3">
- <div class="console"></div>
- <div class="block-label">Console</div>
+ <div class="block-label">Hints</div>
+ </div>
</div>
- <div class="col-lg-3 col-md-6 col-sm-12 block block4">
- <div class="scrollable-content-container">
- <div class="hints"></div>
+ <div class="col-lg-8 col-md-8 col-sm-12 block block-right ">
+ <div class="col-lg-6 col-md-12 col-sm-12 block block2">
+ <nav class="navbar navbar-default block-toolbar">
+ <div class="container-fluid">
+ <button type="button" class="btn btn-default navbar-btn btn-plan" data-tkey="btn_plan">Plan</button>
+ <button type="button" class="btn btn-default navbar-btn btn-hint" data-tkey="btn_hint">Hint</button>
+ <button type="button" class="btn btn-default navbar-btn btn-test" data-tkey="btn_test">Test</button>
+ </div>
+ </nav>
+ <div class="code_editor"></div>
+ <div class="block-statusbar"></div>
+ <div class="block-label">Code</div>
+ </div>
+ <div class="col-lg-6 col-md-12 col-sm-12 block block3">
+ <div class="console"></div>
+ <div class="block-label">Console</div>
</div>
- <div class="block-label">Hints</div>
</div>
</div><!--/row-->
</div><!--container-->