summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--public/css/sublab.css5
-rw-r--r--public/img/topimage.pngbin0 -> 410931 bytes
2 files changed, 4 insertions, 1 deletions
diff --git a/public/css/sublab.css b/public/css/sublab.css
index 600e3bf..05ed3e3 100644
--- a/public/css/sublab.css
+++ b/public/css/sublab.css
@@ -53,7 +53,10 @@ div.image {
margin-left: 125px;
border: 1px solid #444;
height: 150px;
- background: #000 url(../img/topimage.jpg) no-repeat left bottom;
+<<<<<<< HEAD
+ background: #000 url(../img/topimage.png) no-repeat left center;
+=======
+>>>>>>> cf403925786976a937b5fd33b7eacf7598009c47
}
div.menu {
diff --git a/public/img/topimage.png b/public/img/topimage.png
new file mode 100644
index 0000000..b7707b7
--- /dev/null
+++ b/public/img/topimage.png
Binary files differ