diff options
| author | Scott Ostler <sostler@deathmachine.home> | 2009-12-21 20:50:11 -0800 |
|---|---|---|
| committer | Scott Ostler <sostler@deathmachine.home> | 2009-12-21 20:50:11 -0800 |
| commit | c32ed3d3f5623899d0b0d6c74daca106be26dae0 (patch) | |
| tree | a430a7c1940f17209d39bccf9b06b982cc090392 /static/index.html | |
| parent | 0b32421496d87714a9519cd7189fa4a48fb07020 (diff) | |
| parent | c59927b378092f437896381698ebc8d4a4243492 (diff) | |
Merge branch 'master' of ssh://dump.fm/pichat/repo
Diffstat (limited to 'static/index.html')
| -rwxr-xr-x | static/index.html | 234 |
1 files changed, 38 insertions, 196 deletions
diff --git a/static/index.html b/static/index.html index 6cd58a8..a4f41fa 100755 --- a/static/index.html +++ b/static/index.html @@ -1,23 +1,17 @@ -<<<<<<< HEAD:static/index.html -</html> - -<head> -======= -<html> - <head> ->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html +</html><head> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> <script type="text/javascript" src="static/sha1.js"></script> <script type="text/javascript" src="static/home.js"></script> - <script type="text/javascript" src="static/background.js"></script> + <script type="text/javascript" src="static/background.js"></script> <script> $(document).ready(initHome); </script> <link rel="stylesheet" type="text/css" href="static/reset.css"> -<<<<<<< HEAD:static/index.html <link rel="shortcut icon" href="static/favicon.ico"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>dump.fm</title></head> + + <style type="text/css"> <!-- .white a:link { @@ -154,10 +148,13 @@ body { .feild { height:40px; width:300px; - border:3px #ccc; + border:3px #000; background:#e3e3e3; margin:10px; + color:#000; + font-size:30px; + } .txt { font-family:Arial, Helvetica, sans-serif; @@ -172,188 +169,31 @@ body { font-size:18px; } -======= - <link rel="shortcut icon" href="static/favicon.ico"> - <style type="text/css"> - <!-- - .white a:link { - text-decoration: none; - text-shadow: -1px 1px 1px #ccc; - color: #504F61; - } - .white a:visited { - text-decoration: none; - text-shadow: -1px 1px 1px #ccc; - color: #504F61; - } - .white a:hover { - text-decoration: none; - text-shadow: -1px 1px 1px #ccc; - background-color:#e3e3e3; - - color: #fff; - } - .white a:active { - text-decoration: none; - text-shadow: -1px 1px 1px #ccc; - color: #504F61; - } - #header7{ - background-color:#666; - background-image:url(/static/dblue2.png); - background-attachment:fixed; - margin: 0px auto -1px auto; - top: 0px; - width:100%; - left: 0px; - height: 60px; - } - #bar7{ - top:32px; - position:absolute; - font-family: Arial, Helvetica, sans-serif; - font-weight: bold; - width: 500px; - font-size: 20px; - left: 170px; - margin-left: 10%; - margin-right: 8%; - letter-spacing: -1px; - z-index: 999; - } - #main { - background-position:center; - width:500px; - margin: 0px auto -1px auto; - top:150px; - height:380px; - z-index:2; - opacity:0.9; - border-top-left-radius:10px; - border-top-right-radius:10px; - -webkit-border-top-left-radius:10px; - -webkit-border-top-right-radius:10px; - -moz-border-radius-topleft:10px; - -moz-border-radius-topright:10px; - border-bottom-left-radius:10px; - border-bottom-right-radius:10px; - -webkit-border-bottom-left-radius:10px; - -webkit-border-bottom-right-radius:10px; - -moz-border-radius-bottomleft:10px; - -moz-border-radius-bottomright:10px; - border:solid 4px #F5F5F5; - position: relative; - background-color: #FFF; - background-position:center; - background-repeat:no-repeat; - } - #logout7{ - top:5px; - position:relative; - font-size:13px; - margin-right: 10px; - float:right; - z-index: 999; - font-family: "Times New Roman", Times, serif; - } - #logo7{ - top:20px; - margin-left: 10%; - margin-right: 10%; - z-index:1000; - float:left; - } - #rapper7{ - top: 0px; - left:0px; - position:absolute; - width: 100%; - height: 78px; - z-index: 1000; - } - #bottombar{ - top: 69px; - left:0px; - position:absolute; - width: 100%; - height: 20px; - z-index: 1000; - } - p { - font-family: Arial, Helvetica, sans-serif; - font-size: 24px; - } - td { - font-family: Arial, Helvetica, sans-serif; - letter-spacing:-1px; - font-size: 12px; - color: #000000; - } - .btnav { border: 0px #000000 solid;} - body { - - background-color:#e3e3e3; - - background-image:url(static/brokenlink.gif); - background-position:center; - - background-repeat:no-repeat; - overflow:hidden; - } - .submit { - - - text-shadow: -1px 1px 1px #ccc; - - font-size:15px; - } - .feild { - height:40px; - width:300px; - border:3px #ccc; - background:#e3e3e3; - margin:10px; - font-size:30px; - } - .txt { - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-shadow: -1px 1px 1px #ccc; - } - .line { - font-family:Arial, Helvetica, sans-serif; - - letter-spacing: -1px; - color:#000; - font-size:18px; - - } ->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html - +#nickInput {color:#000; +} - --> - </style> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - </head> - <body> - <div id="rapper7"> - <div id="header7"> +--> +</style> - <div id="bottombar"></div> - <div align="center"> - <p><img src="static/wordlogo2.gif" width="500" height="239"><br> - </p> - </div> - <div class="white"></div> - <div align="center"><br /></div> - </div> +<body> +<div id="rapper7"> +<div id="header7"> + <div id="bottombar"></div> + <div align="center"> + <p><img src="static/wordlogo2.gif" width="500" height="239"><br> + </p> </div> + + <div class="white"></div> + <div align="center"><br /></div> +</div> +</div> </div> <div id="main" align="center"> - <p align="center"><br /> + <p align="center"><br /> </p> <div id="registerbox"> <p align="right" class="line"> </p> @@ -362,10 +202,16 @@ body { <h1 align="center"> </h1> <h1 align="center"><br /> u - <input type="text" class="feild"id="nickInput" size="17" /> + <input type="text" class="feild"id="nickInput" size="17" name="txt" value="username" +onfocus="if(this.beenchanged!=true){ this.value = ''}" +onblur="if(this.beenchanged!=true) { this.value='username' }" +onchange="this.beenchanged = true;"/> <br /> p - <input type="password" class="feild" id="passwordInput" size="17" /> + <input type="password" class="feild" id="passwordInput" size="17"name="txt" value="password" +onfocus="if(this.beenchanged!=true){ this.value = ''}" +onblur="if(this.beenchanged!=true) { this.value='passwordpasswordd' }" +onchange="this.beenchanged = true;"/> </h1> <h1 align="center"> <br /> <input type="submit" class="submit" id="loginSubmit" value="Log In" /> @@ -373,23 +219,19 @@ body { <p align="center"> </p> <p> </p> <div align="right" class="txt"> - <div align="center"><span class="txt"><a href="/register" class="txt">Register</a></span></div> + <div align="center"><span class="txt"><a href="http://dump.fm/register" class="txt">Register</a></span></div> </div> <div align="center"> </div> </div> </div> -</div></div> + </div></div> </div> -</h1> -</div> + </h1> + </div> </div> <div style="position: fixed; bottom: 3px; right: 3px; font-size: xx-small; z-index: 10;"><button onclick="getBackground()" title="Rotate background image" style="font-size: xx-small;">+</button></div> </body> -<<<<<<< HEAD:static/index.html -</html> -======= -</html> ->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html +</html>
\ No newline at end of file |