Permalink
Browse files

Fixes for windows etc

  • Loading branch information...
1 parent d1e026a commit 91b001298841a22aa920493df743e94c293ff9ec @gildean committed Aug 7, 2012
Showing with 26 additions and 12 deletions.
  1. +6 −2 app.js
  2. +20 −10 content/style.css
View
@@ -7,9 +7,10 @@ app.serveFilesFrom(__dirname + '/content');
var window = app.createWindow({
+ alpha: false,
width: 800,
height: 480,
- resizable: true,
+ resizable: false,
disableSecurity: true,
icons: __dirname + '/content/icons'
});
@@ -97,7 +98,10 @@ window.on('ready', function(){
function blastedOut(blastTime){
$label.text('Ceasefire called');
$buttons.attr('disabled', false);
- $footerlabel.text('Blasting lasted: ' + blastTime.toFixed(1) + ' s');
+ var blasttimer = function(blastTime) {
+ $footerlabel.text('Blasting lasted: ' + blastTime.toFixed(1) + ' s');
+ };
+ setTimeout(blasttimer(blastTime), 1000);
};
});
View
@@ -10,7 +10,7 @@
body {
width: 100%;
- font-size: 120%;
+ font-size: 16px;
text-align: center;
margin: 0;
padding: 0;
@@ -38,7 +38,7 @@ h1 {
h2 {
font-size: 20px;
- color: #0e0e0e;
+ color: #FFF;
text-shadow: -2px 0 0px #FF3380;
padding: 10px 0;
}
@@ -53,7 +53,7 @@ input {
.bton {
color: #fff;
background-color: #0e0e0e;
- box-shadow: inset 0 0 2px #FF3380;
+ box-shadow: -2px 2px 0px #921D42;
border: 1px solid rgba(0,0,0,0.1);
margin: 7%;
width: 40%;
@@ -65,7 +65,8 @@ input {
}
.bton:hover {
- box-shadow: inset 0 0 100px #FF3380;
+ -webkit-transform: scale(0.95);
+ box-shadow: -1px 1px 1px #921D42, inset 0 0 100px #FF3380;
cursor: pointer;
}
@@ -76,8 +77,9 @@ p {
#container {
position: relative;
- margin: 50px 0 0 0;
+ margin: 50px 0 30px 0;
padding: 0;
+
}
#blastingbox, #resultsbox {
@@ -86,22 +88,30 @@ p {
padding: 0;
}
+#info-target {
+ background: rgb(0,0,0,0.5);
+ color: #fff;
+ border-radius: 1em;
+}
+
#blastingbox {
position: fixed;
left: 0;
- top: 100px;
- padding:0 0 80px;
+ top: 80px;
}
#resultsbox {
float: right;
- min-height: 400px;
- height: 400px;
+ min-height: 360px;
+ height: 75vh;
overflow-y: auto;
+ background: rgba(0,0,0,0.9);
+ margin: 0 0 50px 0;
}
#resultsbox p {
margin: 1% 0;
+ color: #FFF;
}
#placeholder {
@@ -138,4 +148,4 @@ float: left;
width: 100px;
border-radius: 0.5em;
font-size: 1em;
-}
+}

0 comments on commit 91b0012

Please sign in to comment.