diff options
| author | Mark Pemberton <mpemberton5@gmail.com> | 2011-06-04 00:38:07 -0400 |
|---|---|---|
| committer | Mark Pemberton <mpemberton5@gmail.com> | 2011-06-04 00:38:07 -0400 |
| commit | b628e63e015bc3b2eadc712feaa6c4d05cf75bbd (patch) | |
| tree | ebdcec5c8133a3b6f86d06dc3f6fb3de46609f04 /www/themes/testdummy | |
| parent | 84e603aa91a303a1419962ff3ff6086710a7b1a9 (diff) | |
| parent | 4c8a53c5bc632302aaf8978e711eb53a03166db5 (diff) | |
| download | semanticscuttle-b628e63e015bc3b2eadc712feaa6c4d05cf75bbd.tar.gz semanticscuttle-b628e63e015bc3b2eadc712feaa6c4d05cf75bbd.tar.bz2 | |
Merge branch 'master' into privatekey2
Conflicts:
data/templates/default/bookmarks.tpl.php
Diffstat (limited to 'www/themes/testdummy')
| -rw-r--r-- | www/themes/testdummy/images/logo.png | bin | 0 -> 2890 bytes | |||
| -rw-r--r-- | www/themes/testdummy/scuttle.css | 12 |
2 files changed, 12 insertions, 0 deletions
diff --git a/www/themes/testdummy/images/logo.png b/www/themes/testdummy/images/logo.png Binary files differnew file mode 100644 index 0000000..4a8f8ba --- /dev/null +++ b/www/themes/testdummy/images/logo.png diff --git a/www/themes/testdummy/scuttle.css b/www/themes/testdummy/scuttle.css new file mode 100644 index 0000000..c62cd19 --- /dev/null +++ b/www/themes/testdummy/scuttle.css @@ -0,0 +1,12 @@ +@import url(../default/scuttle.css); + +body { + background-color: #FEA; +} + +html > body h1 { + background: url('images/logo.png') no-repeat 10px; +} +div#header { + background: #FEA; +} |
