summaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorAleš Smodiš <aless@guru.si>2015-12-15 11:30:19 +0100
committerAleš Smodiš <aless@guru.si>2015-12-15 11:30:19 +0100
commited62d492323011741027c9d79973ccd30b4b0494 (patch)
tree26121de183f0f2019857581198b4e31a9ede5456 /css
parent13c8be3d82350082093df8cd65771f09fcb83c54 (diff)
parent7de6dca9112d292803b801e0d370c45b0ca0eb13 (diff)
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web
Conflicts: js/codeq/navigation.js
Diffstat (limited to 'css')
-rw-r--r--css/codeq.css19
1 files changed, 18 insertions, 1 deletions
diff --git a/css/codeq.css b/css/codeq.css
index c12be4d..1775c84 100644
--- a/css/codeq.css
+++ b/css/codeq.css
@@ -99,6 +99,7 @@ div.vertical-line{
.block.block1 {
border-bottom: 1px solid #ddd;
+ padding-bottom: 1em;
}
@@ -107,9 +108,13 @@ div.vertical-line{
padding: 0.5em 0.5em 20px 0.5em;
}
+.block.block4 {
+ padding-bottom: 1em;
+}
/* code_editor */
.block > .code_editor {
+ min-height: 8em;
}
.block.block2 {
@@ -122,7 +127,7 @@ div.vertical-line{
background: #222;
font-size: 14px;
padding: 0.5em;
- min-height: 4em;
+ min-height: 8em;
}
.block-label {
@@ -154,6 +159,18 @@ div.vertical-line{
padding: 0 4px;
}
+/* robot connection & sensor info */
+#screen_robot .block3 .status {
+ background-color: #666;
+ border: 1px solid #444;
+ color: yellow;
+ font-family: monospace;
+ padding: 0.5em;
+ position: absolute;
+ top: 1em;
+ right: 1em;
+}
+
/* block-toolbar */
.block-toolbar {
position: absolute;