summaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
Diffstat (limited to 'theme')
-rw-r--r--theme/base/css/display.css128
-rw-r--r--theme/base/css/ie.css31
-rw-r--r--theme/base/css/ie6.css19
-rw-r--r--theme/base/css/modal.css22
-rw-r--r--theme/base/css/modal_ie.css16
-rw-r--r--theme/base/css/print.css2
-rw-r--r--theme/base/images/icons/icon_processing.gifbin0 -> 673 bytes
-rw-r--r--theme/base/images/x.pngbin1066 -> 0 bytes
-rw-r--r--theme/default/css/display.css28
-rw-r--r--theme/identica/css/display.css28
10 files changed, 118 insertions, 156 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index c741ed4cb..2fb1c007f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -29,6 +29,7 @@ h1 {
font-size:1.4em;
margin-bottom:18px;
}
+#showstream h1 { display:none; }
h2 { font-size:1.3em; }
h3 { font-size:1.2em; }
h4 { font-size:1.1em; }
@@ -83,12 +84,13 @@ left:0;
border:0;
}
-#page_notice .error,
-#page_notice .success {
+.error,
+.success {
padding:4px 7px;
border-radius:4px;
-moz-border-radius:4px;
-webkit-border-radius:4px;
+margin-bottom:18px;
}
form label.submit {
display:none;
@@ -150,7 +152,9 @@ font-weight:bold;
#form_openid_login legend,
#form_search legend,
#form_invite legend,
-#form_notice_delete legend {
+#form_notice_delete legend,
+#form_password_recover legend,
+#form_password_change legend {
display:none;
}
@@ -214,6 +218,9 @@ margin-right:0;
address .fn {
font-weight:bold;
}
+address img + .fn {
+display:none;
+}
#header {
width:100%;
@@ -245,6 +252,7 @@ position:absolute;
top:65px;
right:18px;
width:250px;
+width:24%;
}
#page_notice {
clear:both;
@@ -254,9 +262,8 @@ margin-bottom:18px;
#anon_notice {
float:left;
-width:432px;
-width:28.052em;
-padding:11px;
+width:43.2%;
+padding:1.1%;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
@@ -364,7 +371,9 @@ margin-right:4px;
#wrap {
margin:0 auto;
-width:1003px;
+width:100%;
+min-width:760px;
+max-width:1003px;
overflow:hidden;
}
@@ -376,14 +385,17 @@ margin-bottom:1em;
}
#content {
-width:644px;
-padding:18px;
+width:64.009%;
+min-height:259px;
+padding:1.795%;
float:left;
border-radius:7px;
-moz-border-radius:7px;
-moz-border-radius-topleft:0;
-webkit-border-radius:7px;
-webkit-border-top-left-radius:0;
+border-style:solid;
+border-width:1px;
}
#content_inner {
@@ -393,10 +405,11 @@ float:left;
}
#aside_primary {
-width:280px;
+width:27.917%;
+min-height:259px;
float:left;
-margin-left:4px;
-padding:18px;
+margin-left:0.385%;
+padding:1.795%;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
@@ -404,9 +417,8 @@ border-width:1px;
border-style:solid;
}
-/*Start: FORM NOTICE*/
#form_notice {
-width:458px;
+width:45.664%;
float:left;
position:relative;
line-height:1;
@@ -419,40 +431,30 @@ padding:0;
display:none;
}
#form_notice textarea {
+float:left;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
-width:370px;
+width:80.789%;
height:67px;
line-height:1.5;
padding:7px 7px 16px 7px;
}
#form_notice label {
display:block;
+float:left;
font-size:1.3em;
margin-bottom:7px;
}
-#form_notice .form_data li {
-float:left;
-}
-
-#form_notice #notice_attach_file label,
#form_notice #notice_submit label {
display:none;
}
-
-#form_notice #notice_attachment {
-margin-top:25px;
-margin-left:4px;
-}
-
#form_notice .form_note {
position:absolute;
top:99px;
right:98px;
z-index:9;
}
-
#form_notice .form_note dt {
font-weight:bold;
display:none;
@@ -462,51 +464,28 @@ font-weight:bold;
line-height:1.15;
padding:1px 2px;
}
-
-#form_notice #notice_data-attach_view {
-position:absolute;
-top:25px;
-right:30px;
-margin-left:4px;
+#form_notice #notice_action-submit {
+width:14%;
+height:47px;
padding:0;
-width:16px;
-height:16px;
-border:0;
-text-indent:-9999px;
-}
-#form_notice .form_actions {
position:absolute;
bottom:0;
right:0;
}
-#form_notice .form_actions input.submit {
-width:60px;
-padding:8px;
-}
-
-#form_notice li {
-margin-bottom:0;
+#form_notice label[for=to] {
+margin-top:7px;
}
-
-#form_notice #notice_to {
+#form_notice select[id=to] {
margin-bottom:7px;
-}
-
-#notice_to label {
-float:left;
-margin-right:18px;
-margin-top:11px;
-}
-#notice_to select {
+margin-left:18px;
float:left;
}
-/*end FORM NOTICE*/
/* entity_profile */
.entity_profile {
position:relative;
-width:475px;
+width:67.702%;
min-height:123px;
float:left;
margin-bottom:18px;
@@ -536,7 +515,6 @@ margin-bottom:18px;
.entity_profile .entity_tags {
margin-left:113px;
margin-bottom:4px;
-width:322px;
}
.entity_profile .entity_fn,
@@ -564,14 +542,14 @@ display:none;
.entity_profile h2 {
display:none;
}
-
/* entity_profile */
/*entity_actions*/
.entity_actions {
float:right;
-margin-left:28px;
+margin-left:4.35%;
+max-width:25%;
}
.entity_actions h2 {
display:none;
@@ -630,7 +608,9 @@ border-radius:4px;
-moz-border-radius:4px;
-webkit-border-radius:4px;
}
-
+.entity_actions .accept {
+margin-bottom:18px;
+}
.entity_tags ul {
list-style-type:none;
@@ -712,7 +692,7 @@ float:none;
.profile .entity_profile .entity_note,
.profile .entity_profile .entity_url,
.profile .entity_profile .entity_tags,
-.profile .entity_profile .form_subcription_edit {
+.profile .entity_profile .form_subscription_edit {
margin-left:59px;
clear:none;
display:block;
@@ -724,7 +704,7 @@ margin-right:11px;
}
-.profile .entity_profile .form_subcription_edit label {
+.profile .entity_profile .form_subscription_edit label {
font-weight:normal;
margin-right:11px;
}
@@ -939,10 +919,12 @@ display:none;
border:0;
padding:0;
}
-/*END: NOTICES */
-
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
#new_group, #group_search {
margin-bottom:18px;
}
@@ -1171,4 +1153,16 @@ clear:both;
margin-bottom:0;
}
-
+.instructions ul {
+list-style-position:inside;
+}
+.instructions p,
+.instructions ul {
+margin-bottom:18px;
+}
+.help dt {
+display:none;
+}
+.guide {
+clear:both;
+}
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 45176a201..5d8bea8ae 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -1,8 +1,21 @@
/* IE specific styles */
-
-#aside_primary {
-padding-left:11px;
+legend {
+margin-left:-7px;
+}
+input.checkbox {
+top:0;
+}
+#form_notice textarea {
+width:78%;
+}
+#form_notice #notice_action-submit {
+width:17%;
+max-width:17%;
}
+#anon_notice {
+max-width:39%;
+}
+
.notice-options input.submit {
font-size:0;
margin-top:3px;
@@ -11,15 +24,9 @@ text-align:right;
text-indent:0;
width:24px;
}
-
-input.checkbox {
-top:0;
-}
-
-legend {
-margin-left:-7px;
-}
-
.notice div.entry-content .timestamp a {
margin-right:4px;
}
+.entity_profile {
+width:64%;
+}
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index 10b31cbcb..76a82c004 100644
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -1,4 +1,17 @@
/* IE6 specific styles */
+address {
+margin-left:7px;
+}
+address .fn {
+display:none;
+}
+#content {
+width:70%;
+}
+#aside_primary {
+padding:5%;
+width:29.5%;
+}
.entity_profile .entity_nickname,
.entity_profile .entity_location,
.entity_profile .entity_url,
@@ -9,3 +22,9 @@ margin-left:0;
.entity_profile .entity_depiction {
margin-bottom:123px;
}
+.entity_actions {
+width:20%;
+}
+.notice div.entry-content {
+width:63%;
+}
diff --git a/theme/base/css/modal.css b/theme/base/css/modal.css
deleted file mode 100644
index 985e4adfa..000000000
--- a/theme/base/css/modal.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SimpleModal Basic Modal Dialog
- * http://www.ericmmartin.com/projects/simplemodal/
- * http://code.google.com/p/simplemodal/
- *
- * Copyright (c) 2008 Eric Martin - http://ericmmartin.com
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * Revision: $Id: basic.css 162 2008-12-01 23:36:58Z emartin24 $
- *
- */
-
-
-/* Overlay */
-#simplemodal-overlay {background-color:#000; cursor:wait;}
-
-/* Container */
-#simplemodal-container {height:240px; width:320px; background-color:#fff; border:3px solid #ccc;}
-#simplemodal-container a.modalCloseImg {background:url(../images/x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-18px; cursor:pointer;}
-#simplemodal-container #basicModalContent {padding:8px;}
diff --git a/theme/base/css/modal_ie.css b/theme/base/css/modal_ie.css
deleted file mode 100644
index eab4637c0..000000000
--- a/theme/base/css/modal_ie.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SimpleModal Basic Modal Dialog
- * http://www.ericmmartin.com/projects/simplemodal/
- * http://code.google.com/p/simplemodal/
- *
- * Copyright (c) 2008 Eric Martin - http://ericmmartin.com
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * Revision: $Id: basic_ie.css 162 2008-12-01 23:36:58Z emartin24 $
- *
- */
-
-/* IE 6 hacks*/
-#simplemodal-container a.modalCloseImg {background:none; right:-14px; width:22px; height:26px; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/x.png',sizingMethod='scale');}
diff --git a/theme/base/css/print.css b/theme/base/css/print.css
index 2da3e5e44..d76dd608c 100644
--- a/theme/base/css/print.css
+++ b/theme/base/css/print.css
@@ -21,7 +21,7 @@ p { orphans: 2; widows: 1; }
.entity_actions,
.notice-options,
#aside_primary,
-.form_subcription_edit .submit {
+.form_subscription_edit .submit {
display:none;
}
diff --git a/theme/base/images/icons/icon_processing.gif b/theme/base/images/icons/icon_processing.gif
new file mode 100644
index 000000000..d0bce1542
--- /dev/null
+++ b/theme/base/images/icons/icon_processing.gif
Binary files differ
diff --git a/theme/base/images/x.png b/theme/base/images/x.png
deleted file mode 100644
index c11f7af69..000000000
--- a/theme/base/images/x.png
+++ /dev/null
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 85b5aa13e..c5d694610 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -17,10 +17,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
font-size:1em;
}
address {
-margin-right:71px;
-}
-address .fn {
-display:none;
+margin-right:7.18%;
}
input, textarea, select, option {
@@ -40,7 +37,6 @@ background:none;
input.submit,
#form_notice.warning #notice_text-count,
-#nav_register a,
.form_settings .form_note,
.entity_remote_subscribe {
background-color:#A9BF4F;
@@ -51,7 +47,6 @@ input:focus, textarea:focus, select:focus,
border-color:#A9BF4F;
}
input.submit,
-#nav_register a,
.entity_remote_subscribe {
color:#fff;
}
@@ -94,12 +89,10 @@ color:#333;
#form_notice.warning #notice_text-count {
color:#000;
}
-
-
-#nav_register a {
-text-decoration:none;
-font-weight:bold;
-padding:2px 4px;
+#form_notice.processing #notice_action-submit {
+background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+cursor:wait;
+text-indent:-9999px;
}
#content,
@@ -120,10 +113,10 @@ background-color:rgba(255, 255, 255, 0.7);
}
-#page_notice .error {
+.error {
background-color:#F7E8E8;
}
-#page_notice .success {
+.success {
background-color:#EFF3DC;
}
@@ -171,7 +164,8 @@ background-color:#A9BF4F;
color:#fff;
}
.form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
+.form_group_leave input.submit,
+.form_user_authorization input.reject {
background-color:#97BFD1;
}
@@ -238,10 +232,6 @@ background-color:#fcfcfc;
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
-}
.pagination .nav_prev a,
.pagination .nav_next a {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 576a2e14b..c32b6269d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -17,10 +17,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
font-size:1em;
}
address {
-margin-right:71px;
-}
-address .fn {
-display:none;
+margin-right:7.18%;
}
input, textarea, select, option {
@@ -40,7 +37,6 @@ background:none;
input.submit,
#form_notice.warning #notice_text-count,
-#nav_register a,
.form_settings .form_note,
.entity_remote_subscribe {
background-color:#9BB43E;
@@ -51,7 +47,6 @@ input:focus, textarea:focus, select:focus,
border-color:#9BB43E;
}
input.submit,
-#nav_register a,
.entity_remote_subscribe {
color:#fff;
}
@@ -94,12 +89,10 @@ color:#333;
#form_notice.warning #notice_text-count {
color:#000;
}
-
-
-#nav_register a {
-text-decoration:none;
-font-weight:bold;
-padding:2px 4px;
+#form_notice.processing #notice_action-submit {
+background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+cursor:wait;
+text-indent:-9999px;
}
#content,
@@ -120,10 +113,10 @@ background-color:rgba(255, 255, 255, 0.7);
}
-#page_notice .error {
+.error {
background-color:#F7E8E8;
}
-#page_notice .success {
+.success {
background-color:#EFF3DC;
}
@@ -171,7 +164,8 @@ background-color:#9BB43E;
color:#fff;
}
.form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
+.form_group_leave input.submit,
+.form_user_authorization input.reject {
background-color:#87B4C8;
}
@@ -238,10 +232,6 @@ background-color:#fcfcfc;
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
-}
.pagination .nav_prev a,
.pagination .nav_next a {
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-23 02:25:52 +0000