2 files changed, 75 insertions, 305 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 36e72a74f..289329bbc 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -61,6 +61,7 @@ border-radius:4px;
 
 input.submit {
 font-weight:bold;
+cursor:pointer;
 }
 textarea {
 overflow:auto;
@@ -120,6 +121,10 @@ float:left;
 margin-left:11px;
 float:left;
 }
+.form_settings .form_data input.submit {
+margin-left:0;
+}
+
 .form_settings label {
 margin-top:2px;
 width:152px;
@@ -146,7 +151,9 @@ font-weight:bold;
 #editgroup legend,
 #form_tag_user legend,
 #form_remote_subscribe legend,
-#form_openid_login legend {
+#form_openid_login legend,
+#form_search legend,
+#form_invite legend {
 display:none;
 }
 
@@ -175,7 +182,9 @@ width:90%;
 
 #form_login p.form_guide,
 #form_register #settings_rememberme p.form_guide,
-#form_openid_login #settings_rememberme p.form_guide {
+#form_openid_login #settings_rememberme p.form_guide,
+#settings_twitter_remove p.form_guide,
+#form_search ul.form_data #q {
 margin-left:0;
 }
 
@@ -186,6 +195,11 @@ border-radius:4px;
 padding:0 7px;
 }
 
+#form_search .submit {
+margin-left:11px;
+}
+
+
 
 address {
 float:left;
@@ -361,7 +375,6 @@ margin-bottom:1em;
 
 #content {
 width:644px;
-width:46em;
 padding:18px;
 float:left;
 border-radius:7px;
@@ -378,11 +391,10 @@ float:left;
 }
 
 #aside_primary {
-width:300px;
-width:21.429em;
+width:286px;
 float:left;
 margin-left:2px;
-padding:18px 4px 18px 18px;
+padding:18px;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -453,7 +465,6 @@ top:25px;
 right:30px;
 margin-left:4px;
 padding:0;
-cursor:pointer;
 width:16px;
 height:16px;
 border:0;
@@ -586,11 +597,10 @@ display:none;
 .entity_actions input.submit {
 display:block;
 text-align:left;
-cursor:pointer;
 width:100%;
 }
 .entity_actions a,
-#entity_nudge p,
+.entity_nudge p,
 .entity_remote_subscribe {
 text-decoration:none;
 font-weight:bold;
@@ -599,15 +609,15 @@ display:block;
 
 .form_user_block input.submit,
 .form_user_unblock input.submit,
-#entity_send-a-message a,
+.entity_send-a-message a,
 .form_user_nudge input.submit,
-#entity_nudge p {
+.entity_nudge p {
 border:0;
 padding-left:20px;
 }
 
-#entity_send-a-message a,
-#entity_nudge p {
+.entity_send-a-message a,
+.entity_nudge p {
 padding:4px 4px 4px 23px;
 }
 
@@ -623,11 +633,11 @@ border-radius:4px;
 
 .entity_tags ul {
 list-style-type:none;
+display:inline;
 }
 .entity_tags li {
 display:inline;
-margin-right:1em;
-float:left;
+margin-right:4px;
 }
 
 .aside .section {
@@ -650,8 +660,8 @@ content: ":";
 }
 
 .section ul.entities {
-width:220px;
 float:left;
+width:100%;
 }
 .section .entities li {
 list-style-type:none;
@@ -750,7 +760,6 @@ border-radius:4px;
 #notices_primary {
 float:left;
 width:644px;
-width:46em;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -918,7 +927,6 @@ padding-left:16px;
 }
 
 .notice-options form input.submit {
-cursor:pointer;
 width:16px;
 padding:2px 0;
 }
@@ -938,14 +946,61 @@ padding:0;
 
 
 
-#groups p {
+#new_group {
 margin-bottom:18px;
 }
-#groups #new_group a {
+#new_group a {
 padding-left:20px;
 }
 
 
