mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-09-01 08:17:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #208 from arlobelshee/ie-finish-fixes

Browse source 
Ie finish fixes
This commit is contained in:
Peter Cottle 2014-09-02 21:02:04 -07:00
commit e9d1d4f9e2
2 changed files with 40 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/style/main.css
View file

@ -66,7 +66,7 @@ div.modalTerminal p {
html,
body,
.box {
display: flexbox;
display: flex;
display: -moz-box;
display: -webkit-box;
display: -ms-flexbox;
@ -76,29 +76,29 @@ body,
.flex1 {
-webkit-box-flex: 1;
-moz-box-flex: 1;
-ms-flex: 1.0;
flex: 1;
-ms-flex: 1.0 1.0 auto;
flex: 1 1 auto;
}
.flex2 {
-webkit-box-flex: 2;
-moz-box-flex: 2;
-ms-flex: 2.0;
flex: 2;
-ms-flex: 2.0 2.0 auto;
flex: 2 2 auto;
}
.flex3 {
-webkit-box-flex: 3;
-moz-box-flex: 3;
-ms-flex: 3.0;
flex: 3;
-ms-flex: 3.0 3.0 auto;
flex: 3 3 auto;
}
.flex10 {
-webkit-box-flex: 10;
-moz-box-flex: 10;
-ms-flex: 10.0;
flex: 10;
-ms-flex: 10.0 10.0 auto;
flex: 10 10 auto;
}
html,

60
src/template.index.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html lang="en">
<head>
@ -203,36 +203,38 @@
</div>
</script>
<script type="text/html" id="terminal-window-template">
<div class="terminal-window box horizontal flex3 transitionAll">
<div class="box flex3">
</div>
<script type="text/html" id="terminal-window-template">
<div class="terminal-window box horizontal flex3 transitionAll">
<div class="box flex3">
</div>
<div class="terminal-window-holder box flex10 vertical transitionTransform">
<div class="toolbar box vertical center">
<div class="controls box horizontal justify">
<div class="box flex1">
<div class="close">
</div>
</div>
<div class="box flex1">
<div class="minimize">
</div>
</div>
<div class="box flex1">
<div class="plus">
</div>
</div>
</div>
<div>
<i class="icon-cog"></i>
<%= title %>
</div>
</div>
<div class="terminal-window-holder box flex10 vertical transitionTransform">
<div class="wrapper box vertical">
<div class="toolbar box vertical center">
<div class="controls box horizontal justify">
<div class="box flex1">
<div class="close">
</div>
</div>
<div class="box flex1">
<div class="minimize">
</div>
</div>
<div class="box flex1">
<div class="plus">
</div>
</div>
</div>
<div>
<i class="icon-cog"></i>
<%= title %>
</div>
</div>
<div class="inside">
</div>
</div>
<div class="inside">
</div>
</div>
</div>
<div class="box flex2">
</div>