Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

[quix0rs-gnu-social.git] / theme / base / css / display.css

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 91789f4f18a16e8d86f68fd14171af1e2fb0b7c1..5cafd8c1fe39b87c6a640c15057a59bf13079fb2 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -36,12 +36,10 @@ font-weight:bold;
 }
 
 legend {
-font-weight:bold; 
+font-weight:bold;
 font-size:1.3em;
 text-transform:uppercase;
 }
-form {
-}
 input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
@@ -95,23 +93,22 @@ border-radius:4px;
 form label.submit {
 display:none;
 }
-.form_settings input.remove {
-margin-left:11px;
-}
-
-
 
+.form_settings {
+clear:both;
+}
 
-/* FORM SETTINGS */
 .form_settings fieldset {
 margin-bottom:29px;
 }
+.form_settings input.remove {
+margin-left:11px;
+}
 
 .form_guide {
 font-style:italic;
 }
 
-
 .form_settings .form_data li {
 width:100%;
 float:left;
@@ -147,7 +144,8 @@ font-weight:bold;
 #form_password legend,
 #form_settings_avatar legend,
 #newgroup legend,
-#editgroup legend {
+#editgroup legend,
+#form_tag_user legend {
 display:none;
 }
 
@@ -179,7 +177,6 @@ width:90%;
 margin-left:0;
 }
 
-
 .form_settings .form_note {
 border-radius:4px;
 -moz-border-radius:4px;
@@ -189,11 +186,6 @@ padding:0 7px;
 
 
 
-/* FORM SETTINGS */
-
-
-
-
 address {
 float:left;
 margin-bottom:18px;
@@ -206,7 +198,6 @@ address .fn {
 font-weight:bold;
 }
 
-
 #header {
 width:100%;
 position:relative;
@@ -225,7 +216,6 @@ display:inline;
 margin-left:11px;
 }
 
-
 .system_notice dt {
 font-weight:bold;
 text-transform:uppercase;
@@ -244,17 +234,12 @@ clear:both;
 margin-bottom:18px;
 }
 
-
-
-
 #footer {
 float:left;
 width:64%;
 padding:18px;
 }
 
-
-
 #site_nav_local_views {
 width:100%;
 float:left;
@@ -286,7 +271,6 @@ float:left;
 width:100%;
 }
 
-
 #site_nav_global_primary dt,
 #site_nav_global_secondary dt {
 display:none;
@@ -315,8 +299,6 @@ padding-left:30px;
 padding-left:28px;
 }
 
-
-
 #export_data ul {
 display:inline;
 }
@@ -329,8 +311,6 @@ margin-left:11px;
 margin-left:0;
 }
 
-
-
 #licenses {
 font-size:0.9em;
 }
@@ -353,7 +333,6 @@ vertical-align:top;
 margin-right:4px;
 }
 
-
 #wrap {
        float:left;
        margin:0 auto;
@@ -361,7 +340,6 @@ margin-right:4px;
     width:71.714em;
 }
 
-
 #core {
 position:relative;
 width:100%;
@@ -371,6 +349,7 @@ margin-bottom:1em;
 
 #content {
 width:644px;
+width:46em;
 padding:18px;
 float:left;
 border-radius:7px;
@@ -388,6 +367,7 @@ float;left;
 
 #aside_primary {
 width:300px;
+width:21.429em;
 float:left;
 margin-left:2px;
 padding:18px 4px 18px 18px;
@@ -396,9 +376,6 @@ border-radius:7px;
 -webkit-border-radius:7px;
 }
 
-
-
-
 /*Start: FORM NOTICE*/
 #form_notice {
 width:384px;
@@ -420,7 +397,7 @@ border-radius:7px;
 -webkit-border-radius:7px;
 width:377px;
 width:370px;
-height:86px;
+height:67px;
 line-height:1.5;
 padding:7px 7px 16px 7px;
 }
@@ -445,7 +422,7 @@ margin-left:4px;
 
 #form_notice .form_note {
 position:absolute;
-top:118px;
+top:99px;
 right:98px;
 z-index:9;
 }
