Merge branch 'master' of ssh://zach@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 396d12ef0f5f7337287c7d8abaec91e05c0844f7..d2480be14aa436491b650ee5380d8c7abb78cd55 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -16,30 +16,30 @@ margin:0 auto;
 width:1004px;
 width:71.714em;
 }
+h1,h2,h3,h4,h5,h6 {
+       text-transform:uppercase;
+       margin-bottom:7px;
+}
 h1 {
-font-size:2.1em;
-line-height:1.1;
-margin-bottom:0.25em;
+font-size:1.4em;
+line-height:1;
+margin-bottom:18px;
 }
 h2 { font-size:1.3em; }
 h3 { font-size:1.2em; }
 h4 { font-size:1.1em; }
 h5 { font-size:1em; }
 h6 { font-size:0.9em; }
-h1,h2,h3,h4,h5,h6 {
-       text-transform:uppercase;
-       margin-bottom:7px;
-}
+
 caption {
 font-weight:bold;
 }
 .opened { display: block !important;}
 .closed { display: none !important;}
 
-
 legend {
 font-weight:bold; 
-font-size:1.6em;
+font-size:1.3em;
 text-transform:uppercase;
 }
 form {
@@ -48,14 +48,23 @@ input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
 font-size:1em;
--moz-border-radius:4px;
 }
-input:focus, textarea:focus, select:focus {
+input, textarea, select {
 border-width:2px;
 border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
-
-select, option {
+input.submit {
+font-weight:bold;
+}
+textarea {
+overflow:auto;
+}
+select {
+}
+option {
 padding-bottom:0;
 }
 fieldset {
@@ -73,28 +82,25 @@ font-weight:bold;
 form ul li input {
 }
 
-form input.checkbox {
+input.checkbox {
 position:relative;
 top:2px;
 left:0;
+border:0;
 }
 
-#page_notice .error {
-background-color:#F7E8E8;
+#page_notice .error,
+#page_notice .success {
 padding:4px 7px;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 form label.submit {
 display:none;
 }
-form .error_message {
-display:block;
-}
-.form_response {
-margin-bottom:18px;
-}
-
-form input.submit {
+.form_settings input.remove {
+margin-left:11px;
 }
 
 
@@ -110,22 +116,24 @@ font-style:italic;
 }
 
 
-.form_settings .form_datas li {
+.form_settings .form_data li {
 width:100%;
 float:left;
 }
 
-.form_login label,
-.form_settings .form_datas label,
-.form_login input,
-.form_settings .form_datas input {
-margin-right:11px;
+.form_settings .form_data label {
+float:left;
+}
+.form_settings .form_data textarea,
+.form_settings .form_data select,
+.form_settings .form_data input {
+margin-left:11px;
 float:left;
 }
 
 .form_settings label {
-margin-top:7px;
-width:123px;
+margin-top:2px;
+width:152px;
 }
 
 .form_actions label {
@@ -137,13 +145,15 @@ display:inline;
 font-weight:bold;
 }
 
-#form_settings_profile legend {
+#form_settings_profile legend,
+#form_login legend,
+#form_register legend {
 display:none;
 }
 
-.form_settings .form_datas p.form_guide {
+.form_settings .form_data p.form_guide {
 clear:both;
-margin-left:134px;
+margin-left:163px;
 margin-bottom:0;
 }
 
@@ -151,17 +161,30 @@ margin-bottom:0;
 margin-bottom:11px;
 }
 
-#settings_email_address {
-margin-bottom:29px;
-}
-
 .form_settings input.checkbox {
 margin-top:3px;
+margin-left:0;
 }
 .form_settings label.checkbox {
 font-weight:normal;
-width:auto;
 margin-top:0;
+margin-right:0;
+margin-left:11px;
+float:left;
+width:90%;
+}
+
+#form_login p.form_guide,
+#form_register #settings_rememberme p.form_guide {
+margin-left:0;
+}
+
+
+.form_settings .form_note {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+padding:0 7px;
 }
 
 /* FORM SETTINGS */
@@ -174,11 +197,12 @@ float:left;
 margin-bottom:18px;
 margin-left:18px;
 }
-address .fn,
-address .email {
-display:none;
+address.vcard img.logo {
+margin-right:0;
+}
+address .fn {
+font-weight:bold;
 }
-
 
 
 #header {
@@ -191,6 +215,8 @@ margin-bottom:29px;
 
 #site_nav_global_primary {
 float:right;
+margin-right:18px;
+margin-bottom:11px;
 }
 #site_nav_global_primary ul li {
 display:inline;
@@ -221,8 +247,8 @@ margin-bottom:18px;
 
 #footer {
 float:left;
-width:68%;
-padding-bottom:11px;
+width:64%;
+padding:18px;
 }
 
 
@@ -245,9 +271,12 @@ text-decoration:none;
 padding:4px 11px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
+-webkit-border-top-left-radius:4px;
+-webkit-border-top-right-radius:4px;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
+text-shadow: 4px 4px 4px #ddd;
 font-weight:bold;
 }
 #site_nav_local_views .nav {
@@ -313,8 +342,8 @@ margin-bottom:11px;
 line-height:1.5;
 }
 
