diff options
| author | Scott Ostler <sostler@deathmachine.home> | 2009-12-21 14:23:20 -0800 |
|---|---|---|
| committer | Scott Ostler <sostler@deathmachine.home> | 2009-12-21 14:23:20 -0800 |
| commit | c97fe699625b793e9a9d8f348a0af7a9a375a4cd (patch) | |
| tree | fa8ff2385103b0c10a55a3a0589868718923a5cc /static/index.html | |
| parent | 458a2627cc6600690fdf78e48b78cf17a6ea4469 (diff) | |
| parent | 7a1af322fa38e1205613bc4767de7cc59b74c69c (diff) | |
Merge branch 'master' of ssh://dump.fm/pichat/repo
Diffstat (limited to 'static/index.html')
| -rwxr-xr-x[-rw-r--r--] | static/index.html | 170 |
1 files changed, 170 insertions, 0 deletions
diff --git a/static/index.html b/static/index.html index 680e8b5..6cd58a8 100644..100755 --- a/static/index.html +++ b/static/index.html @@ -1,5 +1,11 @@ +<<<<<<< HEAD:static/index.html +</html> + +<head> +======= <html> <head> +>>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html <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> @@ -8,6 +14,165 @@ $(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 { + 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/brokenlinkk.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; + +} +======= <link rel="shortcut icon" href="static/favicon.ico"> <style type="text/css"> <!-- @@ -163,6 +328,7 @@ font-size:18px; } +>>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html --> @@ -222,4 +388,8 @@ <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 |