22 files changed, 93 insertions, 154 deletions

diff --git a/theme/base/images/icons/clip-big.png b/theme/base/images/icons/clip-big.png
new file mode 100644
index 000000000..3945f56cc
--- /dev/null
+++ b/theme/base/images/icons/clip-big.png
diff --git a/theme/base/images/icons/clip.png b/theme/base/images/icons/clip.png
new file mode 100644
index 000000000..3c5a17d18
--- /dev/null
+++ b/theme/base/images/icons/clip.png
diff --git a/theme/biz/logo.png b/theme/biz/logo.png
index 7c68b34f6..fdead6c4a 100644
--- a/theme/biz/logo.png
+++ b/theme/biz/logo.png
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index b87722eec..e97889685 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -12,7 +12,7 @@ img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
 table { border-collapse:collapse; }
 ol { list-style-position:inside; }
-html { font-size: 100%; background-color:#fff; height:100%; }
+html { font-size: 100%; background-color:#fff; }
 body {
 background-color:#fff;
 color:#000;
@@ -126,7 +126,7 @@ margin-left:0;
 
 .form_settings label {
 margin-top:2px;
-width:145px;
+width:143px;
 }
 
 .form_actions label {
diff --git a/theme/cloudy/default-avatar-mini.png b/theme/cloudy/default-avatar-mini.png
index c0f1d411f..4fd8bd9e1 100644
--- a/theme/cloudy/default-avatar-mini.png
+++ b/theme/cloudy/default-avatar-mini.png
diff --git a/theme/cloudy/default-avatar-profile.png b/theme/cloudy/default-avatar-profile.png
index 9f281f94f..eb08571d9 100644
--- a/theme/cloudy/default-avatar-profile.png
+++ b/theme/cloudy/default-avatar-profile.png
diff --git a/theme/cloudy/default-avatar-stream.png b/theme/cloudy/default-avatar-stream.png
index 8d505871c..926b8a9ca 100644
--- a/theme/cloudy/default-avatar-stream.png
+++ b/theme/cloudy/default-avatar-stream.png
diff --git a/theme/cloudy/logo.png b/theme/cloudy/logo.png
index 7c68b34f6..fdead6c4a 100644
--- a/theme/cloudy/logo.png
+++ b/theme/cloudy/logo.png
diff --git a/theme/earthy/logo.png b/theme/earthy/logo.png
deleted file mode 100644
index 7c68b34f6..000000000
--- a/theme/earthy/logo.png
+++ /dev/null
diff --git a/theme/earthy/css/base.css b/theme/h4ck3r/css/base.css
index 6f46eef97..5060bbb8b 100644
--- a/theme/earthy/css/base.css
+++ b/theme/h4ck3r/css/base.css
@@ -1,4 +1,4 @@
-/** theme: earthy base
+/** theme: h4ck3r base
  *
  * @package   Laconica
  * @author Sarven Capadisli <csarven@controlyourself.ca>
@@ -12,7 +12,7 @@ img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
 table { border-collapse:collapse; }
 ol { list-style-position:inside; }
-html { background-color:#fff; height:100%; }
+html { font-size: 100%; background-color:#fff; height:100%; }
 body {
 background-color:#fff;
 color:#000;
@@ -28,7 +28,6 @@ overflow:hidden;
 h1 {
 font-size:1.4em;
 margin-bottom:18px;
-text-align:right;
 }
 #showstream h1 { display:none; }
 h2 { font-size:1.3em; }
@@ -52,9 +51,6 @@ font-size:1em;
 input, textarea, select {
 border-width:2px;
 border-style: solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 }
 
 input.submit {
@@ -87,10 +83,7 @@ border:0;
 
 .error,
 .success {
-padding:4px 7px;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
+padding:4px 1.55%;
 margin-bottom:18px;
 }
 form label.submit {
@@ -192,9 +185,6 @@ margin-left:0;
 }
 
 .form_settings .form_note {
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 padding:0 7px;
 }
 
@@ -249,11 +239,11 @@ display:none;
 }
 
 #site_notice {
-position:absolute;
-top:65px;
-right:18px;
-width:250px;
-width:24%;
+float:left;
+clear:right;
+margin-top:7px;
+margin-right:18px;
+width:31%;
 }
 #page_notice {
 clear:both;
@@ -262,17 +252,17 @@ margin-bottom:18px;
 
 
 #anon_notice {
-float:left;
-width:43.2%;
+float:right;
+clear:right;
+width:41.2%;
 padding:1.1%;
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
 border-width:2px;
-border-style:solid;
+border-style:dashed;
 line-height:1.5;
 font-size:1.1em;
 font-weight:bold;
+-moz-transform:skewX(-30deg) scale(0.85);
+-webkit-transform:skewX(-30deg) scale(0.85);
 }
 
 
@@ -283,6 +273,7 @@ padding:18px;
 }
 
 #site_nav_local_views {
+width:100%;
 float:right;
 }
 #site_nav_local_views dt {
@@ -297,12 +288,8 @@ list-style-type:none;
 float:left;
 text-decoration:none;
 padding:4px 11px;
--moz-border-radius-topleft:4px;
--moz-border-radius-topright:4px;
--webkit-border-top-left-radius:4px;
--webkit-border-top-right-radius:4px;
 border-width:1px;
-border-style:solid;
+border-style:dashed;
 border-bottom:0;
 text-shadow: 2px 2px 2px #ddd;
 font-weight:bold;
@@ -310,8 +297,6 @@ font-weight:bold;
 #site_nav_local_views .nav {
 float:left;
 width:100%;
-border-bottom-width:1px;
-border-bottom-style:solid;
 }
 
 #site_nav_global_primary dt,
@@ -387,15 +372,15 @@ margin-bottom:1em;
 }
 
 #content {
-width:63.009%;
+width:60.009%;
 min-height:259px;
-padding-top:1.795%;
-padding-bottom:1.795%;
+padding:1.795%;
 float:right;
-clear:both;
-border-radius:7px;
-border-style:solid;
-border-width:0;
+border-style:dashed;
+border-width:1px;
+}
+#shownotice #content {
+min-height:0;
 }
 
 #content_inner {
@@ -409,33 +394,27 @@ width:27.917%;
 min-height:259px;
 float:right;
 margin-right:4.385%;
-margin-top:73px;
 padding:1.795%;
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
 border-width:1px;
-border-style:solid;
+border-style:dashed;
 }
 
 #form_notice {
-width:45.664%;
-float:left;
+width:43.664%;
+float:right;
 position:relative;
 line-height:1;
 }
 #form_notice fieldset {
 border:0;
 padding:0;
+position:relative;
 }
 #form_notice legend {
 display:none;
 }
 #form_notice textarea {
 float:left;
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
 width:80.789%;
 height:67px;
 line-height:1.5;
@@ -481,7 +460,13 @@ margin-bottom:7px;
 margin-left:18px;
 float:left;
 }
-
+#form_notice .error {
+float:left;
+clear:both;
+width:96.9%;
+margin-bottom:0;
+line-height:1.618;
+}
 
 /* entity_profile */
 .entity_profile {
@@ -715,32 +700,18 @@ margin-right:11px;
 .notice,
 .profile {
 position:relative;
+padding-top:11px;
+padding-bottom:11px;
 clear:both;
 float:left;
 width:100%;
-border-width:1px;
-border-style:solid;
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-}
-#content .notice,
-#content .profile {
-padding:1.795%;
-margin-bottom:44px;
+border-top-width:1px;
+border-top-style:dashed;
 }
-#content .notice {
-width:96.25%;
-}
-
 .notices li {
 list-style-type:none;
 }
-.notices li.hover {
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
+
 
 /* NOTICES */
 #notices_primary {
@@ -770,16 +741,14 @@ overflow:hidden;
 font-weight:bold;
 }
 
-.notice .author .photo {
-margin-bottom:0;
-}
-
 .vcard .photo {
 display:inline;
 margin-right:11px;
-margin-bottom:11px;
 float:left;
 }
+#shownotice .vcard .photo {
+margin-bottom:4px;
+}
 .vcard .url {
 text-decoration:none;
 }
@@ -788,7 +757,7 @@ text-decoration:underline;
 }
 
 .notice .entry-title {
-float:left;
+display:inline;
 width:100%;
 overflow:hidden;
 }
@@ -812,14 +781,9 @@ border-radius:4px;
 }
 
 .notice div.entry-content {
-clear:left;
 float:left;
 font-size:0.95em;
-margin-left:59px;
-width:70%;
-}
-#showstream .notice div.entry-content {
-margin-left:0;
+width:65%;
 }
 
 .notice .notice-options a,
