Merge branch 'uiredesign' of /var/www/trunk into uiredesign

2 files changed, 114 insertions, 90 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b8b260266..b0a41cede 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -30,30 +30,38 @@ h1,h2,h3,h4,h5,h6 {
 	text-transform:uppercase;
 	margin-bottom:7px;
 }
-legend { font-weight:bold; }
+caption {
+font-weight:bold;
+}
+.opened { display: block !important;}
+.closed { display: none !important;}
+
+
+legend {
+font-weight:bold; 
+font-size:1.6em;
+text-transform:uppercase;
+}
+form {
+}
 input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
 font-size:1em;
 -moz-border-radius:4px;
 }
-select, option {
-padding-bottom:0;
-}
-fieldset {
-padding:11px;
-}
 input:focus, textarea:focus, select:focus {
 border-width:2px;
 border-style: solid;
--moz-border-radius:4px;
 }
-caption {
-font-weight:bold;
+
+select, option {
+padding-bottom:0;
+}
+fieldset {
+padding:0;
+border:0;
 }
-.opened { display: block !important;}
-.closed { display: none !important;}
-span.required { font-weight:bold; }
 form ul li {
 list-style-type:none;
 margin:0 0 18px 0;
@@ -64,8 +72,17 @@ font-weight:bold;
 }
 form ul li input {
 }
-form .error {
-margin-right:11px;
+
+form input.checkbox {
+position:relative;
+top:2px;
+left:0;
+}
+
+#page_notice .error {
+background-color:#F7E8E8;
+padding:4px 7px;
+-moz-border-radius:4px;
 }
 form label.submit {
 display:none;
@@ -76,15 +93,7 @@ display:block;
 .form_response {
 margin-bottom:18px;
 }
-.form_response dt {
-}
-.form_response dd {
-}
 
-form input.remove,
-form input.submit {
--moz-border-radius:4px;
-}
 form input.submit {
 }
 
@@ -93,21 +102,19 @@ form input.submit {
 
 /* FORM SETTINGS */
 .form_settings fieldset {
-padding:0;
-border:0;
-}
-.form_settings legend {
-display:none;
-}
-.form_settings .form_datas label {
-display:block;
+margin-bottom:29px;
 }
 
 .form_guide {
 font-style:italic;
 }
 
-.form_settings .form_actions label {
+.form_login label,
+.form_settings label {
+margin-right:11px;
+}
+
+.form_actions label {
 display:none;
 }
 
@@ -116,7 +123,17 @@ display:inline;
 font-weight:bold;
 }
 
+.form_settings p {
+margin-bottom:18px;
+}
+
+#settings_email_address {
+margin-bottom:29px;
+}
 
+.form_settings label.checkbox {
+font-weight:normal;
+}
 
 /* FORM SETTINGS */
 
@@ -200,8 +217,9 @@ padding:4px 11px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
 border-width:1px;
-border-style:dashed;
+border-style:solid;
 border-bottom:0;
+font-weight:bold;
 }
 #site_nav_local_views .nav {
 float:left;
@@ -698,12 +716,15 @@ clear:left;
 float:left;
 width:48%;
 }
-.notice div.entry-content,
+.notice div.entry-content a,
 .notice .notice-options a,
 .notice .notice-options input {
-font-size:0.9em;
-}
 
+}
+.notice .notice-options a,
+.notice .notice-options input {
+float:left;
+}
 
 #laconicat .notice div.entry-content {
 /*margin-left:0;*/
@@ -718,17 +739,16 @@ display:inline;
 .notice div.entry-content .response dt {
 display:none;
 }
-.notice div.entry-content .timestamp {
+.notice div.entry-content .timestamp a {
 
 }
 .notice div.entry-content .device dt {
 text-transform:lowercase;
 }
 .notice div.entry-content a {
-text-decoration:none;
+
 }
 .notice div.entry-content a:hover {
-text-decoration:underline;
 }
 
 
@@ -749,40 +769,42 @@ display:block;
 outline:none;
 }
 
-
-
 .notice-options {
-margin-left:2%;
+padding-left:2%;
 float:left;
+width:50%;
 }
