8 files changed, 131 insertions, 161 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d9dca9815..a6a93c405 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -93,14 +93,17 @@ border-radius:4px;
 -webkit-border-radius:4px;
 margin-bottom:18px;
 }
+
+.xoxo li {
+list-style-type:none;
+}
+
 form label.submit {
 display:none;
 }
-
 .form_settings {
 clear:both;
 }
-
 .form_settings fieldset {
 margin-bottom:29px;
 }
@@ -432,21 +435,21 @@ border-width:1px;
 border-style:solid;
 }
 
-#form_notice {
+.form_notice {
 width:45%;
 float:left;
 position:relative;
 line-height:1;
 }
-#form_notice fieldset {
+.form_notice fieldset {
 border:0;
 padding:0;
 position:relative;
 }
-#form_notice legend {
+.form_notice legend {
 display:none;
 }
-#form_notice textarea {
+.form_notice textarea {
 float:left;
 border-radius:7px;
 -moz-border-radius:7px;
@@ -458,44 +461,44 @@ padding:7px 7px 16px 7px;
 position:relative;
 z-index:2;
 }
-#form_notice label {
+.form_notice label {
 display:block;
 float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach],
-#form_notice #notice_data-attach {
+.form_notice label[for=notice_data-attach],
+.form_notice #notice_data-attach {
 position:absolute;
 top:25px;
 right:10.5%;
 cursor:pointer;
 }
-#form_notice label[for=notice_data-attach] {
+.form_notice label[for=notice_data-attach] {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 padding:0;
 height:16px;
 }
-#form_notice .form_note {
+.form_notice .form_note {
 position:absolute;
 bottom:2px;
 right:21.715%;
 z-index:9;
 }
-#form_notice .form_note dt {
+.form_notice .form_note dt {
 font-weight:bold;
 display:none;
 }
-#notice_text-count {
+.form_notice #notice_text-count {
 font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
 }
-#form_notice #notice_action-submit {
+.form_notice #notice_action-submit {
 width:14%;
 height:47px;
 padding:0;
@@ -503,24 +506,24 @@ position:absolute;
 bottom:0;
 right:0;
 }
-#form_notice label[for=to] {
+.form_notice label[for=to] {
 margin-top:7px;
 }
-#form_notice select[id=to] {
+.form_notice select[id=to] {
 margin-bottom:7px;
 margin-left:18px;
 float:left;
 max-width:322px;
 }
-#form_notice .error,
-#form_notice .success {
+.form_notice .error,
+.form_notice .success {
 float:left;
 clear:both;
 width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-#form_notice #notice_data-attach_selected code {
+.form_notice #notice_data-attach_selected code {
 float:left;
 width:90%;
 display:block;
@@ -528,11 +531,21 @@ font-size:1.1em;
 line-height:1.8;
 overflow:auto;
 }
-#form_notice #notice_data-attach_selected button {
+.form_notice #notice_data-attach_selected button {
 float:right;
 font-size:0.8em;
 }
 
+button.close {
+width:16px;
+height:16px;
+text-indent:-9999px;
+padding:0;
+border:0;
+text-align:center;
+font-weight:bold;
+}
+
 /* entity_profile */
 .entity_profile {
 position:relative;
@@ -582,14 +595,18 @@ margin-left:0;
 font-size:1.1em;
 font-weight:bold;
 }