-
-#site_content_license_cc p {
+#site_content_license_cc {
+margin-bottom:0;
 }
 #site_content_license_cc img {
 display:inline;
@@ -342,12 +371,17 @@ margin-bottom:1em;
 width:644px;
 padding:18px;
 float:left;
+border-radius:7px;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
+-webkit-border-radius:7px;
+-webkit-border-top-left-radius:0;
 }
 
 #content_inner {
 position:relative;
+width:100%;
+float;left;
 }
 
 #aside_primary {
@@ -355,7 +389,9 @@ width:300px;
 float:left;
 margin-left:2px;
 padding:18px 4px 18px 18px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 
 
@@ -366,7 +402,6 @@ padding:18px 4px 18px 18px;
 width:384px;
 width:458px;
 float:left;
-margin-left:68px;
 position:relative;
 line-height:1;
 }
@@ -378,20 +413,21 @@ padding:0;
 display:none;
 }
 #form_notice textarea {
--moz-border-radius:4px;
-width:304px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
 width:377px;
-height:95px;
+width:370px;
 height:86px;
 line-height:1.5;
-padding:7px 7px 14px 7px;
+padding:7px 7px 16px 7px;
 }
 #form_notice label {
 display:block;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice .form_datas li {
+#form_notice .form_data li {
 float:left;
 }
 
@@ -407,8 +443,7 @@ margin-left:4px;
 
 #form_notice .form_note {
 position:absolute;
-top:125px;
-top:116px;
+top:120px;
 right:98px;
 z-index:9;
 }
@@ -436,10 +471,14 @@ text-indent:-9999px;
 }
 #form_notice .form_actions {
 position:absolute;
-top:107px;
-top:98px;
+bottom:0;
 right:0;
 }
+#form_notice .form_actions input.submit {
+width:60px;
+padding:8px;
+}
+
 #form_notice li {
 margin-bottom:0;
 }
@@ -452,7 +491,7 @@ margin-bottom:0;
 /* user_profile */
 #user_profile {
 position:relative;
-width:633px;
+width:475px;
 min-height:123px;
 float:left;
 margin-bottom:17px;
@@ -477,7 +516,7 @@ width:96px;
 #user_profile .user_tags {
 float:left;
 clear:left;
-margin-left:125px;
+margin-left:113px;
 width:322px;
 margin-bottom:4px;
 }
@@ -487,21 +526,26 @@ margin-bottom:4px;
 width:auto;
 clear:none;
 }
-#user_profile .user_nickname {
+#user_profile .user_fn {
 margin-left:11px;
+margin-right:4px;
+}
+#user_profile .user_fn .fn {
+font-weight:bold;
+font-style:normal;
 }
-#user_profile .user_nickname .nickname {
+#user_profile .nickname {
 font-style:italic;
 font-weight:bold;
-margin-left:4px;
-margin-right:4px;
 }
 
-#user_profile .user_nickname dd:before {
+#user_profile .user_fn dd:before {
 content: "(";