-.notice-options .reply,
-.notice-options .notice_delete ,
+.notice-options .notice_reply,
 .notice-options .notice_favorite {
 float:left;
 margin-right:11px;
 }
-.notice-options .reply {
-margin-top:1px;
+.notice-options .notice_reply {
 }
-.notice-options .reply dt {
+.notice-options .notice_reply dt {
 display:none;
 }
-.notice-options .reply a,
+.notice-options .notice_reply a,
 .notice-options form input.submit {
 display:block;
 border:0;
 }
-
-.notice-options .reply a {
+.notice-options .notice_reply a,
+.notice-options .notice_delete a {
 text-decoration:none;
 padding-left:20px;
 }
+
+.notice-options .notice_delete {
+float:right;
+}
+
 .notice-options form input.submit {
 cursor:pointer;
-padding:0 0 0 17px;
+padding:2px 0 2px 17px;
 }
 
-.notice-options .notice_delete legend,
+.notice-options .notice_delete dt,
 .notice-options .notice_favorite legend {
 display:none;
 }
@@ -792,10 +814,6 @@ border:0;
 padding:0;
 }
 
-
-.notice-options form.notice_delete {
-margin-left:2em;
-}
 /*END: NOTICES */
 
 
@@ -830,12 +848,12 @@ border-bottom:0;
 }
 
 .pagination .nav_prev a {
--moz-border-radius-topright:4px;
+-moz-border-radius-topright:7px;
 padding-left:20px;
 border-left:0;
 }
 .pagination .nav_next a {
--moz-border-radius-topleft:4px;
+-moz-border-radius-topleft:7px;
 padding-right:20px;
 border-right:0;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index c2eb4ef65..4af7cf239 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -1,31 +1,31 @@
 /* theme: identica */
 html {
-	background-color:#ddd;
+background-color:#ddd;
 }
 body {
-	font-family: sans-serif;
-	font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-	font-size:1em;
-
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+font-size:1em;
 }
 input, textarea, select, option {
-	font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
 input:focus, textarea:focus, select:focus {
 border-color:#B2D0DD;
 }
-form span.required { color:#f00; }
-form .error {
-background-color:#f00;
-color:#fff;
-}
-form .error_message {
-color:#EC008C;
-}
-
 a {
 color:#002E6E;
 }
+a:active {
+background-color:#ddd;
+}
+.notice p.entry-content a:visited {
+background-color:#fcfcfc;
+-moz-border-radius:4px;
+}
+.notice p.entry-content .vcard a {
+background-color:#fcfffc;
+-moz-border-radius:4px;
+}
 
 
 
@@ -59,15 +59,12 @@ background-color:transparent;
 
 #site_nav_local_views a {
 border-color:#fff;
+background-color:rgba(255, 255, 255, 0.2);
 }
-
-/*
-#site_nav_global_primary .current a {
-font-weight:bold;
-border-color:#ccc;
-border-style:solid;
+#site_nav_local_views a:hover {
+background-color:rgba(255, 255, 255, 0.7);:
 }
-*/
+
 
 #content,
 #site_nav_local_views .current a {
@@ -139,7 +136,7 @@ color:#555;
 
 /* NOTICES */
 .notice div.entry-content a {
-color:#333;
+
 }
 .notice div.entry-content a:hover {
 }
@@ -169,30 +166,39 @@ background-image:url(../images/icons/twotone/green/flag.gif);
 background-image:url(../images/icons/twotone/green/document.gif);
 }
 
-.notice-options .reply a,
+.notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
 }
-.notice-options .reply a {
+.notice-options .notice_reply a {
 background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
 .notice-options form.notice_favorite input.submit {
 background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 }
-.notice-options form.notice_delete input.submit {
+.notice-options .notice_delete a {
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
-.notice-options a,
-.notice-options input {
-opacity:0.1;
-color:#333;
+div.entry-content,
+div.notice-options {
+opacity:0.2;
+font-family:sans-serif;
+}
+div.entry-content a,
+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 .notice-options a,
-.notices li.hover .notice-options input {
+.notices li.hover div.entry-content,
+.notices li.hover div.notice-options {
 opacity:1;
 }