@@ -846,23 +810,6 @@ text-transform:lowercase;
 }
 
 
-
-.notice-data {
-position:absolute;
-top:18px;
-right:0;
-min-height:50px;
-margin-bottom:4px;
-}
-.notice .entry-content .notice-data dt {
-display:none;
-}
-
-.notice-data a {
-display:block;
-outline:none;
-}
-
 .notice-options {
 padding-left:2%;
 float:left;
@@ -1040,6 +987,8 @@ padding-right:30px;
 .hentry .entry-content p {
 margin-bottom:18px;
 }
+.system_notice ul,
+.instructions ul,
 .hentry entry-content ol,
 .hentry .entry-content ul {
 list-style-position:inside;
diff --git a/theme/earthy/css/display.css b/theme/h4ck3r/css/display.css
index b67700f2d..c7631a8eb 100644
--- a/theme/earthy/css/display.css
+++ b/theme/h4ck3r/css/display.css
@@ -1,4 +1,4 @@
-/** theme: earthy
+/** theme: h4ck3r
  *
  * @package   Laconica
  * @author Sarven Capadisli <csarven@controlyourself.ca>
@@ -12,26 +12,27 @@
 html,
 body,
 a:active {
-background-color:#665500;
+background-color:#000;
 }
+
 body {
-font-family: Verdana, sans-serif;
+background-image:url(../images/illustrations/illu_h4x0r1ng.gif);
+font-family: monospace;
 font-size:1em;
+color:#647819;
 }
 address {
 margin-right:7.18%;
 }
 
-h1 {
-color:#fff;
-}
-
 input, textarea, select, option {
-font-family: Verdana, sans-serif;
+font-family:  monospace;
 }
 input, textarea, select,
 .entity_remote_subscribe {
 border-color:#aaa;
+background-color:#000;
+color:#ccc;
 }
 #filter_tags ul li {
 border-color:#ddd;
@@ -45,7 +46,7 @@ input.submit,
 #form_notice.warning #notice_text-count,
 .form_settings .form_note,
 .entity_remote_subscribe {
-background-color:#9BB43E;
+background-color:rgba(0, 255, 0, 0.5);
 }
 
 input:focus, textarea:focus, select:focus,
@@ -54,7 +55,7 @@ border-color:#9BB43E;
 }
 input.submit,
 .entity_remote_subscribe {
-color:#dddd33;
+color:#fff;
 }
 
 a,
@@ -65,57 +66,45 @@ div.notice-options input,
 .form_user_nudge input.submit,
 .entity_nudge p,
 .form_settings input.form_action-secondary {
-color:#ee4400;
+color:#0f0;
 }
 
 .notice,
 .profile {
-border-color:#DDAA00;
+border-top-color:#333;
 }
 .section .profile {
-border-top-color:#aaaa66;
-}
-
-#content .notice p.entry-content a:visited {
-background-color:#fcfcfc;
-}
-#content .notice p.entry-content .vcard a {
-background-color:#fcfffc;
+border-top-color:#87B4C8;
 }
 
 #aside_primary {
-background-color:#DDAA00;
+background-color:rgba(0,128,0,0.3);
 }
 
 #notice_text-count {
-color:#333;
+color:#0f0;
 }
 #form_notice.warning #notice_text-count {
 color:#000;
 }
 #form_notice.processing #notice_action-submit {
-background:#dddd33 url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+background:#ccc url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
 }
 
 #content,
-#site_nav_local_views .nav,
 #site_nav_local_views a,
 #aside_primary {
-border-color:#dddd33;
-}
-#content .notice,
-#content .profile,
-#site_nav_local_views .current a {
-background-color:#dddd33;
+border-color:#50964D;
 }
+#content,
 #site_nav_local_views .current a {
-color:#EE4400;
+background-color:rgba(0, 0, 0, 0.698);
 }
+
 #site_nav_local_views a {
-background-color:rgba(255, 255, 255, 0.2);
-color:#fff;
+background-color:rgba(0, 200, 0, 0.3);
 }
 #site_nav_local_views a:hover {
 background-color:rgba(255, 255, 255, 0.4);
@@ -129,13 +118,11 @@ background-color:#EFF3DC;
 }
 
 #anon_notice {
-background-color:#aaaa66;
-color:#dddd33;
-border-color:#dddd33;
+color:#ccc;
+border-color:#50964D;
 }
 
 #showstream #anon_notice {
-background-color:#9BB43E;
 }
 
 #export_data li a {
@@ -167,12 +154,12 @@ background-color:transparent;
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
 background-color:#9BB43E;
-color:#dddd33;
+color:#ccc;
 }
 .form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
 .form_user_authorization input.reject {
-background-color:#aaaa66;
+background-color:#87B4C8;
 }
 
 .entity_edit a {
@@ -221,15 +208,13 @@ opacity:0.4;
 opacity:1;
 }
 div.entry-content {
-color:#333;
+color:#ccc;
 }
 div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
-.notices li.hover {
-/*background-color:#fcfcfc;*/
-}
+
 /*END: NOTICES */
 
 #new_group a {
@@ -239,7 +224,7 @@ background:transparent url(../../base/images/icons/twotone/green/news.gif) no-re
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
-border-color:#DDAA00;
+border-color:#000;
 }
 .pagination .nav_prev a {
 background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
diff --git a/theme/earthy/css/ie.css b/theme/h4ck3r/css/ie.css
index 2f463bb44..2f463bb44 100644
--- a/theme/earthy/css/ie.css
+++ b/theme/h4ck3r/css/ie.css
diff --git a/theme/earthy/default-avatar-mini.png b/theme/h4ck3r/default-avatar-mini.png
index 38b8692b4..38b8692b4 100644
--- a/theme/earthy/default-avatar-mini.png
+++ b/theme/h4ck3r/default-avatar-mini.png
diff --git a/theme/earthy/default-avatar-profile.png b/theme/h4ck3r/default-avatar-profile.png
index f8357d4fc..f8357d4fc 100644
--- a/theme/earthy/default-avatar-profile.png
+++ b/theme/h4ck3r/default-avatar-profile.png
diff --git a/theme/earthy/default-avatar-stream.png b/theme/h4ck3r/default-avatar-stream.png
index 6b63baa70..6b63baa70 100644
--- a/theme/earthy/default-avatar-stream.png
+++ b/theme/h4ck3r/default-avatar-stream.png
diff --git a/theme/h4ck3r/images/illustrations/illu_h4x0r1ng.gif b/theme/h4ck3r/images/illustrations/illu_h4x0r1ng.gif
new file mode 100644
index 000000000..c233af391
--- /dev/null
+++ b/theme/h4ck3r/images/illustrations/illu_h4x0r1ng.gif
diff --git a/theme/h4ck3r/logo.png b/theme/h4ck3r/logo.png
new file mode 100644
index 000000000..fdead6c4a
--- /dev/null
+++ b/theme/h4ck3r/logo.png
diff --git a/theme/otalk/css/base.css b/theme/otalk/css/base.css
index 379590d30..32e8891d2 100644
--- a/theme/otalk/css/base.css
+++ b/theme/otalk/css/base.css
@@ -12,7 +12,7 @@ img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
 table { border-collapse:collapse; }
 ol { list-style-position:inside; }
-html { font-size: 87.5%; background-color:#fff; height:100%; }
+html { font-size: 87.5%; background-color:#fff; }
 body {
 background-color:#fff;
 color:#000;
@@ -386,12 +386,12 @@ margin-bottom:1em;
 }
 
 #content {
-width:100%;
+width:67.9%;
 min-height:259px;
 padding-top:1.795%;
 padding-bottom:1.795%;
-
 float:left;
+clear:left;
 border-radius:7px;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
@@ -409,11 +409,11 @@ float:left;
 }
 
 #aside_primary {
-width:96.3%;
+width:27.917%;
 min-height:259px;
 float:left;
-clear:both;
 padding:1.795%;
+margin-left:0.385%;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -730,7 +730,7 @@ list-style-type:none;
 }
 
 #content .notice {
-width:25%;
+width:37%;
 margin-left:17px;
 margin-bottom:47px;
 clear:none;
@@ -743,6 +743,10 @@ min-height:235px;
 margin-bottom:18px;
 }
 
