summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-16 22:43:23 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-01-16 22:43:23 +0000
commit400927f757b1e4d13a6703c73125a4a38137eba9 (patch)
tree72416883e83a922e1206e836ce1e3e669f3af6dd
parent1b7b58192bd34f7d34ae6712ac1b09130bca6bd0 (diff)
parent98e8a24d88d19fb47b74e150e76efafb6e5e90ad (diff)
Merge branch 'uiredesign' of ../csarven into uiredesign
-rw-r--r--js/util.js6
-rw-r--r--theme/base/css/display.css2
-rw-r--r--theme/identica/css/display.css10
3 files changed, 9 insertions, 9 deletions
diff --git a/js/util.js b/js/util.js
index c43af2333..35d69310b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -22,13 +22,13 @@ $(document).ready(function(){
var maxLength = 140;
var currentLength = $("#notice_data-text").val().length;
var remaining = maxLength - currentLength;
- var counter = $("#counter");
+ var counter = $("#notice_text-count");
counter.text(remaining);
if (remaining <= 0) {
- $("#form_notice").addClass("response_error");
+ $("#form_notice").addClass("warning");
} else {
- $("#form_notice").removeClass("response_error");
+ $("#form_notice").removeClass("warning");
}
}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 2892ca4f1..b8b260266 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -638,7 +638,7 @@ margin-right:11px;
.notice .author a {
}
.notice .author:after {
-content:":";
+/*content:":";*/
}
.vcard .photo {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 1eba97a45..c2eb4ef65 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -41,12 +41,12 @@ color:#88171A;
#notice_text-count {
color:#333;
}
-#notice_text-count.warning {
-color:#FDFF00;
-background-color:#000;
+#form_notice.warning #notice_text-count {
+color:#000;
+background-color:#A9BF4F;
}
-#notice_data-text.warning {
-border-color:#FDFF00;
+#form_notice.warning #notice_data-text {
+border-color:#A9BF4F;
}
#form_notice #notice_data-attach_view {