@@ -501,10 +478,6 @@ float:left;
 
 /*end FORM NOTICE*/
 
-
-
-
-
 /* entity_profile */
 .entity_profile {
 position:relative;
@@ -575,10 +548,6 @@ display:none;
 
 /* entity_profile */
 
-
-
-
-
 /*entity_actions*/
 .entity_actions {
 float:right;
@@ -617,8 +586,6 @@ font-weight:bold;
 display:block;
 }
 
-
-
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 #entity_send-a-message a,
@@ -633,8 +600,6 @@ padding-left:20px;
 padding:4px 4px 4px 23px;
 }
 
-
-
 .entity_tags ul {
 list-style-type:none;
 }
@@ -644,8 +609,6 @@ margin-right:1em;
 float:left;
 }
 
-
-
 .aside .section {
 margin-bottom:29px;
 clear:both;
@@ -665,7 +628,6 @@ display:inline;
 content: ":";
 }
 
-
 #user_subscriptions,
 #user_subscribers,
 #user_groups, {
@@ -692,23 +654,25 @@ display:none;
 clear:both;
 }
 
-
-
 .profile .entity_profile {
 margin-bottom:0;
 min-height:60px;
 }
 
+
+.profile .form_group_join,
+.profile .form_group_leave,
 .profile .form_user_subscribe,
 .profile .form_user_unsubscribe {
 float:right;
 }
+.profile .form_group_join legend,
+.profile .form_group_leave legend,
 .profile .form_user_subscribe legend,
 .profile .form_user_unsubscribe legend {
 display:none;
 }
 
-
 .profiles {
 list-style-type:none;
 }
@@ -723,12 +687,26 @@ display:inline;
 float:none;
 }
 .profile .entity_profile .entity_note,
-.profile .entity_profile .entity_url {
+.profile .entity_profile .entity_url,
+.profile .entity_profile .entity_tags,
+.profile .entity_profile .form_subcription_edit {
 margin-left:59px;
 clear:none;
 display:block;
 width:auto;
 }
+.profile .entity_profile .entity_tags dt {
+display:inline;
+margin-right:11px;
+}
+
+
+.profile .entity_profile .form_subcription_edit label {
+font-weight:normal;
+margin-right:11px;
+}
+
+
 
 
 
@@ -736,14 +714,13 @@ width:auto;
 .notice,
 .profile {
 position:relative;
-padding-top:18px;
-padding-bottom:18px;
+padding-top:11px;
+padding-bottom:11px;
 clear:both;
 float:left;
-width:644px;
-width:96.699%;
 width:100%;
-border-top:1px dashed #D1D9E4;
+border-top-width:1px;
+border-top-style:dashed;
 /*-moz-border-radius:7px;*/
 }
 .notices li {
@@ -756,11 +733,11 @@ border-radius:4px;
 -webkit-border-radius:4px;
 }
 
-
 /* NOTICES */
 #notices_primary {
 float:left;
 width:644px;
+width:46em;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -773,7 +750,6 @@ display:block;
 padding-left:28px;
 }
 
-
 .notice .author {
 margin-right:11px;
 }
@@ -783,6 +759,14 @@ margin-right:11px;
 /*content:":";*/
 }
 
+.notice .author .fn {
+font-weight:bold;
+}
+
+.notice .author .photo {
+margin-bottom:0;
+}
+
 .vcard .photo {
 display:inline;
 margin-right:11px;
@@ -802,7 +786,6 @@ font-style:italic;
 
 }
 
-
 .notice .entry-title {
 float:left;
 width:100%;
@@ -821,7 +804,7 @@ display:inline;
 #laconicat .notice p.entry-content {
 /*margin-left:199px;*/
 }
-.notice p.entry-content a:visited {
+#content .notice p.entry-content a:visited {
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
@@ -833,32 +816,28 @@ border-radius:4px;
 }
 
 .notice div.entry-content {
-/*border:1px solid blue;*/
 clear:left;
 float:left;
-width:48%;
 font-size:0.95em;
+margin-left:59px;
+width:70%;
 }
