summaryrefslogtreecommitdiff
path: root/theme/default/display.css
diff options
context:
space:
mode:
authorEvan Prodromou <git@evanprodromou.name>2009-01-23 08:58:31 +0100
committerEvan Prodromou <git@evanprodromou.name>2009-01-23 08:58:31 +0100
commita7c85bebd5be9ea019a8c80d74730d7eb28d4651 (patch)
treec3fdf9575a342624bc71aad1d439ae73594f558c /theme/default/display.css
parent4873277b58941ae6ec16543f437f4267ccab5ac0 (diff)
parent7aa496cd8a939960eeaf79f3397f6fe94097e047 (diff)
Merge branch 'master' of /var/www/mublog
Conflicts: actions/api.php actions/deletenotice.php actions/recoverpassword.php actions/remotesubscribe.php actions/tag.php actions/tagrss.php actions/twitapiaccount.php actions/twitapiusers.php classes/Notice.php classes/User.php lib/common.php lib/language.php lib/subs.php lib/twitterapi.php lib/util.php scripts/inbox_users.php scripts/update_translations.php Merged development trunk into laconica head. woohoo!
Diffstat (limited to 'theme/default/display.css')
-rw-r--r--theme/default/display.css26
1 files changed, 26 insertions, 0 deletions
diff --git a/theme/default/display.css b/theme/default/display.css
index 0b894550c..f22f9aa69 100644
--- a/theme/default/display.css
+++ b/theme/default/display.css
@@ -440,6 +440,32 @@ p.time a {
float: left;
margin: 0 10px 18px 0;
}
+
+#profilesettings {
+ margin-bottom:2em;
+}
+
+
+.avatar_view {
+ float:left;
+ margin-bottom:1em;
+ margin-right:1em;
+}
+
+#avatar_preview_view {
+ overflow:hidden;
+ width:96px;
+ height:96px;
+}
+#avatar_crop {
+ margin-bottom:2em;
+}
+
+#avatar_crop,
+#avatarfile {
+ clear:both;
+}
+
a.nickname {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight: bold;