-.entity_profile .entity_fn dd:before {
+.entity_profile .fn:before {
 content: "(";
 font-weight:normal;
 }
-.entity_profile .entity_fn dd:after {
+.entity_profile .fn:after {
 content: ")";
 font-weight:normal;
 }
+.entity_profile .nickname:after,
+.entity_profile .nickname:before {
+content:"";
+}
 .entity_profile dt,
 .entity_profile h2 {
 display:none;
@@ -604,7 +621,8 @@ font-style:italic;
 .entity_actions {
 float:right;
 margin-left:2.35%;
-max-width:25%;
+margin-bottom:18px;
+width:21%;
 }
 .entity_actions h2 {
 display:none;
@@ -613,7 +631,7 @@ display:none;
 list-style-type:none;
 }
 .entity_actions li {
-margin-bottom:4px;
+margin-bottom:7px;
 }
 .entity_actions li:first-child {
 border-top:0;
@@ -632,30 +650,28 @@ text-align:left;
 width:100%;
 }
 .entity_actions a,
-.entity_nudge p,
 .entity_remote_subscribe {
 text-decoration:none;
 font-weight:bold;
 display:block;
 }
+.entity_actions a,
+.entity_actions input {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
 
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.entity_edit a,
-.form_user_nudge input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
 border:0;
-padding-left:20px;
+padding-left:23px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.entity_nudge p {
-padding:4px 4px 4px 23px;
+.entity_actions a,
+.entity_actions p {
+padding:1px 4px 1px 26px;
 }
 
 .entity_remote_subscribe {
@@ -670,6 +686,40 @@ border-radius:4px;
 margin-bottom:18px;
 }
 
+
+.entity_send-a-message button {
+position:absolute;
+top:3px;
+right:3px;
+}
+
+.entity_send-a-message .form_notice {
+position:absolute;
+top:34px;
+right:-1px;
+padding:1.795%;
+width:65%;
+z-index:2;
+ border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+border-width:1px;
+border-style:solid;
+}
+.entity_send-a-message .form_notice legend {
+display:block;
+margin-bottom:11px;
+}
+
+.entity_send-a-message .form_notice label,
+.entity_send-a-message .form_notice select {
+display:none;
+}
+.entity_send-a-message .form_notice input.submit {
+text-align:center;
+}
+
+
 .entity_tags ul {
 list-style-type:none;
 display:inline;
@@ -738,18 +788,22 @@ display:none;
 .profiles {
 list-style-type:none;
 }
-.profile .entity_profile .entity_location {
+.profile .entity_profile .fn.nickname,
+.profile .entity_profile .url[rel~=contact] {
+margin-left:0;
+display:inline;
+}
+
+.profile .entity_profile .fn,
+.profile .entity_profile .location {
+margin-left:11px;
+margin-bottom:4px;
 width:auto;
 clear:none;
-margin-left:11px;
-}
-.profile .entity_profile dl,
-.profile .entity_profile dd {
-display:inline;
-float:none;
 }
-.profile .entity_profile .entity_note,
-.profile .entity_profile .entity_url,
+
+.profile .entity_profile .note,
+.profile .entity_profile .url,
 .profile .entity_profile .entity_tags,
 .profile .entity_profile .form_subscription_edit {
 margin-left:59px;
@@ -788,6 +842,10 @@ margin-left:2%;
 width:98%;
 float:left;
 }
+.mark-top {
+border-top-width:1px;
+border-top-style:solid;
+}
 
 /* NOTICES */
 #notices_primary {
@@ -921,11 +979,14 @@ border:0;
 .notice-options .notice_reply,
 .notice-options .notice_delete {
 text-decoration:none;
-padding-left:16px;
 }
 .notice-options form input.submit {
 width:16px;
-padding:2px 0;
+height:16px;
+padding:0;
+border-radius:0;
+-moz-border-radius:0;
+-webkit-border-radius:0;
 }
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
@@ -936,6 +997,10 @@ display:none;
 border:0;
 padding:0;
 }
+.notice-options a {
+width:16px;
+height:16px;
+}
 
 .notice .attachment {
 position:relative;
@@ -991,11 +1056,6 @@ margin-bottom:11px;
 position:absolute;
 top:0;
 right:0;
-width:29px;
-height:29px;
-text-align:center;
-font-weight:bold;
-padding:0;
 }
 #jOverlayContent h1 {
 max-width:425px;
@@ -1295,3 +1355,13 @@ display:none;
 .guide {
 clear:both;
 }
+
+#bookmarklet address {
+display:none;
+}
+#bookmarklet .form_notice {
+width:auto;
+}
+#bookmarklet #wrap {
+min-width:0;
+}
diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css
deleted file mode 100644
index e6b1c9ee5..000000000
--- a/theme/base/css/facebookapp.css
+++ /dev/null
@@ -1,97 +0,0 @@
-* {
-font-size:14px;
-font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
-}
-
-#wrap {
-background-color:#F0F2F5;
-padding-left:18px;
-padding-right:18px;
-width:auto;
-}
-
-p,label,
-h1,h2,h3,h4,h5,h6 {
-color:#000;
-}
-
-#content {
-width:95%;
-}
-
-#site_nav_local_views a {
-background-color:#D0DFE7;
-}
-#site_nav_local_views a:hover {
-background-color:#FAFBFC;
-}
-
-span.facebook-button {
-border: 2px solid #aaa;
-padding: 3px;
-display: block;
-float: left;
-margin-right: 20px;
--moz-border-radius: 4px; 
-border-radius:4px; 
--webkit-border-radius:4px;
-font-weight: bold;
-background-color:#A9BF4F;
-color:#fff;
-font-size:1.2em
-}
-
-span.facebook-button a { color:#fff }
-
-.facebook_guide {
-margin-bottom:18px;
-}
-.facebook_guide p {
-font-weight:bold;
-}
-
-
-input {
-height:auto !important;
-}
-
-#facebook-friends {
-float:left;
-width:100%;
-}
-
-#facebook-friends li {
-float:left;
-margin-right:2%;
-margin-bottom:11px;
-width:18%;
-height:115px;
-}
-#facebook-friends li a {
-float:left;
-}
-
-#add_to_profile {
-position:absolute;
-right:18px;
-top:10px;
-z-index:2;
-}
-
-.notice div.entry-content dl,
-.notice div.entry-content dt, 
-.notice div.entry-content dd {
-margin-right:5px;
-}
-
-#content_inner p {
-margin-bottom:18px;
-}
-
-#content_inner ul {
-list-style-type:none;
-}
-
-.form_settings label {
-margin-right:18px;
-}
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 3e128b84e..4e50aadbe 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -3,10 +3,10 @@ input.checkbox,
 input.radio {
 top:0;
 }