-.notice div.entry-content a,
-.notice .notice-options a,
-.notice .notice-options input {
-
+#showstream .notice div.entry-content {
+margin-left:0;
 }
+
 .notice .notice-options a,
 .notice .notice-options input {
 float:left;
 font-size:1.025em;
 }
 
-#laconicat .notice div.entry-content {
-/*margin-left:0;*/
-}
-
 .notice div.entry-content dl,
 .notice div.entry-content dt,
 .notice div.entry-content dd {
 display:inline;
 }
+
 .notice div.entry-content .timestamp dt,
 .notice div.entry-content .response dt {
 display:none;
@@ -869,11 +848,6 @@ display:inline-block;
 .notice div.entry-content .device dt {
 text-transform:lowercase;
 }
-.notice div.entry-content a {
-
-}
-.notice div.entry-content a:hover {
-}
 
 
 
@@ -899,6 +873,8 @@ float:left;
 width:50%;
 position:relative;
 font-size:0.95em;
+width:12.5%;
+float:right;
 }
 
 .notice-options a {
@@ -966,10 +942,6 @@ padding:0;
 
 /*END: NOTICES */
 
-
-
-
-
 .pagination dt {
 font-weight:bold;
 display:none;
@@ -1010,11 +982,8 @@ padding-right:20px;
 border-right:0;
 }
 
-
 /* END: NOTICE */
 
-
-
 /*If there is hentry on #content_inner, then this doesn't need to be specific to #doc or any other section */
 .hentry .entry-content p {
 margin-bottom:18px;
@@ -1030,7 +999,6 @@ margin-bottom:18px;
 margin-left:18px;
 }
 
-
 /*START: LOAD ALONG WITH JS*/
 .notice .in-reply-to {
        width:98%;
@@ -1046,8 +1014,6 @@ background-color:#E4E9F0;
 background-color:#D1D9E4;
 }
 
-
-
 .entity_actions #user_subscribe .form_note,
 .entity_actions #user_subscribe .form_data,
 .entity_actions #user_subscribe .form_actions label {
@@ -1079,35 +1045,45 @@ background-color:#fff;
 
 /*END: LOAD ALONG WITH JS*/
 
-
-
 /* TOP_POSTERS */
-#top-posters caption {
+#top_posters caption {
 text-align:left;
 text-transform:uppercase;
 }
-
-#top-posters thead {
+#top_posters thead {
 display:none;
 }
-#top-poster_user {
+#top_poster_user {
 width:199px;
 }
-#top-poster_number-of-notices {
+#top_poster_number-of-notices {
 width:123px;
 }
-#top-posters tbody td {
+
+.section tbody td {
 padding-right:11px;
-padding-bottom:4px;
+padding-bottom:11px;
 }
-#top-posters img {
+.section .vcard .photo {
 margin-right:7px;
-height:24px;
-width:24px;
+margin-bottom:0;
+}
+
+.section .notice {
+padding-top:11px;
+padding-bottom:11px;
+
+}
+
+.section .notice:first-child {
+padding-top:0;
+border-top:0;
 }
 
 
 
+
+
 /* tagcloud */
 .tag-cloud {
 list-style-type:none;
@@ -1150,20 +1126,15 @@ font-size:4em;
 display:none;
 }
 
-
-
-
 #form_settings_photo .form_data {
 clear:both;
 }
 
-
-
 #form_settings_avatar li {
 width:auto;
 }
 #form_settings_avatar input {
-margin-left:0; 
+margin-left:0;
 }
 #avatar_original,
 #avatar_preview {
@@ -1188,8 +1159,6 @@ clear:both;
 margin-bottom:0;
 }
 
-
-
 #groups_related ul,
 #users_featured ul {
 list-style-type:none;
@@ -1223,8 +1192,6 @@ display:none;
 font-weight:bold;
 }
 
-
-
 #home.logged_out h1 {
 display:none;
 }
@@ -1267,7 +1234,6 @@ font-weight:bold;
 text-align:center;
 }
 
-
 #testimonials {
 clear:both;
 }