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 /template/preload.st | |
| parent | 4f09c8a882e8ae2ad1c7944a8c2a5939c9c9f7ad (diff) | |
| parent | 42df4633bb7588e8632e45013880ee4fc2bc3d6c (diff) | |
fixing merge conflicts
Diffstat (limited to 'template/preload.st')
| -rw-r--r-- | template/preload.st | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/template/preload.st b/template/preload.st index 8963e70..3339e4e 100644 --- a/template/preload.st +++ b/template/preload.st @@ -1,13 +1,13 @@ <!-- todo: just put this lot in javascript? --> <div id="preload"> <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big" /> - <img src="/static/upload.png" class="invisible" /> - <img src="/static/dblue2.png" class="invisible" /> -<img src="/static/text.gif" class="invisible" /> -<img src="/static/directory.gif" class="invisible" /> -<img src="/static/image_draw.gif" class="invisible" /> -<img src="/static/door2.gif" class="invisible" /> -<img src="/static/cambutton.png" class="invisible" /> -<img src="/static/urlbutton.png" class="invisible" /> -<img src="/static/upbutton.png" class="invisible" /> + <img src="/static/img/upload.png" class="invisible" /> + <img src="/static/img/dblue2.png" class="invisible" /> +<img src="/static/img/log.gif" class="invisible" /> +<img src="/static/img/directory.gif" class="invisible" /> +<img src="/static/img/image_draw.gif" class="invisible" /> +<img src="/static/img/door.gif" class="invisible" /> +<img src="/static/img/cambutton.png" class="invisible" /> +<img src="/static/img/urlbutton.png" class="invisible" /> +<img src="/static/img/upbutton.png" class="invisible" /> </div>
\ No newline at end of file |