summaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
Diffstat (limited to 'theme')
-rw-r--r--theme/base/css/display.css222
-rw-r--r--theme/base/css/ie.css8
-rw-r--r--theme/base/css/ie6.css8
-rw-r--r--theme/base/css/ie7.css2
-rw-r--r--theme/identica/css/display.css21
5 files changed, 146 insertions, 115 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index c16fa4ab0..91789f4f1 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -17,8 +17,8 @@ width:1004px;
width:71.714em;
}
h1,h2,h3,h4,h5,h6 {
- text-transform:uppercase;
- margin-bottom:7px;
+text-transform:uppercase;
+margin-bottom:7px;
}
h1 {
font-size:1.4em;
@@ -34,8 +34,6 @@ h6 { font-size:0.9em; }
caption {
font-weight:bold;
}
-.opened { display: block !important;}
-.closed { display: none !important;}
legend {
font-weight:bold;
@@ -56,6 +54,7 @@ border-radius:4px;
-moz-border-radius:4px;
-webkit-border-radius:4px;
}
+
input.submit {
font-weight:bold;
}
@@ -79,9 +78,6 @@ form label {
font-weight:bold;
/*margin:0 0 11px 0;*/
}
-form ul li input {
-}
-
input.checkbox {
position:relative;
top:2px;
@@ -147,7 +143,11 @@ font-weight:bold;
#form_settings_profile legend,
#form_login legend,
-#form_register legend {
+#form_register legend,
+#form_password legend,
+#form_settings_avatar legend,
+#newgroup legend,
+#editgroup legend {
display:none;
}
@@ -187,6 +187,8 @@ border-radius:4px;
padding:0 7px;
}
+
+
/* FORM SETTINGS */
@@ -443,7 +445,7 @@ margin-left:4px;
#form_notice .form_note {
position:absolute;
-top:120px;
+top:118px;
right:98px;
z-index:9;
}
@@ -455,10 +457,11 @@ display:none;
#notice_text-count {
font-weight:bold;
line-height:1.15;
+padding:1px 2px;
}
#form_notice #notice_data-attach_view {
-/*position:absolute;*/
+position:absolute;
top:25px;
right:30px;
margin-left:4px;
@@ -502,8 +505,8 @@ float:left;
-/* user_profile */
-#user_profile {
+/* entity_profile */
+.entity_profile {
position:relative;
width:475px;
min-height:123px;
@@ -511,23 +514,23 @@ float:left;
margin-bottom:17px;
margin-left:0;
}
-#user_profile dt,
-#user_statistics dt {
+.entity_profile dt,
+#entity_statistics dt {
font-weight:bold;
}
-#user_profile .user_depiction {
+.entity_profile .entity_depiction {
float:left;
position:absolute;
top:0;
left:0;
width:96px;
}
-#user_profile .user_fn,
-#user_profile .user_nickname,
-#user_profile .user_location,
-#user_profile .user_url,
-#user_profile .user_note,
-#user_profile .user_tags {
+.entity_profile .entity_fn,
+.entity_profile .entity_nickname,
+.entity_profile .entity_location,
+.entity_profile .entity_url,
+.entity_profile .entity_note,
+.entity_profile .entity_tags {
float:left;
clear:left;
margin-left:113px;
@@ -535,84 +538,82 @@ width:322px;
margin-bottom:4px;
}
-#user_profile .user_fn,
-#user_profile .user_nickname {
+.entity_profile .entity_fn,
+.entity_profile .entity_nickname {
width:auto;
clear:none;
}
-#user_profile .user_fn {
+
+.entity_profile .entity_fn {
margin-left:11px;
margin-right:4px;
}
-#user_profile .user_fn .fn {
+.entity_profile .entity_fn .fn {
font-weight:bold;
font-style:normal;
}
-#user_profile .nickname {
+.entity_profile .nickname {
font-style:italic;
font-weight:bold;
}
-#user_profile .user_fn dd:before {
+.entity_profile .entity_fn dd:before {
content: "(";
font-weight:normal;
}
-#user_profile .user_fn dd:after {
+.entity_profile .entity_fn dd:after {
content: ")";
font-weight:normal;
}
-#user_profile dt {
+.entity_profile dt {
display:none;
}
-#user_profile h2 {
+.entity_profile h2 {
display:none;
}
-/* user_profile */
+/* entity_profile */
-/*user_actions*/
-#user_actions {
-clear:left;
-float:left;
-position:absolute;
-top:0;
-right:0;
+/*entity_actions*/
+.entity_actions {
+float:right;
+
}
-#user_actions h2 {
+.entity_actions h2 {
display:none;
}
-#user_actions ul {
+.entity_actions ul {
list-style-type:none;
}
-#user_actions li {
+.entity_actions li {
margin-bottom:4px;
}
-#user_actions li:first-child {
+.entity_actions li:first-child {
border-top:0;
}
-#user_actions fieldset {
+.entity_actions fieldset {
border:0;
padding:0;
}
-#user_actions legend {
+.entity_actions legend {
display:none;
}
-#user_actions input.submit {
+.entity_actions input.submit {
display:block;
text-align:left;
cursor:pointer;
width:100%;
}
-#user_actions a {
+.entity_actions a,
+#entity_nudge p {
text-decoration:none;
font-weight:bold;
-width:100%;
display:block;
}
@@ -620,35 +621,24 @@ display:block;
.form_user_block input.submit,
.form_user_unblock input.submit,
-#user_send-a-message a,
-.form_user_nudge input.submit {
+#entity_send-a-message a,
+.form_user_nudge input.submit,
+#entity_nudge p {
border:0;
padding-left:20px;
}
-#user_send-a-message a {
+#entity_send-a-message a,
+#entity_nudge p {
padding:4px 4px 4px 23px;
-
}
-#user_subscribe input.submit,
-.form_user_subscribe input.submit {
-
-}
-
-
-
-#user_send-a-message form {
-}
-
-#user_send-a-message textarea {
-}
-.user_tags ul {
+.entity_tags ul {
list-style-type:none;
}
-.user_tags li {
+.entity_tags li {
display:inline;
margin-right:1em;
float:left;
@@ -659,41 +649,43 @@ float:left;
.aside .section {
margin-bottom:29px;
clear:both;
+float:left;
+width:100%;
}
.aside .section h2 {
text-transform:uppercase;
font-size:1em;
}
-#user_statistics dt,
-#user_statistics dd {
+#entity_statistics dt,
+#entity_statistics dd {
display:inline;
}
-#user_statistics dt:after {
+#entity_statistics dt:after {
content: ":";
}
#user_subscriptions,
-#user_subscriptions-common {
-float:left;
+#user_subscribers,
+#user_groups, {
+
}
-#user_subscriptions ul.users {
+.section ul.entities {
width:220px;
float:left;
}
-#user_subscriptions .users li {
+.section .entities li {
list-style-type:none;
float:left;
margin-right:7px;
margin-bottom:7px;
}
-#user_subscriptions .users li .photo {
-width:24px;
-height:24px;
+.section .entities li .photo {
margin-right:0;
+margin-bottom:0;
}
-#user_subscriptions .users li .fn {
+.section .entities li .fn {
display:none;
}
.aside .section .more {
@@ -702,29 +694,36 @@ clear:both;
-.profile #user_profile {
+.profile .entity_profile {
margin-bottom:0;
min-height:60px;
}
+.profile .form_user_subscribe,
.profile .form_user_unsubscribe {
float:right;
}
+.profile .form_user_subscribe legend,
+.profile .form_user_unsubscribe legend {
+display:none;
+}
+
+
.profiles {
list-style-type:none;
}
-.profile #user_profile .user_location {
+.profile .entity_profile .entity_location {
width:auto;
clear:none;
margin-left:11px;
}
-.profile #user_profile dl,
-.profile #user_profile dd {
+.profile .entity_profile dl,
+.profile .entity_profile dd {
display:inline;
float:none;
}
-.profile #user_profile .user_note,
-.profile #user_profile .user_url {
+.profile .entity_profile .entity_note,
+.profile .entity_profile .entity_url {
margin-left:59px;
clear:none;
display:block;
@@ -933,7 +932,7 @@ outline:none;
}
.notice-options .notice_reply a,
-.notice-options form input.submit {
+.notice-options input.submit {
display:block;
border:0;
}
@@ -1016,18 +1015,18 @@ border-right:0;
-/*If there is hentry on #content_inner, this doesn't need to be specific to #doc */
-#doc #content_inner p {
+/*If there is hentry on #content_inner, then this doesn't need to be specific to #doc or any other section */
+.hentry .entry-content p {
margin-bottom:18px;
}
-#doc #content_inner ol,
-#doc #content_inner ul {
+.hentry entry-content ol,
+.hentry .entry-content ul {
list-style-position:inside;
}
-#doc #content_inner li {
+.hentry .entry-content li {
margin-bottom:18px;
}
-#doc #content_inner li li {
+.hentry .entry-content li li {
margin-left:18px;
}
@@ -1049,9 +1048,9 @@ background-color:#D1D9E4;
-#user_actions #user_subscribe .form_note,
-#user_actions #user_subscribe .form_data,
-#user_actions #user_subscribe .form_actions label {
+.entity_actions #user_subscribe .form_note,
+.entity_actions #user_subscribe .form_data,
+.entity_actions #user_subscribe .form_actions label {
display:none;
}
#form_user-relationship .form_note,
@@ -1060,7 +1059,7 @@ display:none;
display:block;
}
-#user_actions #user-relationship_submit {
+.entity_actions #user-relationship_submit {
margin-bottom:0;
}
#form_user-relationship .form_data li label {
@@ -1160,52 +1159,65 @@ clear:both;
-
-#photo_original,
-#photo_preview {
+#form_settings_avatar li {
+width:auto;
+}
+#form_settings_avatar input {
+margin-left:0;
+}
+#avatar_original,
+#avatar_preview {
float:left;
}
-#photo_preview,
-#settings_photo_action-crop {
+#avatar_preview {
margin-left:29px;
}
-#photo_preview_view {
+#avatar_preview_view {
height:96px;
width:96px;
+margin-bottom:18px;
overflow:hidden;
}
+#settings_attach,
+#form_settings_avatar .form_actions {
+clear:both;
+}
+
+#form_settings_avatar .form_actions {
+margin-bottom:0;
+}
-.section .groups,
+#groups_related ul,
#users_featured ul {
list-style-type:none;
}
-.section .groups li,
+#groups_related li,
#users_featured li {
margin-top:11px;
float:left;
width:100%;
}
-.section .groups li:first-child,
+#groups_related li:first-child,
#users_featured li:first-child {
margin-top:0;
}
-.section .groups .vcard,
+#groups_related .vcard,
#users_featured .vcard {
float:left;
margin-bottom:-23px;
}
-.section .groups dl,
+#groups_related dl,
#users_featured dl {
float:left;
margin-left:63px;
clear:left;
}
-.section .groups dt,
+#groups_related dt,
#users_featured dt {
display:none;
font-weight:bold;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 9baa953b3..08b027b59 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -3,7 +3,7 @@
#aside_primary {
padding-left:11px;
}
-.notice-options form input.submit {
+.notice-options input.submit {
font-size:0;
margin-top:3px;
height:16px;
@@ -23,4 +23,8 @@ margin-left:-7px;
.notice div.entry-content .timestamp a {
margin-right:4px;
-} \ No newline at end of file
+}
+
+.entity_profile .entity_nickname {
+padding-right:3px;
+}
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
new file mode 100644
index 000000000..4a2316903
--- /dev/null
+++ b/theme/base/css/ie6.css
@@ -0,0 +1,8 @@
+/* IE6 specific styles */
+.entity_profile .entity_nickname,
+.entity_profile .entity_location,
+.entity_profile .entity_url,
+.entity_profile .entity_note,
+.entity_profile .entity_tags {
+margin-left:55px;
+}
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
index a6e2548ab..a6ee001e2 100644
--- a/theme/base/css/ie7.css
+++ b/theme/base/css/ie7.css
@@ -2,4 +2,4 @@
#form_notice textarea {
width:370px;
-} \ No newline at end of file
+}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 2b91c5504..1df14a7f1 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -22,6 +22,7 @@ input, textarea, select {
border-color:#aaa;
}
+
input.submit,
#form_notice.warning #notice_text-count,
#nav_register a,
@@ -42,8 +43,9 @@ a,
div.notice-options input,
.form_user_block input.submit,
.form_user_unblock input.submit,
-#user_send-a-message a,
-.form_user_nudge input.submit {
+#entity_send-a-message a,
+.form_user_nudge input.submit,
+#entity_nudge p {
color:#002E6E;
}
@@ -55,7 +57,7 @@ background-color:#fcfffc;
}
#aside_primary,
-#user_subscribe a,
+#entity_subscribe a,
#TB_window input.submit,
.form_user_subscribe input.submit {
background-color:#CEE1E9;
@@ -132,26 +134,31 @@ background-image:url(../../base/images/icons/icon_vcard.gif);
}
-#user_send-a-message a,
+#entity_send-a-message a,
.form_user_nudge input.submit,
.form_user_block input.submit,
-.form_user_unblock input.submit {
+.form_user_unblock input.submit,
+#entity_nudge p {
background-position: 0 40%;
background-repeat: no-repeat;
background-color:transparent;
}
+.form_group_join input.submit,
+.form_group_leave input.submit
.form_user_subscribe input.submit,
.form_user_unsubscribe input.submit {
background-color:#A9BF4F;
color:#fff;
}
-.form_user_unsubscribe input.submit {
+.form_user_unsubscribe input.submit,
+.form_group_leave input.submit {
background-color:#97BFD1;
}
-#user_send-a-message a {
+#entity_send-a-message a {
background-image:url(../images/icons/twotone/green/quote.gif);
}
+#entity_nudge p,
.form_user_nudge input.submit {
background-image:url(../images/icons/twotone/green/mail.gif);
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-11 01:50:54 +0000