+font-weight:normal;
 }
-#user_profile .user_nickname dd:after {
+#user_profile .user_fn dd:after {
 content: ")";
+font-weight:normal;
 }
 
 #user_profile dt {
@@ -510,8 +554,13 @@ display:none;
 #user_profile h2 {
 display:none;
 }
+
 /* user_profile */
 
+
+
+
+
 /*user_actions*/
 #user_actions {
 clear:left;
@@ -527,8 +576,7 @@ display:none;
 list-style-type:none;
 }
 #user_actions li {
-border-top-width:1px;
-border-top-style:dotted;
+margin-bottom:4px;
 }
 #user_actions li:first-child {
 border-top:0;
@@ -541,34 +589,29 @@ padding:0;
 display:none;
 }
 
-#user_actions a,
 #user_actions input.submit {
 display:block;
 text-align:left;
-padding:4px 0 4px 19px;
+cursor:pointer;
+width:100%;
 }
 #user_actions a {
 text-decoration:none;
 }
-#user_subscribe a,
-#TB_window input.submit,
-#user_actions input.submit {
-border:0;
-cursor:pointer;
-padding-left:16px;
-width:100%;
-font-size:0.9em;
-}
 
-#user_subscribe a {
-width:auto;
+
+
+.form_user_block input.submit,
+.form_user_unblock input.submit {
+border:0;
 padding-left:20px;
 }
 
-#user_subscribe a,
-#TB_window input.submit,
+
+
+#user_subscribe input.submit,
 .form_user_subscribe input.submit {
-font-weight:bold;
+
 }
 
 
@@ -640,10 +683,40 @@ clear:both;
 
 
 
+.profile #user_profile {
+margin-bottom:0;
+min-height:60px;
+}
+
+.profile .form_user_unsubscribe {
+float:right;
+}
+.profiles {
+list-style-type:none;
+}
+.profile #user_profile .user_location {
+width:auto;
+clear:none;
+margin-left:11px;
+}
+.profile #user_profile dl,
+.profile #user_profile dd {
+display:inline;
+float:none;
+}
+.profile #user_profile .user_note,
+.profile #user_profile .user_url {
+margin-left:59px;
+clear:none;
+display:block;
+width:auto;
+}
+
 
 
 /* NOTICE */
