From 07916e00d5cbde827458e856860d194ab6d60a9c Mon Sep 17 00:00:00 2001 From: Jeff Hobbs Date: Tue, 26 Jun 2012 18:12:42 -0400 Subject: [PATCH] CSS fixes, audio file references moved to data.js file --- .gitignore | 4 ++++ css/style.css | 24 ++++++++++++++---------- js/data.js | 4 ++++ js/script.js | 3 --- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 9bea433..431726a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ .DS_Store + +buffalo/index.html + +buffalo/js/data.js diff --git a/css/style.css b/css/style.css index b77a68b..33c783c 100644 --- a/css/style.css +++ b/css/style.css @@ -26,6 +26,8 @@ body { } #header, #footer { + display: block; + float: left; width: 600px; color: #8B3E2F; opacity: 0.5; @@ -36,10 +38,8 @@ body { padding: 8px 20px 8px 20px; transition-property: background-color; transition-duration: 1s; - /* Firefox 4 */ -moz-transition-property: background-color; -moz-transition-duration: 1s; - /* Safari and Chrome */ -webkit-transition-property: background-color; -webkit-transition-duration: 1s; } @@ -51,12 +51,14 @@ body { margin-bottom: 80px; } -#footer a:link { +#footer a { text-decoration: none; color: #8B3E2F; } #board { + display: block; + float: left; width: 640px; background-color: #fff; margin-bottom: 10px; @@ -64,19 +66,20 @@ body { } .square, .freesquare { - display: inline-block; + display: block; + float: left; overflow: hidden; + background-color: #fff; color: #313131; text-align: center; - width: 126px; - height: 126px; + width: 120px; + height: 120px; + padding: 3px; border: 1px solid #d1d1d1; transition-property: background-color; transition-duration: 1s; - /* Firefox 4 */ -moz-transition-property: background-color; -moz-transition-duration: 1s; - /* Safari and Chrome */ -webkit-transition-property: background-color; -webkit-transition-duration: 1s; } @@ -90,6 +93,7 @@ body { font-family: "HelveticaNeue-CondensedBold", sans-serif; vertical-align: middle; font-size: 1.4em; + line-height: 1.0em; } .small { @@ -109,7 +113,6 @@ body { background-color: red; } -/* Smartphones (portrait and landscape) ----------- */ @media only screen and (min-device-width : 320px) and (max-device-width : 480px) { @@ -131,6 +134,7 @@ and (max-device-width : 480px) { } .text { - font-size: 1.2em; + font-size: 1.6em; + line-height: 1.0em; } } \ No newline at end of file diff --git a/js/data.js b/js/data.js index e32f169..378529c 100644 --- a/js/data.js +++ b/js/data.js @@ -5,6 +5,10 @@ var footerText = "one"}, {"square": "two"}, diff --git a/js/script.js b/js/script.js index 3c9e80a..9a15eda 100644 --- a/js/script.js +++ b/js/script.js @@ -7,9 +7,6 @@ $(document).ready(function() { $('#footer').append(footerText); - var clickSnd = new Audio("audio/click.mp3"); - var winSnd = new Audio("audio/win.mp3"); - shuffle(JSONBingo.squares); for (i=0; i<24; i++) {