diff options
| author | tim b <timb@camcompu.home> | 2010-04-07 18:59:50 -0700 |
|---|---|---|
| committer | tim b <timb@camcompu.home> | 2010-04-07 18:59:50 -0700 |
| commit | 6440348618ade4fbcb541c40473074833a47d198 (patch) | |
| tree | 537ab7e4f0af7deba51bbfb360fe490968d651f8 /static/css/header.css | |
| parent | 4f09c8a882e8ae2ad1c7944a8c2a5939c9c9f7ad (diff) | |
| parent | 42df4633bb7588e8632e45013880ee4fc2bc3d6c (diff) | |
fixing merge conflicts
Diffstat (limited to 'static/css/header.css')
| -rwxr-xr-x | static/css/header.css | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/static/css/header.css b/static/css/header.css index e3a3653..2e6a3e6 100755 --- a/static/css/header.css +++ b/static/css/header.css @@ -35,7 +35,7 @@ margin-right:80%; } #header7{ - background-image:url(/static/dblue2.png); + background-image:url(/static/img/dblue2.png); background-attachment:inherit; margin: 0px auto -1px auto; top: 0px; @@ -157,7 +157,6 @@ color:#fff; top:0px; position:absolute; font-family: Arial, Helvetica, sans-serif; - background-image:url(/static/20bar7.ng); font-size: 12px; height:30; word-spacing:2; @@ -257,7 +256,7 @@ font-weight:bold; #cursor-big { position: absolute; z-index: 1000; } #iesucks{ -background-image:url(/static/ieburnbtn.gif); font-size:40;color:white;height:100%;width:100%;z-index:1000000000000000000000000000000;padding-top:100; +background-image:url(/static/img/ieburnbtn.gif); font-size:40;color:white;height:100%;width:100%;z-index:1000000000000000000000000000000;padding-top:100; padding-right:400;padding-left:50; font-weight:bold; |