-.notice {
+.notice,
+.profile {
 position:relative;
 padding-top:18px;
 padding-bottom:18px;
@@ -659,8 +732,10 @@ border-top:1px dashed #D1D9E4;
 list-style-type:none;
 /*margin-bottom:11px;*/
 }
-.notices li.over {
-background-color:#fcfcfc;
+.notices li.hover {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 
 
@@ -668,7 +743,9 @@ background-color:#fcfcfc;
 #notices_primary {
 float:left;
 width:644px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 #notices_primary h2 {
 display:none;
@@ -690,8 +767,8 @@ margin-right:11px;
 
 .vcard .photo {
 display:inline;
-margin-right:7px;
-margin-bottom:7px;
+margin-right:11px;
+margin-bottom:11px;
 float:left;
 }
 .vcard .url {
@@ -710,6 +787,7 @@ font-style:italic;
 
 .notice .entry-title {
 float:left;
+width:100%;
 }
 .notice p.entry-content {
 display:inline;
@@ -725,25 +803,23 @@ display:inline;
 #laconicat .notice p.entry-content {
 /*margin-left:199px;*/
 }
-.notice p.entry-content a {
-
-}
-.notice p.entry-content a:hover {
-
-}
-.notice p.entry-content .tag a {
-
+.notice p.entry-content a:visited {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
-.notice p.entry-content .tag a:hover {
-
+.notice p.entry-content .vcard a {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 
-
 .notice div.entry-content {
 /*border:1px solid blue;*/
 clear:left;
 float:left;
 width:48%;
+font-size:0.95em;
 }
 .notice div.entry-content a,
 .notice .notice-options a,
@@ -753,6 +829,7 @@ width:48%;
 .notice .notice-options a,
 .notice .notice-options input {
 float:left;
+font-size:1.025em;
 }
 
 #laconicat .notice div.entry-content {
@@ -769,7 +846,7 @@ display:inline;
 display:none;
 }
 .notice div.entry-content .timestamp a {
-
+display:inline-block;
 }
 .notice div.entry-content .device dt {
 text-transform:lowercase;
@@ -802,13 +879,29 @@ outline:none;
 padding-left:2%;
 float:left;
 width:50%;
+position:relative;
+font-size:0.95em;
 }
-.notice-options .notice_reply,
-.notice-options .notice_favorite {
+
+.notice-options a {
 float:left;
-margin-right:11px;
+}
+.notice-options .notice_delete,
+.notice-options .notice_reply,
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+position:absolute;
+top:0;
+}
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+left:0;
 }
 .notice-options .notice_reply {
+left:29px;
+}
+.notice-options .notice_delete {
+left:76px;
 }
 .notice-options .notice_reply dt {
 display:none;
@@ -817,6 +910,7 @@ display:none;
 .notice-options input,
 .notice-options a {
 text-indent:-9999px;
+outline:none;
 }
 
 .notice-options .notice_reply a,
@@ -827,24 +921,27 @@ border:0;
 .notice-options .notice_reply a,
 .notice-options .notice_delete a {
 text-decoration:none;
-padding-left:20px;
+padding-left:16px;
 }
 
 .notice-options .notice_delete {
-float:right;
+
 }
 
 .notice-options form input.submit {
 cursor:pointer;
-padding:2px 0 2px 17px;
+width:16px;
+padding:2px 0;
 }
 
 .notice-options .notice_delete dt,
-.notice-options .notice_favorite legend {
+.notice-options .form_favor legend,
+.notice-options .form_disfavor legend {
 display:none;
 }
 .notice-options .notice_delete fieldset,
-.notice-options .notice_favorite fieldset {
+.notice-options .form_favor fieldset,
+.notice-options .form_disfavor fieldset {
 border:0;
 padding:0;
 }
@@ -884,11 +981,13 @@ border-bottom:0;
 
 .pagination .nav_prev a {
 -moz-border-radius-topright:7px;
+-webkit-border-top-right-radius:7px;
 padding-left:20px;
 border-left:0;
 }
 .pagination .nav_next a {
 -moz-border-radius-topleft:7px;
+-webkit-border-top-left-radius:7px;
 padding-right:20px;
 border-right:0;
 }
@@ -898,8 +997,20 @@ border-right:0;
 
 
 
-
-
+/*If there is hentry on #content_inner, this doesn't need to be specific to #doc */
+#doc #content_inner p {
+margin-bottom:18px;
+}
+#doc #content_inner ol,
+#doc #content_inner ul {
+list-style-position:inside;
+}
+#doc #content_inner li {
+margin-bottom:18px;
+}
+#doc #content_inner li li {
+margin-left:18px;
+}
 
 
 /*START: LOAD ALONG WITH JS*/
@@ -920,12 +1031,12 @@ background-color:#D1D9E4;
 
 
 #user_actions #user_subscribe .form_note,
-#user_actions #user_subscribe .form_datas,
+#user_actions #user_subscribe .form_data,
 #user_actions #user_subscribe .form_actions label {
 display:none;
 }
 #form_user-relationship .form_note,
-#form_user-relationship .form_datas,
+#form_user-relationship .form_data,
 #form_user-relationship .form_actions label {
 display:block;
 }
@@ -933,7 +1044,7 @@ display:block;
 #user_actions #user-relationship_submit {
 margin-bottom:0;
 }
-#form_user-relationship .form_datas li label {
+#form_user-relationship .form_data li label {
 margin-right:11px;
 }
 
@@ -1011,7 +1122,7 @@ font-size:2.2em;
 
 
 
-#form_settings_photo .form_datas {
+#form_settings_photo .form_data {
 clear:both;
 }
 
@@ -1103,7 +1214,9 @@ height:109px;
 border-width:1px;
 border-style:dotted;
 text-decoration:none;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 padding:7px;
 font-size:1.6em;
 font-weight:bold;