-#form_notice textarea {
+.form_notice textarea {
 width:78%;
 }
-#form_notice .form_note + label {
+.form_notice .form_note + label {
 position:absolute;
 top:25px;
 left:83%;
@@ -15,23 +15,20 @@ height:16px;
 width:16px;
 display:block;
 }
-#form_notice #notice_action-submit {
+.form_notice #notice_action-submit {
 width:17%;
 max-width:17%;
 }
-#form_notice #notice_data-attach_selected {
+.form_notice #notice_data-attach_selected {
 width:78.5%;
 }
-#form_notice #notice_data-attach_selected button {
+.form_notice #notice_data-attach_selected button {
 padding:0 4px;
 }
 .notice-options input.submit {
 font-size:0;
-margin-top:3px;
-height:16px;
 text-align:right;
 text-indent:0;
-width:24px;
 }
 .notice div.entry-content .timestamp a {
 margin-right:4px;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
new file mode 100644
index 000000000..f19d6a3f6
--- /dev/null
+++ b/theme/base/images/icons/icons-01.gif
diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png
deleted file mode 100644
index c4e371330..000000000
--- a/theme/base/images/icons/icons-01.png
+++ /dev/null
diff --git a/theme/base/images/icons/twotone/green/minus.gif b/theme/base/images/icons/twotone/green/minus.gif
new file mode 100644
index 000000000..461cd8cb2
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/minus.gif
diff --git a/theme/base/images/icons/twotone/green/plus.gif b/theme/base/images/icons/twotone/green/plus.gif
new file mode 100644
index 000000000..4407d0b2d
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/plus.gif
diff --git a/theme/base/images/icons/twotone/green/x.gif b/theme/base/images/icons/twotone/green/x.gif
new file mode 100644
index 000000000..ffb2efea0
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/x.gif