+#shownotice #content .notice {
+width:96%;
+}
+
 
 /* NOTICES */
 #notices_primary {
diff --git a/theme/otalk/css/display.css b/theme/otalk/css/display.css
index 22e0530ec..6c646791b 100644
--- a/theme/otalk/css/display.css
+++ b/theme/otalk/css/display.css
@@ -15,7 +15,6 @@ html {
 html,
 body,
 a:active {
-/*background-color:#F0F2F5;*/
 }
 body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
diff --git a/theme/otalk/logo.png b/theme/otalk/logo.png
index 7c68b34f6..fdead6c4a 100644
--- a/theme/otalk/logo.png
+++ b/theme/otalk/logo.png
diff --git a/theme/pigeonthoughts/logo.png b/theme/pigeonthoughts/logo.png
index 7c68b34f6..fdead6c4a 100644
--- a/theme/pigeonthoughts/logo.png
+++ b/theme/pigeonthoughts/logo.png
diff --git a/theme/readme.txt b/theme/readme.txt
index 4998b3c98..83b5a61d0 100644
--- a/theme/readme.txt
+++ b/theme/readme.txt
@@ -23,14 +23,16 @@ Only alter this file if you want to change the layout of the site. Please note t
 ./default/css/display.css contains only the background images and colour rules:
 This file is a good basis for creating your own theme.
 
+Let's create a theme:
 
-1. Copy over the default theme to start off (replace 'mytheme'):
-cp -r ./default ./mytheme
+1. To start off, copy over the default theme:
+cp -r default mytheme
 
 2. Edit your mytheme stylesheet:
-nano ./mytheme/css/display.css
+nano mytheme/css/display.css
 
-3. Search and replace a colour or a path to the background image of your choice.
+a) Search and replace your colours and background images, or
+b) Create your own layout either importing a separate stylesheet (e.g., change to @import url(base.css);) or simply place it before the rest of the rules.
 
 4. Set /config.php to load 'mytheme':
 $config['site']['theme'] = 'mytheme';