Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge will henson design and Chaney UI updates #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions _normalize.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/* HTML5 Boilerplate
* ==|== normalize.css ==========================================================
*/

article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; }
audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; }
audio:not([controls]) { display: none; }
[hidden] { display: none; }

html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
body { margin: 0; font-size: 13px; line-height: 1.231; }
body, button, input, select, textarea { font-family: sans-serif; color: #222; }

::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; }
::selection { background: #fe57a1; color: #fff; text-shadow: none; }

a { color: #00e; }
a:visited { color: #551a8b; }
a:hover { color: #06e; }
a:focus { outline: thin dotted; }
a:hover, a:active { outline: 0; }

abbr[title] { border-bottom: 1px dotted; }
b, strong { font-weight: bold; }
blockquote { margin: 1em 40px; }
dfn { font-style: italic; }
hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
ins { background: #ff9; color: #000; text-decoration: none; }
mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; }
pre, code, kbd, samp { font-family: monospace, monospace; _font-family: 'courier new', monospace; font-size: 1em; }
pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
q { quotes: none; }
q:before, q:after { content: ""; content: none; }
small { font-size: 85%; }
sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
sup { top: -0.5em; }
sub { bottom: -0.25em; }
ul, ol { margin: 0; padding: 0; }
dd { margin: 0 0 0 40px; }
nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0; }
img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; }
svg:not(:root) { overflow: hidden; }
figure { margin: 0; }

form { margin: 0; }
fieldset { border: 0; margin: 0; padding: 0; }
label { cursor: pointer; }
legend { border: 0; *margin-left: -7px; padding: 0; }
button, input, select, textarea { font-size: 100%; margin: 0; vertical-align: baseline; *vertical-align: middle; }
button, input { line-height: normal; *overflow: visible; }
table button, table input { *overflow: auto; }
button, input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; }
input[type="checkbox"], input[type="radio"] { box-sizing: border-box; }
input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
textarea { overflow: auto; vertical-align: top; resize: vertical; }
input:valid, textarea:valid { }
input:invalid, textarea:invalid { background-color: #f0dddd; }

table { border-collapse: collapse; border-spacing: 0; }
td { vertical-align: top; }

/* ==|== non-semantic helper classes ======================================== */
.ir { display: block; border: 0; text-indent: -999em; overflow: hidden; background-color: transparent; background-repeat: no-repeat; text-align: left; direction: ltr; }
.ir br { display: none; }
.hidden { display: none !important; visibility: hidden; }
.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
.visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; }
.invisible { visibility: hidden; }
128 changes: 32 additions & 96 deletions magtimer.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<!DOCTYPE html>
<!--
MAGFEST TIMER

INSTRUCTIONS:
1) download this HTML file
2) open it in a browser
<head>
<meta charset="utf-8">
<title>MAG Timer</title>

<link rel="stylesheet" type="text/css" href="timer.css">

</head>

<!--
// MAGFEST TIMER

DOM DIDN'T KNOW ABOUT JQUERY WHEN He WROTE THIS FOREVER AGO. HE SORRY.
license: TBD, for now don't sell this as a standalone program.
Expand Down Expand Up @@ -136,9 +141,9 @@
set_timer_display( g_current_time_left );

if (g_is_countdown_enabled) {
$("#start_stop_link").html("<b>[PAUSE]</b>");
$("#start_stop_link").html("<button>Pause</button>");
} else {
$("#start_stop_link").html("<b>[GO]</b>");
$("#start_stop_link").html("<button>GO!</button>");
}

if (g_is_countdown_enabled) {
Expand Down Expand Up @@ -372,96 +377,27 @@

</script>

<style type="text/css">
body
{
background: black;
color: red;
overflow: hidden;
font-family: Arial, sans-serif;
}

a, a:visited
{
color: grey;
}

a:hover, a.timeset:hover, a.controls:hover, a.about:hover
{
color: white;
}

a.timeset, a.about
{
color: grey;
}

a.controls
{
color: #CCCCCC;
}

#bigdisplay
{
margin: auto;
text-align: center;
vertical-align: middle;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
}

#timer
{
font-size:2000%;
font-size: 24vw;
font-weight: bold;
color:#ffffff
}

#msg
{
font-size:800%;
font-size: 8vw;
font-weight: bold;
color:#aaaaaa;
/*letter-spacing:-10px*/
}

footer.settings
{
font-size: small;
font-size: 2vw;
text-align: center;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
padding: 10px;
background: black;
color: grey;
}
</style>
<body>

<title>MAGFest Timer</title>
</head>
<header id="bigdisplay">
<span id="timer" class="clock">00:00:00</span>

<span id="msg" class="msg">SETUP TIME</span>
</header>

<footer class="settings">
<div class="leftfoot">
<a href="javascript:void(0)" onclick="prompt_for_setup_time();"><button>Set Setup Time</button></a>
<a href="javascript:void(0)" onclick="prompt_for_play_time();"><button>Set Playing Time</button></a>
</div><!-- /leftfoot -->
<div class="rightfoot">
<a href="javascript:void(0)" id="start_stop_link" onclick="toggle_countdown();"><button>GO!</button></a>
<br />
<a href="javascript:void(0)" onclick="reset_timers();"><button>RESET</button></a>
<a href="javascript:void(0)" onclick="switch_to_play_timer();"><button>SKIP SETUP</button></a>
</div><!-- /rightfoot -->
<!--Magfest Timer (c) 2011 Dominic Cerquetti v1.1 7/23/11 | Setup(min)=<span id="setup_time">X</span> | Play(min)=<span id="play_time">X</span>-->
</footer>

<body>
<div id="bigdisplay">
<span id="timer">00:00:00</span>
<br>
<span id="msg">SETUP TIME</span>
</div>

<footer class="settings">
<a href="javascript:void(0)" title="Set setup time [1]" class="timeset" onclick="prompt_for_setup_time();">Setup Time = <b><span id="setup_time">X</span> min</b></a> &bull;
<a href="javascript:void(0)" title="Set play time [2]" class="timeset" onclick="prompt_for_play_time();">Playing Time = <b><span id="play_time">X</span> min</b></a> &bull;
<a href="javascript:void(0)" title="Start/Stop [space]" class="controls" id="start_stop_link" onclick="toggle_countdown();"><b>GO!</b></a> &bull;
<a href="javascript:void(0)" title="Reset timer [R]" class="controls" id="reset_link" onclick="reset_timers();"><b>[RESET]</b></a> &bull;
<a href="javascript:void(0)" title="Skip setup [S]" class="controls" id="skip_link" onclick="switch_to_play_timer();"><b>[SKIP SETUP]</b></a> &bull;
<a href="javascript:alert('&copy; 2014 MAGFest\nOriginally by Dominic Cerquetti 7/23/11\nEnhancements by Will Henson 2014');" title="About MAGFest Timer" class="about">MAGFest Timer</a>
</footer>
</body>
</html>
Loading