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 727fd94c478ac676ebad3158eb097152cf23aae9..5cafd8c1fe39b87c6a640c15057a59bf13079fb2 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -40,8 +40,6 @@ font-weight:bold;
 font-size:1.3em;
 text-transform:uppercase;
 }
-form {
-}
 input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
@@ -95,14 +93,17 @@ 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;
@@ -143,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;
 }
 
@@ -182,7 +184,7 @@ border-radius:4px;
 padding:0 7px;
 }
 
-/* FORM SETTINGS */
+
 
 address {
 float:left;
@@ -347,6 +349,7 @@ margin-bottom:1em;
 
 #content {
 width:644px;
+width:46em;
 padding:18px;
 float:left;
 border-radius:7px;
@@ -364,6 +367,7 @@ float;left;
 
 #aside_primary {
 width:300px;
+width:21.429em;
 float:left;
 margin-left:2px;
 padding:18px 4px 18px 18px;
@@ -393,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;
 }
@@ -418,7 +422,7 @@ margin-left:4px;
 
 #form_notice .form_note {
 position:absolute;
-top:118px;
+top:99px;
 right:98px;
 z-index:9;
 }
@@ -684,25 +688,39 @@ float:none;
 }
 .profile .entity_profile .entity_note,
 .profile .entity_profile .entity_url,
-.profile .entity_profile .entity_tags {
+.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;
+}
+
+
+
+
 
 /* NOTICE */
 .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 {
@@ -719,6 +737,7 @@ border-radius:4px;
 #notices_primary {
 float:left;
 width:644px;
+width:46em;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -740,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;
@@ -777,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;
@@ -789,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;
@@ -825,11 +848,8 @@ display:inline-block;
 .notice div.entry-content .device dt {
 text-transform:lowercase;
 }
-.notice div.entry-content a {
 
-}
-.notice div.entry-content a:hover {
-}
+
 
 .notice-data {
 position:absolute;
@@ -853,6 +873,8 @@ float:left;
 width:50%;
 position:relative;
 font-size:0.95em;
+width:12.5%;
+float:right;
 }
 
 .notice-options a {
@@ -1024,30 +1046,44 @@ 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;