Commit a75db584 authored by Marco Kellershoff's avatar Marco Kellershoff
Browse files

Fix layouting in firefox (with bootstrap)

parent c8e504c1
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
'div', 'div',
null, null,
[ [
['id', 'table'] ['id', 'table'],
['class', 'container']
] ]
), ),
'#app' '#app'
...@@ -112,7 +113,8 @@ ...@@ -112,7 +113,8 @@
'div', 'div',
null, null,
[ [
['id', 'table-row'] ['id', 'table-row'],
['class', 'row']
] ]
), ),
'#table' '#table'
...@@ -123,14 +125,16 @@ ...@@ -123,14 +125,16 @@
'div', 'div',
null, null,
[ [
['id', 'col1'] ['id', 'col1'],
['class', 'col-xs-6']
] ]
), ),
self.createElement( self.createElement(
'div', 'div',
null, null,
[ [
['id', 'col2'] ['id', 'col2'],
['class', 'col-xs-6']
] ]
) )
], ],
...@@ -288,6 +292,7 @@ ...@@ -288,6 +292,7 @@
col2.style.width = '100%'; col2.style.width = '100%';
col1.parentNode.removeChild(col1); col1.parentNode.removeChild(col1);
$(ifr).addClass('fullscreen'); $(ifr).addClass('fullscreen');
$(col2).removeClass('col-xs-6');
$('#table').addClass('fullscreen'); $('#table').addClass('fullscreen');
}; };
...@@ -386,10 +391,14 @@ ...@@ -386,10 +391,14 @@
this.showAndHideRun = function() { this.showAndHideRun = function() {
var is_compilable = self.isCompilable(); var is_compilable = self.isCompilable();
if (is_compilable === false) { if (is_compilable === false) {
col2.style.display = 'none'; $(col1).removeClass('col-xs-6');
$(col1).addClass('col-xs-12');
$(col2).addClass('hidden');
btn_run.style.display = 'none'; btn_run.style.display = 'none';
} else { } else {
col2.style.display = 'table-cell'; $(col1).addClass('col-xs-6');
$(col1).removeClass('col-xs-12');
$(col2).removeClass('hidden');
btn_run.style.display = 'inline-block'; btn_run.style.display = 'inline-block';
} }
}; };
......
...@@ -22,14 +22,11 @@ html,body,#app{margin:0;padding:0;width:100%;height:100%;} ...@@ -22,14 +22,11 @@ html,body,#app{margin:0;padding:0;width:100%;height:100%;}
body #app #logo {display: none;} body #app #logo {display: none;}
body #app {margin-top: 25px;} body #app {margin-top: 25px;}
} }
#table { #app #table {
display: table;
width: 100%; width: 100%;
height: calc(100% - 111px); height: calc(100% - 111px);
} }
#table-row { #app #table-row {
display: table-row;
width: 100%;
height: 100%; height: 100%;
} }
#app { #app {
...@@ -43,9 +40,9 @@ html,body,#app{margin:0;padding:0;width:100%;height:100%;} ...@@ -43,9 +40,9 @@ html,body,#app{margin:0;padding:0;width:100%;height:100%;}
overflow-scrolling: touch; overflow-scrolling: touch;
padding: 20px; padding: 20px;
} }
#col1, #col2 {height:100%;width:50%;display:table-cell;} #col1,#col2 {height:100%;}
#col1 .ace_editor {width:100%;height:100%;} #col1 .ace_editor {width:100%;height:100%;}
#col2 iframe {position:relative;top:-10px;left:10px;width:100%;height:100%;} #col2 iframe {position:relative;width:100%;height:100%;}
#app #col2 iframe.fullscreen { #app #col2 iframe.fullscreen {
position:relative;top:0;left:0;width:100%;height:100%; position:relative;top:0;left:0;width:100%;height:100%;
border: 0 none; border: 0 none;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment