summaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-11 09:55:47 -0500
committerEvan Prodromou <evan@status.net>2009-12-11 09:55:47 -0500
commite9b733e7f036bc03353ae6dd7b096ea179698a4d (patch)
tree1f93b0344e3d5b7c1e50f9ee272c8dc8d8ecf8c6 /theme
parent78fc9483d4d1fde4561905edf6594b86c4dc374e (diff)
parent85473ecf94e92cd0e6503e4d27ea26452076aafd (diff)
Merge branch '0.9.x' into testing
Diffstat (limited to 'theme')
-rw-r--r--theme/base/css/display.css17
-rw-r--r--theme/default/css/display.css25
-rw-r--r--theme/identica/css/display.css25
3 files changed, 23 insertions, 44 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 44d1d0300..e88e1f222 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -112,7 +112,6 @@ border-style:solid;
line-height:0;
}
-
.form_settings input.remove {
margin-left:11px;
}
@@ -246,7 +245,6 @@ margin-left:11px;
width:auto;
}
-
address {
float:left;
margin-bottom:18px;
@@ -672,8 +670,7 @@ display:block;
text-align:left;
width:100%;
}
-.entity_actions a,
-.entity_remote_subscribe {
+.entity_actions a {
text-decoration:none;
font-weight:bold;
display:block;
@@ -688,7 +685,8 @@ border-radius:4px;
.entity_actions a,
.entity_actions input,
.entity_actions p {
-border:0;
+border-width:2px;
+border-style:solid;
padding-left:23px;
}
@@ -697,19 +695,10 @@ padding-left:23px;
padding:2px 4px 1px 26px;
}
-.entity_remote_subscribe {
-padding:4px;
-border-width:2px;
-border-style:solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
.entity_actions .accept {
margin-bottom:18px;
}
-
.entity_send-a-message button {
position:absolute;
top:3px;
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index d11bbe15e..d4fcb2343 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -30,8 +30,7 @@ border-radius:4px;
input, textarea, select, option {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
-input, textarea, select,
-.entity_remote_subscribe {
+input, textarea, select {
border-color:#AAAAAA;
}
@@ -56,15 +55,12 @@ background:none;
}
.form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+.form_settings .form_note {
background-color:#9BB43E;
}
input.submit,
.form_notice.warning #notice_text-count,
.form_settings .form_note,
-.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
.entity_moderation p,
@@ -82,16 +78,18 @@ background-color:transparent;
input:focus, textarea:focus, select:focus,
.form_notice.warning #notice_data-text,
.form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
+.form_settings .form_note {
border-color:#9BB43E;
}
-input.submit,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+input.submit {
color:#FFFFFF;
}
-input.submit {
+.entity_actions input.submit {
+border-color:transparent;
+text-shadow:none;
+}
+input.submit,
+.form_notice input.submit {
background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x;
text-shadow:0 1px 0 #FFFFFF;
color:#000000;
@@ -109,9 +107,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
text-shadow:none;
}
-.entity_actions input.submit {
-text-shadow:none;
-}
a,
.form_settings input.form_action-primary,
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d65ea2ef6..0e8fa6d79 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -30,8 +30,7 @@ border-radius:4px;
input, textarea, select, option {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
-input, textarea, select,
-.entity_remote_subscribe {
+input, textarea, select {
border-color:#AAAAAA;
}
@@ -56,15 +55,12 @@ background:none;
}
.form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+.form_settings .form_note {
background-color:#9BB43E;
}
input.submit,
.form_notice.warning #notice_text-count,
.form_settings .form_note,
-.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
.entity_moderation p,
@@ -82,16 +78,18 @@ background-color:transparent;
input:focus, textarea:focus, select:focus,
.form_notice.warning #notice_data-text,
.form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
+.form_settings .form_note {
border-color:#9BB43E;
}
-input.submit,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+input.submit {
color:#FFFFFF;
}
-input.submit {
+.entity_actions input.submit {
+border-color:transparent;
+text-shadow:none;
+}
+input.submit,
+.form_notice input.submit {
background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x;
text-shadow:0 1px 0 #FFFFFF;
color:#000000;
@@ -109,9 +107,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
text-shadow:none;
}
-.entity_actions input.submit {
-text-shadow:none;
-}
a,
.form_settings input.form_action-primary,