+#filter_tags {
+margin-bottom:11px;
+float:left;
+}
+#filter_tags dt {
+display:none;
+}
+#filter_tags ul {
+list-style-type:none;
+}
+#filter_tags ul li {
+float:left;
+margin-left:7px;
+padding-left:7px;
+border-left-width:1px;
+border-left-style:solid;
+}
+#filter_tags ul li.child_1 {
+margin-left:0;
+border-left:0;
+padding-left:0;
+}
+#filter_tags ul li#filter_tags_all a {
+font-weight:bold;
+margin-top:7px;
+float:left;
+}
+
+#filter_tags ul li#filter_tags_item label {
+margin-right:7px;
+}
+#filter_tags ul li#filter_tags_item label,
+#filter_tags ul li#filter_tags_item select {
+display:inline;
+}
+#filter_tags ul li#filter_tags_item p {
+float:left;
+margin-left:38px;
+}
+#filter_tags ul li#filter_tags_item input {
+position:relative;
+top:3px;
+left:3px;
+}
+
+
+
 .pagination {
 float:left;
 clear:both;
diff --git a/theme/base/css/facebookapp.base.css b/theme/base/css/facebookapp.base.css
deleted file mode 100644
index eb7b47a12..000000000
--- a/theme/base/css/facebookapp.base.css
+++ /dev/null
@@ -1,285 +0,0 @@
-/* theme: identica */
-html {
-background-color:#ddd;
-}
-body {
-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-font-size:1em;
-background-color:#ddd;
-}
-input, textarea, select, option {
-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-}
-input, textarea, select {
-border-color:#aaa;
-}
-
-input:focus, textarea:focus, select:focus {
-border-color:#A9BF4F;
-}
-input.submit {
-background-color:#A9BF4F;
-color:#fff;
-}
-
-a {
-color:#002E6E;
-}
-a:active {
-background-color:#ddd;
-}
-.notice p.entry-content a:visited {
-background-color:#fcfcfc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-.notice p.entry-content .vcard a {
-background-color:#fcfffc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-
-
-
-#aside_primary {
-background-color:#CEE1E9;
-}
-
-#form_notice textarea {
-}
-
-#form_notice label {
-color:#88171A;
-}
-#notice_text-count {
-color:#333;
-}
-#form_notice.warning #notice_text-count {
-color:#000;
-background-color:#A9BF4F;
-}
-#form_notice.warning #notice_data-text {
-border-color:#A9BF4F;
-}
-
-#form_notice #notice_data-attach_view {
-background-image:url(../images/icons/twotone/green/paper-clip.gif);
-background-repeat:no-repeat;
-background-position:0 45%;
-background-color:transparent;
-}
-
-
-#site_nav_global_primary a {
-}
-#form_notice .form_actions input.submit {
-}
-#nav_register a {
-background-color:#A9BF4F;
-color:#fff;
-text-decoration:none;
-font-weight:bold;
-padding:2px 4px;
-
-}
-#nav_login a {
-}
-
-
-#site_nav_local_views a {
-border-color:#fff;
-background-color:rgba(255, 255, 255, 0.2);
-}
-#site_nav_local_views a:hover {
-background-color:rgba(255, 255, 255, 0.7);
-}
-
-
-#content,
-#site_nav_local_views .current a {
-background-color:#fff;
-}
-
-
-#page_notice .error {
-background-color:#F7E8E8;
-}
-#page_notice .success {
-background-color:#EFF3DC;
-}
-
-#export_data li a {
-background-repeat:no-repeat;
-background-position:0 45%;
-}
-#export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.jpg);
-}
-#export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.jpg);
-}
-#export_data li a.foaf {
-background-image:url(../../base/images/icons/icon_foaf.gif);
-}
-#export_data li a.export_vcard {
-background-image:url(../../base/images/icons/icon_vcard.gif);
-}
-
-
-/*user_actions*/
-#user_actions li {
-border-top-color:#eee;
-}
-#user_actions a {
-color:#000;
-}
-#user_subscribe a,
-#TB_window input.submit,
-.form_user_subscribe input.submit {
-background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat;
-}
-.form_user_unsubscribe input.submit {
-background-color:#647819;
-color:#fff;
-}
-#user_send-a-message a {
-background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
-}
-.form_user_nudge input.submit {
-background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat;
-}
-.form_user_block input.submit {
-background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
-}
-
-
-.user_tags .mark_hash {
-color:#555;
-}
-
-
-
-.vcard .fn {
-}
-.vcard .fn:hover {
-}
-
-
-
-
-/* NOTICES */
-.notices li.over {
-background-color:#fcfcfc;
-}
-
-
-.notice div.entry-content a {
-
-}
-.notice div.entry-content a:hover {
-}
-
-
-.notice-data a span {
-background-color:transparent;
-background-repeat:no-repeat;
-background-position:0 45%;
-}
-.notice_video .notice-data a span {
-background-image:url(../images/icons/twotone/green/camera.gif);
-}
-.notice_audio .notice-data a span {
-background-image:url(../images/icons/twotone/green/music.gif);
-}
-.notice_image .notice-data a span {
-background-image:url(../images/icons/twotone/green/search.gif);
-}
-.notice_event .notice-data a span {
-background-image:url(../images/icons/twotone/green/calendar.gif);
-}
-.notice_location .notice-data a span {
-background-image:url(../images/icons/twotone/green/flag.gif);
-}
-.notice_document .notice-data a span {
-background-image:url(../images/icons/twotone/green/document.gif);
-}
-
-.notice-options .notice_reply a,
-.notice-options form input.submit {
-background-color:transparent;
-}
-.notice-options .notice_reply a {
-background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
-}
-.notice-options form.form_favor input.submit {
-background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
-}
-.notice-options form.form_disfavor input.submit {
-background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
-}
-.notice-options .notice_delete a {
-background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
-}
-
-div.notice-options {
-opacity:0.3;
-}
-
-div.entry-content {
-color:#333;
-}
-div.notice-options a,
-div.notice-options input {
-font-family:sans-serif;
-}
-div.notice-options input {
-color:#002E6E;
-
-}
-.notices li.hover {
-background-color:#fcfcfc;
-}
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
-opacity:1;
-}
-
-.form_settings .form_note {
-background-color:#A9BF4F;
-}
-
-/*END: NOTICES */
-
-
-
-.pagination .nav_prev a,
-.pagination .nav_next a {
-background-repeat:no-repeat;
-}
-.pagination .nav_prev a {
-background-image:url(../images/icons/twotone/green/arrow-left.gif);
-background-position:0 45%;
-}
-.pagination .nav_next a {
-background-image:url(../images/icons/twotone/green/arrow-right.gif);
-background-position:100% 45%;
-}
-
-
-
-#home #intro #guide_steps li a {
-border-color:#ccc;
-color:#fff;
-}
-#home #intro #step_join-now a {
-background-color:#f00;
-}
-#home #intro #step_start-a-group a {
-background-color:#0f0;
-}
-#home #intro #step_create-a-community a {
-background-color:#00f;
-}
-