From caaf237de8e07cecf9d1bbe20e98ca5c1a957f34 Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 14 Jan 2009 22:19:17 +0000 Subject: Base theme stylesheet includes layout, and typography information Identica theme stylesheet includes colour and background information --- theme/identica/css/display.css | 226 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) create mode 100644 theme/identica/css/display.css (limited to 'theme/identica/css') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css new file mode 100644 index 000000000..4659c7f2a --- /dev/null +++ b/theme/identica/css/display.css @@ -0,0 +1,226 @@ +/* theme: identica */ +html { + background-color:#ddd; +} +body { + font-family: sans-serif; + 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; +} +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; +} + + + +#supplemental_primary { +background-color:#CEE1E9; +} + + + +#form_notice label { +color:#88171A; +} +#notice_text-count { +color:#333; +} +#notice_text-count.warning { +color:#FDFF00; +background-color:#000; +} +#notice_data-text.warning { +border-color:#FDFF00; +} + +#form_notice #notice_data-attach_view { +background-image:url(../images/icons/twotone/green/paper-clip.gif); +background-repeat:no-repeat; +background-position:0 45%; +background-color:transparent; +} + + +#site_nav_local_views a { +border-color:#fff; +} + +/* +#site_nav_global_primary .current a { +font-weight:bold; +border-color:#ccc; +border-style:solid; +} +*/ + +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + + + + + +#export_data li a { +background-repeat:no-repeat; +background-position:0 45%; +} +#export_data li a.rss { +background-image:url(../images/icons/icon_rss.jpg); +} +#export_data li a.atom { +background-image:url(../images/icons/icon_atom.jpg); +} +#export_data li a.foaf { +background-image:url(../images/icons/icon_foaf.gif); +=} +#export_data li a.export_vcard { +background-image:url(../images/icons/icon_vcard.gif); +} + + +/*user_actions*/ +#user_actions li { +border-top-color:#eee; +} +#user_actions a { +color:#000; +} +#user_subscribe a, +#TB_window input.submit, +.form_user_subscribe input.submit { +background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat; +} +.form_user_unsubscribe input.submit { +background-color:#647819; +color:#fff; +} +#user_send-a-message a { +background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat; +} +.form_user_nudge input.submit { +background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat; +} +.form_user_block input.submit { +background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat; +} + + +.user_tags .mark_hash { +color:#555; +} + + + +.vcard .fn { +border-bottom-color:#ccc; +} +.vcard .fn:hover { +border-bottom-color:#555; +} + + + + +/* NOTICES */ +.notice div.entry-content a { +color:#333; +border-bottom-color:#ccc; +} +.notice div.entry-content a:hover { +border-bottom-color:#555; +} + + +.notice-data a span { +background-color:transparent; +background-repeat:no-repeat; +background-position:0 45%; +} +.notice_video .notice-data a span { +background-image:url(../images/icons/twotone/green/camera.gif); +} +.notice_audio .notice-data a span { +background-image:url(../images/icons/twotone/green/music.gif); +} +.notice_image .notice-data a span { +background-image:url(../images/icons/twotone/green/search.gif); +} +.notice_event .notice-data a span { +background-image:url(../images/icons/twotone/green/calendar.gif); +} +.notice_location .notice-data a span { +background-image:url(../images/icons/twotone/green/flag.gif); +} +.notice_document .notice-data a span { +background-image:url(../images/icons/twotone/green/document.gif); +} + +.notice-options .reply a, +.notice-options form input.submit { +background-color:transparent; +color:#333333; +border-bottom-color:#ccc; +} +.notice-options .reply a { +background:transparent url(../images/icons/twotone/green/undo.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 { +background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; +} +/*END: NOTICES */ + + + +.pagination .nav_prev a, +.pagination .nav_next a { +background-repeat:no-repeat; +} +.pagination .nav_prev a { +background-image:url(../images/icons/twotone/green/arrow-left.gif); +background-position:0 45%; +} +.pagination .nav_next a { +background-image:url(../images/icons/twotone/green/arrow-right.gif); +background-position:100% 45%; +} + + + +#home #intro #guide_steps li a { +border-color:#ccc; +color:#fff; +} +#home #intro #step_join-now a { +background-color:#f00; +} +#home #intro #step_start-a-group a { +background-color:#0f0; +} +#home #intro #step_create-a-community a { +background-color:#00f; +} + + + + -- cgit v1.2.3-54-g00ecf From 7bb074898f0be7e606eeb9844adcba001c571b38 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 20:15:11 +0000 Subject: Up to date --- theme/base/css/display.css | 3 ++- theme/identica/css/display.css | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5fc24779b..8b2e2f801 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -127,6 +127,7 @@ font-weight:bold; address { float:left; margin-bottom:18px; +margin-left:18px; } address .fn, address .email { @@ -316,7 +317,7 @@ padding:18px 4px 18px 18px; #form_notice { width:384px; float:left; -margin-left:86px; +margin-left:68px; position:relative; line-height:1; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4659c7f2a..f6a4747c7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -83,16 +83,16 @@ background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../images/icons/icon_rss.jpg); +background-image:url(../../base/images/icons/icon_rss.jpg); } #export_data li a.atom { -background-image:url(../images/icons/icon_atom.jpg); +background-image:url(../../base/images/icons/icon_atom.jpg); } #export_data li a.foaf { -background-image:url(../images/icons/icon_foaf.gif); +background-image:url(../../base/images/icons/icon_foaf.gif); =} #export_data li a.export_vcard { -background-image:url(../images/icons/icon_vcard.gif); +background-image:url(../../base/images/icons/icon_vcard.gif); } -- cgit v1.2.3-54-g00ecf From 07e84976c2f4038f36570d969c4be63b134cf60d Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 22:02:58 +0000 Subject: Changed from supplemental_primary to aside_primary --- theme/base/css/display.css | 2 +- theme/identica/css/display.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 8b2e2f801..8685bdc87 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -302,7 +302,7 @@ float:left; position:relative; } -#supplemental_primary { +#aside_primary { width:300px; float:left; margin-left:2px; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index f6a4747c7..4f2ba4652 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -29,7 +29,7 @@ color:#002E6E; -#supplemental_primary { +#aside_primary { background-color:#CEE1E9; } -- cgit v1.2.3-54-g00ecf From ed8c3794df59cb03c366e0a16188cefbd6719c90 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 00:50:46 +0000 Subject: Created reply icon (vertical flip of undo) --- theme/identica/css/display.css | 2 +- theme/identica/images/icons/twotone/green/reply.gif | Bin 0 -> 79 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 theme/identica/images/icons/twotone/green/reply.gif (limited to 'theme/identica/css') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4f2ba4652..7e0c6d7b4 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -180,7 +180,7 @@ color:#333333; border-bottom-color:#ccc; } .notice-options .reply a { -background:transparent url(../images/icons/twotone/green/undo.gif) no-repeat 0 45%; +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%; diff --git a/theme/identica/images/icons/twotone/green/reply.gif b/theme/identica/images/icons/twotone/green/reply.gif new file mode 100644 index 000000000..6ff01bb35 Binary files /dev/null and b/theme/identica/images/icons/twotone/green/reply.gif differ -- cgit v1.2.3-54-g00ecf From 944876181cdd3fa1d44e517d6c103fd2ec3a8783 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 04:50:44 +0000 Subject: NoticeOver styles --- theme/base/css/display.css | 11 ++++++----- theme/identica/css/display.css | 19 ++++++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b58a5b09c..b039dc110 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -36,7 +36,7 @@ input, textarea, select, option { padding:4px; font-family:sans-serif; font-size:1em; --moz-border:radius:4px; +-moz-border-radius:4px; } select, option { padding-bottom:0; @@ -47,7 +47,7 @@ padding:11px; input:focus, textarea:focus, select:focus { border-width:2px; border-style: solid; --moz-border:radius:4px; +-moz-border-radius:4px; } caption { font-weight:bold; @@ -611,6 +611,9 @@ border-top:1px dashed #D1D9E4; list-style-type:none; /*margin-bottom:11px;*/ } +.notices li.over { +background-color:#fcfcfc; +} /* NOTICES */ @@ -786,11 +789,9 @@ display:none; .notice-options form input.submit { display:block; border:0; -border-bottom-width:1px; -border-bottom-style:dotted; padding-left:20px; - } + .notice-options .reply a { text-decoration:none; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 7e0c6d7b4..6ae85449a 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -176,8 +176,6 @@ background-image:url(../images/icons/twotone/green/document.gif); .notice-options .reply a, .notice-options form input.submit { background-color:transparent; -color:#333333; -border-bottom-color:#ccc; } .notice-options .reply a { background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%; @@ -188,6 +186,20 @@ background:transparent url(../images/icons/twotone/green/favourite.gif) no-repea .notice-options form.notice_delete input.submit { background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } + +.notice-options a, +.notice-options input { +opacity:0.1; +} +.notices li.hover { +background-color:#fcfcfc; +} +.notices li.hover .notice-options a, +.notices li.hover .notice-options input { +opacity:1; +} + + /*END: NOTICES */ @@ -221,6 +233,3 @@ background-color:#0f0; background-color:#00f; } - - - -- cgit v1.2.3-54-g00ecf From 8abf9351860408db930ce9f423f94baa97ed5f56 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 17:50:14 +0000 Subject: .notice style update --- theme/base/css/display.css | 59 ++++++++++++------------------------------ theme/identica/css/display.css | 5 +--- 2 files changed, 18 insertions(+), 46 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 4d7611b30..2892ca4f1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -633,11 +633,7 @@ padding-left:28px; .notice .author { -float:left; -width:96px; -width:199px; -margin-left:-217px; -margin-left:-199px; +margin-right:11px; } .notice .author a { } @@ -647,34 +643,29 @@ content:":"; .vcard .photo { display:inline; -margin-right:11px; -margin-right:4px; -vertical-align:top; +margin-right:7px; +margin-bottom:7px; +float:left; } .vcard .url { text-decoration:none; } +.vcard .url:hover { +text-decoration:underline; +} .vcard .fn { -border-bottom-width:1px; -border-bottom-style:dotted; font-style:italic; } .vcard .fn:hover { -border-bottom-width:1px; -border-bottom-style:solid; + } .notice .entry-title { float:left; -margin-bottom:11px; -margin-left:217px; -margin-left:199px; } .notice p.entry-content { -float:left; -width:427px; -width:100%; +display:inline; } .notice_video p.entry-content, @@ -683,8 +674,6 @@ width:100%; .notice_location p.entry-content, .notice_event p.entry-content, .notice_document p.entry-content { -width:322px; -width:75.41%; } #laconicat .notice p.entry-content { /*margin-left:199px;*/ @@ -707,11 +696,7 @@ width:75.41%; /*border:1px solid blue;*/ clear:left; float:left; -margin-left:11px; -margin-left:0; -margin-bottom:4px; -width:199px; -width:149px; +width:48%; } .notice div.entry-content, .notice .notice-options a, @@ -741,12 +726,9 @@ text-transform:lowercase; } .notice div.entry-content a { text-decoration:none; -border-bottom-width:1px; -border-bottom-style:dotted; } .notice div.entry-content a:hover { -border-bottom-width:1px; -border-bottom-style:solid; +text-decoration:underline; } @@ -770,11 +752,7 @@ outline:none; .notice-options { -margin-left:18px; -margin-left:260px; -margin-left:304px; -margin-left:18px; -margin-left:50px; +margin-left:2%; float:left; } .notice-options .reply, @@ -783,6 +761,9 @@ float:left; float:left; margin-right:11px; } +.notice-options .reply { +margin-top:1px; +} .notice-options .reply dt { display:none; } @@ -790,21 +771,15 @@ display:none; .notice-options form input.submit { display:block; border:0; -padding-left:20px; } .notice-options .reply a { text-decoration:none; +padding-left:20px; } .notice-options form input.submit { cursor:pointer; -width:16px; -width:auto; -height:16px; -height:auto; -padding-top:0; -padding-right:0; -padding-bottom:0; +padding:0 0 0 17px; } .notice-options .notice_delete legend, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 6ae85449a..1eba97a45 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -130,10 +130,8 @@ color:#555; .vcard .fn { -border-bottom-color:#ccc; } .vcard .fn:hover { -border-bottom-color:#555; } @@ -142,10 +140,8 @@ border-bottom-color:#555; /* NOTICES */ .notice div.entry-content a { color:#333; -border-bottom-color:#ccc; } .notice div.entry-content a:hover { -border-bottom-color:#555; } @@ -190,6 +186,7 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 .notice-options a, .notice-options input { opacity:0.1; +color:#333; } .notices li.hover { background-color:#fcfcfc; -- cgit v1.2.3-54-g00ecf From e34efca7f326d794be5398abae8cbb7363bcfb9c Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 18:14:20 +0000 Subject: Update to notice form character count warning --- js/util.js | 6 +++--- theme/identica/css/display.css | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'theme/identica/css') 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/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 { -- cgit v1.2.3-54-g00ecf From 996eb1da4ea043360dbc7accf9254537d59c7df5 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 02:13:02 +0000 Subject: site nav local views styles -- rgba background color --- theme/base/css/display.css | 3 ++- theme/identica/css/display.css | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index fce4c7b86..fb7e71acd 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -219,8 +219,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; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c2eb4ef65..aed4f95e5 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -59,6 +59,10 @@ background-color:transparent; #site_nav_local_views a { border-color:#fff; +background-color:rgba(255, 255, 255, 0.2); +} +#site_nav_local_views a:hover { +background-color:rgba(255, 255, 255, 0.7);: } /* -- cgit v1.2.3-54-g00ecf From 607e65be81d6b42990706884f96fa024301c7893 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 02:32:13 +0000 Subject: Delete notice markup and styles --- lib/noticelist.php | 14 ++++++++------ theme/base/css/display.css | 17 +++++++++-------- theme/identica/css/display.css | 6 +++--- 3 files changed, 20 insertions(+), 17 deletions(-) (limited to 'theme/identica/css') diff --git a/lib/noticelist.php b/lib/noticelist.php index fde93a3b6..1283e43e4 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -438,7 +438,7 @@ class NoticeListItem extends Widget $reply_url = common_local_url('newnotice', array('replyto' => $this->profile->nickname)); - $this->out->elementStart('dl', 'reply'); + $this->out->elementStart('dl', 'notice_reply'); $this->out->element('dt', null, _('Reply to this notice')); $this->out->elementStart('dd'); $this->out->element('a', array('href' => $reply_url, @@ -459,11 +459,13 @@ class NoticeListItem extends Widget if ($user && $this->notice->profile_id == $user->id) { $deleteurl = common_local_url('deletenotice', array('notice' => $this->notice->id)); - $this->out->elementStart('a', array('class' => 'deletenotice', - 'href' => $deleteurl, - 'title' => _('delete'))); - $this->out->raw(' ×'); - $this->out->elementEnd('a'); + $this->out->elementStart('dl', 'notice_delete'); + $this->out->element('dt', null, _('Delete this notice')); + $this->out->elementStart('dd'); + $this->out->element('a', array('href' => $deleteurl, + 'title' => _('delete')), _('Delete')); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index fb7e71acd..20e66c351 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -775,25 +775,26 @@ outline:none; margin-left:2%; float:left; } -.notice-options .reply, +.notice-options .notice_reply, .notice-options .notice_delete , .notice-options .notice_favorite { float:left; margin-right:11px; } -.notice-options .reply { +.notice-options .notice_reply { margin-top:1px; } -.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; } @@ -802,7 +803,7 @@ cursor:pointer; padding:0 0 0 17px; } -.notice-options .notice_delete legend, +.notice-options .notice_delete dt, .notice-options .notice_favorite legend { display:none; } @@ -813,8 +814,8 @@ padding:0; } -.notice-options form.notice_delete { -margin-left:2em; +.notice-options .notice_delete { +margin-left:3em; } /*END: NOTICES */ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index aed4f95e5..94e97d414 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -173,17 +173,17 @@ 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%; } -- cgit v1.2.3-54-g00ecf From 1df4a3831358753c59b996305a54bd2366450079 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 03:09:00 +0000 Subject: notice vcard url and a:visited style --- theme/base/css/display.css | 4 ++-- theme/identica/css/display.css | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 20e66c351..ce7f69b35 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -851,12 +851,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 94e97d414..1bb2ca01b 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -26,6 +26,17 @@ 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; +} -- cgit v1.2.3-54-g00ecf From f28f1108a98cb33404513f760d1a40e9e98d85b9 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 16:42:54 +0000 Subject: Opacity on notice div.entry-content and div.notice-options --- theme/base/css/display.css | 6 ++++-- theme/identica/css/display.css | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index afddefd27..213f0c0d2 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -59,9 +59,7 @@ padding-bottom:0; fieldset { padding:0; border:0; -margin-bottom:29px; } - form ul li { list-style-type:none; margin:0 0 18px 0; @@ -101,6 +99,10 @@ form input.submit { /* FORM SETTINGS */ +.form_settings fieldset { +margin-bottom:29px; +} + .form_guide { font-style:italic; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 1bb2ca01b..d1338e709 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -198,16 +198,16 @@ background:transparent url(../images/icons/twotone/green/favourite.gif) no-repea background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } -.notice-options a, -.notice-options input { -opacity:0.1; +div.entry-content, +div.notice-options { +opacity:0.2; color:#333; } .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; } -- cgit v1.2.3-54-g00ecf From 6cc3f78cf309a80c72156c673dceac21dde63603 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 20:06:56 +0000 Subject: Typography update to input and anchors on div.entry-content and div.notice-options --- theme/base/css/display.css | 35 ++++++++++++++++++----------------- theme/identica/css/display.css | 39 +++++++++++++++------------------------ 2 files changed, 33 insertions(+), 41 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 213f0c0d2..b0a41cede 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -42,6 +42,8 @@ font-weight:bold; font-size:1.6em; text-transform:uppercase; } +form { +} input, textarea, select, option { padding:4px; font-family:sans-serif; @@ -714,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;*/ @@ -734,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; } @@ -765,20 +769,17 @@ display:block; outline:none; } - - .notice-options { -margin-left:2%; +padding-left:2%; float:left; +width:50%; } .notice-options .notice_reply, -.notice-options .notice_delete , .notice-options .notice_favorite { float:left; margin-right:11px; } .notice-options .notice_reply { -margin-top:1px; } .notice-options .notice_reply dt { display:none; @@ -788,15 +789,19 @@ display:none; display:block; border:0; } - .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 dt, @@ -809,10 +814,6 @@ border:0; padding:0; } - -.notice-options .notice_delete { -margin-left:3em; -} /*END: NOTICES */ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d1338e709..4af7cf239 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -1,28 +1,17 @@ /* 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; } @@ -76,13 +65,6 @@ background-color:rgba(255, 255, 255, 0.2); background-color:rgba(255, 255, 255, 0.7);: } -/* -#site_nav_global_primary .current a { -font-weight:bold; -border-color:#ccc; -border-style:solid; -} -*/ #content, #site_nav_local_views .current a { @@ -154,7 +136,7 @@ color:#555; /* NOTICES */ .notice div.entry-content a { -color:#333; + } .notice div.entry-content a:hover { } @@ -201,7 +183,16 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.entry-content, div.notice-options { opacity:0.2; -color:#333; +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; -- cgit v1.2.3-54-g00ecf From ffb1bb1fbbab8ac25a725c1848d2607519959130 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 01:14:14 +0000 Subject: notice div.entry-content notice-options styles --- theme/base/css/display.css | 18 ++++++++++++++---- theme/identica/css/display.css | 8 +++++--- 2 files changed, 19 insertions(+), 7 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 35a146fa7..2af6cc67d 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -742,6 +742,7 @@ display:inline; clear:left; float:left; width:48%; +font-size:0.95em; } .notice div.entry-content a, .notice .notice-options a, @@ -800,13 +801,22 @@ outline:none; padding-left:2%; float:left; width:50%; +position:relative; } +.notice-options .notice_delete, .notice-options .notice_reply, .notice-options .notice_favorite { -float:left; -margin-right:11px; +position:absolute; +top:0; +} +.notice-options .notice_favorite { +left:0; } .notice-options .notice_reply { +left:29px; +} +.notice-options .notice_delete { +left:76px; } .notice-options .notice_reply dt { display:none; @@ -825,11 +835,11 @@ border:0; .notice-options .notice_reply a, .notice-options .notice_delete a { text-decoration:none; -padding-left:20px; +padding-left:16px; } .notice-options .notice_delete { -float:right; + } .notice-options form input.submit { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4af7cf239..9896529ab 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -180,12 +180,14 @@ background:transparent url(../images/icons/twotone/green/favourite.gif) no-repea background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } -div.entry-content, div.notice-options { -opacity:0.2; +opacity:0.3; font-family:sans-serif; } -div.entry-content a, + +div.entry-content { +color:#333; +} div.notice-options a, div.notice-options input { font-family:sans-serif; -- cgit v1.2.3-54-g00ecf From 245f317bbdfd10a44adedafd27a1be5b79bf7921 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 01:52:54 +0000 Subject: Tweaking notice div.entry-content which impacts notice-option input --- theme/base/css/display.css | 6 ++++++ theme/identica/css/display.css | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 2af6cc67d..e4b83a0fa 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -752,6 +752,7 @@ font-size:0.95em; .notice .notice-options a, .notice .notice-options input { float:left; +font-size:1.025em; } #laconicat .notice div.entry-content { @@ -802,6 +803,11 @@ padding-left:2%; float:left; width:50%; position:relative; +font-size:0.95em; +} + +.notice-options a { +float:left; } .notice-options .notice_delete, .notice-options .notice_reply, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 9896529ab..6880e756e 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -182,7 +182,6 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.notice-options { opacity:0.3; -font-family:sans-serif; } div.entry-content { -- cgit v1.2.3-54-g00ecf From c1a247358d08c666a838f74ca3d7a54906445746 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 02:34:30 +0000 Subject: Outline for notice-option anchor --- theme/base/css/display.css | 11 +++++++++-- theme/identica/css/display.css | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e4b83a0fa..789eaee4c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -162,6 +162,12 @@ margin-top:0; margin-left:0; } + +.form_settings .form_note { +-moz-border-radius:4px; +padding:0 7px; +} + /* FORM SETTINGS */ @@ -769,7 +775,7 @@ display:inline; display:none; } .notice div.entry-content .timestamp a { - +display:inline-block; } .notice div.entry-content .device dt { text-transform:lowercase; @@ -831,6 +837,7 @@ display:none; .notice-options input, .notice-options a { text-indent:-9999px; +outline:none; } .notice-options .notice_reply a, @@ -850,7 +857,7 @@ padding-left:16px; .notice-options form input.submit { cursor:pointer; -padding:2px 0 2px 17px; +padding:2px 0 2px 10px; } .notice-options .notice_delete dt, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 6880e756e..d3d28001a 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -203,6 +203,9 @@ background-color:#fcfcfc; opacity:1; } +.form_settings .form_note { +background-color:#A9BF4F; +} /*END: NOTICES */ -- cgit v1.2.3-54-g00ecf From 4b1cc73a583ce8b73760f6e709c0fc794af1b471 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 03:12:39 +0000 Subject: Favor/Disfavor form @class Created icon, and add style JS selector change Fixed return actions --- actions/disfavor.php | 2 +- actions/favor.php | 2 +- actions/login.php | 6 +++--- js/util.js | 8 ++++---- lib/disfavorform.php | 6 +++--- lib/favorform.php | 4 ++-- theme/base/css/display.css | 10 ++++++---- theme/identica/css/display.css | 9 ++++++--- 8 files changed, 26 insertions(+), 21 deletions(-) (limited to 'theme/identica/css') diff --git a/actions/disfavor.php b/actions/disfavor.php index fc36f7c75..3e3e4a547 100644 --- a/actions/disfavor.php +++ b/actions/disfavor.php @@ -69,7 +69,7 @@ class DisfavorAction extends Action $user->blowFavesCache(); if ($this->boolean('ajax')) { - common_start_html('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); $this->element('title', null, _('Add to favorites')); $this->elementEnd('head'); diff --git a/actions/favor.php b/actions/favor.php index 8d751a7a9..afda93cff 100644 --- a/actions/favor.php +++ b/actions/favor.php @@ -68,7 +68,7 @@ class FavorAction extends Action $user->blowFavesCache(); if ($this->boolean('ajax')) { - common_start_html('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); $this->element('title', null, _('Disfavor favorite')); $this->elementEnd('head'); diff --git a/actions/login.php b/actions/login.php index c213e2ab5..4e580d360 100644 --- a/actions/login.php +++ b/actions/login.php @@ -107,13 +107,13 @@ class LoginAction extends Action function showForm($error=null) { - $this->error = $error; - $this->showPage(); + $this->error = $error; + $this->showPage(); } function title() { - return _('Login'); + return _('Login'); } function showPageNotice() diff --git a/js/util.js b/js/util.js index 6fe477075..0a03b86c2 100644 --- a/js/util.js +++ b/js/util.js @@ -81,10 +81,10 @@ $(document).ready(function(){ this.appendChild(ajax); } - $("form.favor").ajaxForm(favoptions); - $("form.disfavor").ajaxForm(disoptions); - $("form.favor").each(addAjaxHidden); - $("form.disfavor").each(addAjaxHidden); + $("form.form_favor").ajaxForm(favoptions); + $("form.form_disfavor").ajaxForm(disoptions); + $("form.form_favor").each(addAjaxHidden); + $("form.form_disfavor").each(addAjaxHidden); $("#nudge").ajaxForm ({ dataType: 'xml', beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled"); diff --git a/lib/disfavorform.php b/lib/disfavorform.php index ffca0cd8b..d0c3b1832 100644 --- a/lib/disfavorform.php +++ b/lib/disfavorform.php @@ -88,7 +88,7 @@ class DisfavorForm extends Form function action() { - common_local_url('disfavor'); + return common_local_url('disfavor'); } /** @@ -136,7 +136,7 @@ class DisfavorForm extends Form function formClass() { - return 'disfavor'; + return 'form_disfavor'; } -} \ No newline at end of file +} diff --git a/lib/favorform.php b/lib/favorform.php index 37e13fb1c..f3a7a9756 100644 --- a/lib/favorform.php +++ b/lib/favorform.php @@ -88,7 +88,7 @@ class FavorForm extends Form function action() { - common_local_url('favor'); + return common_local_url('favor'); } /** @@ -148,6 +148,6 @@ class FavorForm extends Form function formClass() { - return 'notice_favorite'; + return 'form_favor'; } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 789eaee4c..9146a2bf5 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -817,11 +817,13 @@ float:left; } .notice-options .notice_delete, .notice-options .notice_reply, -.notice-options .notice_favorite { +.notice-options .form_favor, +.notice-options .form_disfavor { position:absolute; top:0; } -.notice-options .notice_favorite { +.notice-options .form_favor, +.notice-options .form_disfavor { left:0; } .notice-options .notice_reply { @@ -861,11 +863,11 @@ padding:2px 0 2px 10px; } .notice-options .notice_delete dt, -.notice-options .notice_favorite legend { +.notice-options .form_favor legend { display:none; } .notice-options .notice_delete fieldset, -.notice-options .notice_favorite fieldset { +.notice-options .form_favor fieldset { border:0; padding:0; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d3d28001a..832862551 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -62,7 +62,7 @@ border-color:#fff; background-color:rgba(255, 255, 255, 0.2); } #site_nav_local_views a:hover { -background-color:rgba(255, 255, 255, 0.7);: +background-color:rgba(255, 255, 255, 0.7); } @@ -87,7 +87,7 @@ background-image:url(../../base/images/icons/icon_atom.jpg); } #export_data li a.foaf { background-image:url(../../base/images/icons/icon_foaf.gif); -=} +} #export_data li a.export_vcard { background-image:url(../../base/images/icons/icon_vcard.gif); } @@ -173,9 +173,12 @@ background-color:transparent; .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 { +.notice-options form.form_favor input.submit { background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%; } +.notice-options form.form_disfavor input.submit { +background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +} .notice-options .notice_delete a { background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } -- cgit v1.2.3-54-g00ecf From d46c2cc8a70d83f7bf761ea8c778a8cd56d8e692 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 20:36:50 +0000 Subject: IM settings markup and style. Added confirmed/unconfirmed styles --- actions/emailsettings.php | 4 ++-- actions/imsettings.php | 42 +++++++++++++++++++++++++++--------------- theme/base/css/display.css | 9 +++------ theme/identica/css/display.css | 11 +++++++++++ 4 files changed, 43 insertions(+), 23 deletions(-) (limited to 'theme/identica/css') diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 8b8a5351e..7ae62fb55 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -95,14 +95,14 @@ class EmailsettingsAction extends AccountSettingsAction $this->hidden('token', common_session_token()); if ($user->email) { - $this->element('p', array('id' => 'email_confirmed'), $user->email); + $this->element('p', array('id' => 'form_confirmed'), $user->email); $this->element('p', array('class' => 'form_note'), _('Current confirmed email address.')); $this->hidden('email', $user->email); $this->submit('remove', _('Remove')); } else { $confirm = $this->getConfirmation(); if ($confirm) { - $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address); + $this->element('p', array('id' => 'form_unconfirmed'), $confirm->address); $this->element('p', array('class' => 'form_note'), _('Awaiting confirmation on this address. '. 'Check your inbox (and spam box!) for a message '. diff --git a/actions/imsettings.php b/actions/imsettings.php index 98951ac30..edbd81b57 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -86,36 +86,35 @@ class ImsettingsAction extends ConnectSettingsAction { $user = common_current_user(); $this->elementStart('form', array('method' => 'post', - 'id' => 'imsettings', + 'id' => 'form_settings_im', + 'class' => 'form_settings', 'action' => common_local_url('imsettings'))); + $this->elementStart('fieldset', array('id' => 'settings_im_address')); + $this->element('legend', null, _('Address')); $this->hidden('token', common_session_token()); - $this->element('h2', null, _('Address')); - if ($user->jabber) { - $this->elementStart('p'); - $this->element('span', 'address confirmed', $user->jabber); - $this->element('span', 'input_instructions', + $this->element('p', 'form_confirmed', $user->jabber); + $this->element('p', 'form_note', _('Current confirmed Jabber/GTalk address.')); $this->hidden('jabber', $user->jabber); - $this->elementEnd('p'); $this->submit('remove', _('Remove')); } else { $confirm = $this->getConfirmation(); if ($confirm) { - $this->elementStart('p'); - $this->element('span', 'address unconfirmed', $confirm->address); - $this->element('span', 'input_instructions', + $this->element('p', 'form_unconfirmed', $confirm->address); + $this->element('p', 'form_note', sprintf(_('Awaiting confirmation on this address. '. 'Check your Jabber/GTalk account for a '. 'message with further instructions. '. '(Did you add %s to your buddy list?)'), jabber_daemon_address())); $this->hidden('jabber', $confirm->address); - $this->elementEnd('p'); $this->submit('cancel', _('Cancel')); } else { + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('jabber', _('IM Address'), ($this->arg('jabber')) ? $this->arg('jabber') : null, sprintf(_('Jabber or GTalk address, '. @@ -123,27 +122,40 @@ class ImsettingsAction extends ConnectSettingsAction 'First, make sure to add %s to your '. 'buddy list in your IM client or on GTalk.'), jabber_daemon_address())); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('add', _('Add')); } } - - $this->element('h2', null, _('Preferences')); - + $this->elementEnd('fieldset'); + + $this->elementStart('fieldset', array('id' => 'settings_im_preferences')); + $this->element('legend', null, _('Preferences')); + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->checkbox('jabbernotify', _('Send me notices through Jabber/GTalk.'), $user->jabbernotify); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('updatefrompresence', _('Post a notice when my Jabber/GTalk status changes.'), $user->updatefrompresence); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('jabberreplies', _('Send me replies through Jabber/GTalk '. 'from people I\'m not subscribed to.'), $user->jabberreplies); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('jabbermicroid', _('Publish a MicroID for my Jabber/GTalk address.'), $user->jabbermicroid); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('save', _('Save')); - + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b5c47e1bb..2857070f8 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -79,11 +79,12 @@ top:2px; left:0; } -#page_notice .error { -background-color:#F7E8E8; +#page_notice .error, +#page_notice .success { padding:4px 7px; -moz-border-radius:4px; } + form label.submit { display:none; } @@ -666,10 +667,6 @@ border-top:1px dashed #D1D9E4; list-style-type:none; /*margin-bottom:11px;*/ } -.notices li.over { -background-color:#fcfcfc; -} - /* NOTICES */ #notices_primary { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 832862551..0235c2d7d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -71,6 +71,12 @@ background-color:rgba(255, 255, 255, 0.7); background-color:#fff; } +#page_notice .error { +background-color:#F7E8E8; +} +#page_notice .success { +background-color:#EFF3DC; +} @@ -135,6 +141,11 @@ color:#555; /* NOTICES */ +.notices li.over { +background-color:#fcfcfc; +} + + .notice div.entry-content a { } -- cgit v1.2.3-54-g00ecf From 9d384aadb1f27cea85d23c944f787cf300a4389a Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 22:08:51 +0000 Subject: @id for site_nav_global_primary items in order to target for styling --- actions/register.php | 1 + lib/action.php | 22 +++++++++++++--------- theme/identica/css/display.css | 19 ++++++++++++++++--- 3 files changed, 30 insertions(+), 12 deletions(-) (limited to 'theme/identica/css') diff --git a/actions/register.php b/actions/register.php index f0d47f19b..08243c1e2 100644 --- a/actions/register.php +++ b/actions/register.php @@ -399,6 +399,7 @@ class RegisterAction extends Action $this->elementEnd('li'); $attrs = array('type' => 'checkbox', 'id' => 'license', + 'class' => 'checkbox', 'name' => 'license', 'value' => 'true'); if ($this->boolean('license')) { diff --git a/lib/action.php b/lib/action.php index 320814a8a..3d61afde2 100644 --- a/lib/action.php +++ b/lib/action.php @@ -242,25 +242,29 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('ul', array('class' => 'nav')); if ($user) { $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)), - _('Home')); + _('Home'), _('Personal timeline'), false, 'nav_home'); } - $this->menuItem(common_local_url('peoplesearch'), _('Search')); + $this->menuItem(common_local_url('peoplesearch'), + _('Search'), _('Search the site for people and text'), false, 'nav_search'); if ($user) { $this->menuItem(common_local_url('profilesettings'), - _('Account')); + _('Account'), _('Account settings'), false, 'nav_account'); $this->menuItem(common_local_url('imsettings'), - _('Connect')); + _('Connect'), _('Connect settings'), false, 'nav_connect'); $this->menuItem(common_local_url('logout'), - _('Logout')); + _('Logout'), _('Logout from the site'), false, 'nav_logout'); } else { - $this->menuItem(common_local_url('login'), _('Login')); + $this->menuItem(common_local_url('login'), + _('Login'), _('Login to the site'), false, 'nav_login'); if (!common_config('site', 'closed')) { - $this->menuItem(common_local_url('register'), _('Register')); + $this->menuItem(common_local_url('register'), + _('Register'), _('Create an account'), false, 'nav_register'); } - $this->menuItem(common_local_url('openidlogin'), _('OpenID')); + $this->menuItem(common_local_url('openidlogin'), + _('OpenID'), _('Login with OpenID'), false, 'nav_openid'); } $this->menuItem(common_local_url('doc', array('title' => 'help')), - _('Help')); + _('Help'), _('Help me!'), false, 'nav_help'); $this->elementEnd('ul'); $this->elementEnd('dd'); $this->elementEnd('dl'); diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 0235c2d7d..a5b177004 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -57,6 +57,21 @@ background-color:transparent; } +#site_nav_global_primary a { +} + +#nav_register a { +background-color:#A9BF4F; +color:#fff; +text-decoration:none; +font-weight:bold; +padding:2px 4px; + +} +#nav_login a { +} + + #site_nav_local_views a { border-color:#fff; background-color:rgba(255, 255, 255, 0.2); @@ -71,6 +86,7 @@ background-color:rgba(255, 255, 255, 0.7); background-color:#fff; } + #page_notice .error { background-color:#F7E8E8; } @@ -78,9 +94,6 @@ background-color:#F7E8E8; background-color:#EFF3DC; } - - - #export_data li a { background-repeat:no-repeat; background-position:0 45%; -- cgit v1.2.3-54-g00ecf From 910bd332430b0af233ae78b330994520d4b59c97 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 00:10:42 +0000 Subject: Minimal cross browser styling (mostly IE7). w00t! --- lib/action.php | 2 +- theme/base/css/display.css | 28 ++++++++++++++++++---------- theme/identica/css/display.css | 18 +++++++++++++++--- 3 files changed, 34 insertions(+), 14 deletions(-) (limited to 'theme/identica/css') diff --git a/lib/action.php b/lib/action.php index 3d61afde2..c463c8459 100644 --- a/lib/action.php +++ b/lib/action.php @@ -138,7 +138,7 @@ class Action extends HTMLOutputter // lawsuit if (file_exists(theme_file('ie'.$ver.'.css'))) { // Yes, IE people should be put in jail. $this->comment('[if lte IE '.$ver.']> Date: Mon, 19 Jan 2009 00:48:12 +0000 Subject: Cross-browser stuff --- lib/action.php | 2 ++ theme/base/css/display.css | 35 ++++++++++++++++++++++++++++++----- theme/base/css/ie.css | 26 ++++++++++++++++++++++++++ theme/base/css/ie7.css | 5 +++++ theme/identica/css/display.css | 4 ++++ 5 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 theme/base/css/ie.css create mode 100644 theme/base/css/ie7.css (limited to 'theme/identica/css') diff --git a/lib/action.php b/lib/action.php index c463c8459..9cd2d5a18 100644 --- a/lib/action.php +++ b/lib/action.php @@ -134,6 +134,8 @@ class Action extends HTMLOutputter // lawsuit 'type' => 'text/css', 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, 'media' => 'screen, projection, tv')); + $this->comment('[if IE]> Date: Mon, 19 Jan 2009 01:48:04 +0000 Subject: Facebook base and theme stylesheets. Copy of site display.css files for now. --- theme/base/css/facebookapp.base.css | 285 ++++++++ theme/identica/css/facebookapp.theme.css | 1177 ++++++++++++++++++++++++++++++ 2 files changed, 1462 insertions(+) create mode 100644 theme/base/css/facebookapp.base.css create mode 100644 theme/identica/css/facebookapp.theme.css (limited to 'theme/identica/css') diff --git a/theme/base/css/facebookapp.base.css b/theme/base/css/facebookapp.base.css new file mode 100644 index 000000000..eb7b47a12 --- /dev/null +++ b/theme/base/css/facebookapp.base.css @@ -0,0 +1,285 @@ +/* theme: identica */ +html { +background-color:#ddd; +} +body { +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +font-size:1em; +background-color:#ddd; +} +input, textarea, select, option { +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +} +input, textarea, select { +border-color:#aaa; +} + +input:focus, textarea:focus, select:focus { +border-color:#A9BF4F; +} +input.submit { +background-color:#A9BF4F; +color:#fff; +} + +a { +color:#002E6E; +} +a:active { +background-color:#ddd; +} +.notice p.entry-content a:visited { +background-color:#fcfcfc; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} +.notice p.entry-content .vcard a { +background-color:#fcfffc; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + + + +#aside_primary { +background-color:#CEE1E9; +} + +#form_notice textarea { +} + +#form_notice label { +color:#88171A; +} +#notice_text-count { +color:#333; +} +#form_notice.warning #notice_text-count { +color:#000; +background-color:#A9BF4F; +} +#form_notice.warning #notice_data-text { +border-color:#A9BF4F; +} + +#form_notice #notice_data-attach_view { +background-image:url(../images/icons/twotone/green/paper-clip.gif); +background-repeat:no-repeat; +background-position:0 45%; +background-color:transparent; +} + + +#site_nav_global_primary a { +} +#form_notice .form_actions input.submit { +} +#nav_register a { +background-color:#A9BF4F; +color:#fff; +text-decoration:none; +font-weight:bold; +padding:2px 4px; + +} +#nav_login a { +} + + +#site_nav_local_views a { +border-color:#fff; +background-color:rgba(255, 255, 255, 0.2); +} +#site_nav_local_views a:hover { +background-color:rgba(255, 255, 255, 0.7); +} + + +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + + +#page_notice .error { +background-color:#F7E8E8; +} +#page_notice .success { +background-color:#EFF3DC; +} + +#export_data li a { +background-repeat:no-repeat; +background-position:0 45%; +} +#export_data li a.rss { +background-image:url(../../base/images/icons/icon_rss.jpg); +} +#export_data li a.atom { +background-image:url(../../base/images/icons/icon_atom.jpg); +} +#export_data li a.foaf { +background-image:url(../../base/images/icons/icon_foaf.gif); +} +#export_data li a.export_vcard { +background-image:url(../../base/images/icons/icon_vcard.gif); +} + + +/*user_actions*/ +#user_actions li { +border-top-color:#eee; +} +#user_actions a { +color:#000; +} +#user_subscribe a, +#TB_window input.submit, +.form_user_subscribe input.submit { +background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat; +} +.form_user_unsubscribe input.submit { +background-color:#647819; +color:#fff; +} +#user_send-a-message a { +background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat; +} +.form_user_nudge input.submit { +background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat; +} +.form_user_block input.submit { +background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat; +} + + +.user_tags .mark_hash { +color:#555; +} + + + +.vcard .fn { +} +.vcard .fn:hover { +} + + + + +/* NOTICES */ +.notices li.over { +background-color:#fcfcfc; +} + + +.notice div.entry-content a { + +} +.notice div.entry-content a:hover { +} + + +.notice-data a span { +background-color:transparent; +background-repeat:no-repeat; +background-position:0 45%; +} +.notice_video .notice-data a span { +background-image:url(../images/icons/twotone/green/camera.gif); +} +.notice_audio .notice-data a span { +background-image:url(../images/icons/twotone/green/music.gif); +} +.notice_image .notice-data a span { +background-image:url(../images/icons/twotone/green/search.gif); +} +.notice_event .notice-data a span { +background-image:url(../images/icons/twotone/green/calendar.gif); +} +.notice_location .notice-data a span { +background-image:url(../images/icons/twotone/green/flag.gif); +} +.notice_document .notice-data a span { +background-image:url(../images/icons/twotone/green/document.gif); +} + +.notice-options .notice_reply a, +.notice-options form input.submit { +background-color:transparent; +} +.notice-options .notice_reply a { +background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%; +} +.notice-options form.form_favor input.submit { +background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%; +} +.notice-options form.form_disfavor input.submit { +background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +} +.notice-options .notice_delete a { +background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; +} + +div.notice-options { +opacity:0.3; +} + +div.entry-content { +color:#333; +} +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 div.entry-content, +.notices li.hover div.notice-options { +opacity:1; +} + +.form_settings .form_note { +background-color:#A9BF4F; +} + +/*END: NOTICES */ + + + +.pagination .nav_prev a, +.pagination .nav_next a { +background-repeat:no-repeat; +} +.pagination .nav_prev a { +background-image:url(../images/icons/twotone/green/arrow-left.gif); +background-position:0 45%; +} +.pagination .nav_next a { +background-image:url(../images/icons/twotone/green/arrow-right.gif); +background-position:100% 45%; +} + + + +#home #intro #guide_steps li a { +border-color:#ccc; +color:#fff; +} +#home #intro #step_join-now a { +background-color:#f00; +} +#home #intro #step_start-a-group a { +background-color:#0f0; +} +#home #intro #step_create-a-community a { +background-color:#00f; +} + diff --git a/theme/identica/css/facebookapp.theme.css b/theme/identica/css/facebookapp.theme.css new file mode 100644 index 000000000..716f3256f --- /dev/null +++ b/theme/identica/css/facebookapp.theme.css @@ -0,0 +1,1177 @@ +/* theme: base */ +* { margin:0; padding:0; } +img { display:block; border:0; } +a abbr { cursor: pointer; border-bottom:0; } +table { border-collapse:collapse; } +ol { list-style-position:inside; } +html { font-size: 87.5%; background-color:#fff; height:100%; } +body { +background-color:#fff; +color:#000; +font-family:sans-serif; +font-size:1em; +line-height:1.65; +position:relative; +margin:0 auto; +width:1004px; +width:71.714em; +} +h1,h2,h3,h4,h5,h6 { + text-transform:uppercase; + margin-bottom:7px; +} +h1 { +font-size:1.4em; +line-height:1; +margin-bottom:18px; +} +h2 { font-size:1.3em; } +h3 { font-size:1.2em; } +h4 { font-size:1.1em; } +h5 { font-size:1em; } +h6 { font-size:0.9em; } + +caption { +font-weight:bold; +} +.opened { display: block !important;} +.closed { display: none !important;} + +legend { +font-weight:bold; +font-size:1.3em; +text-transform:uppercase; +} +form { +} +input, textarea, select, option { +padding:4px; +font-family:sans-serif; +font-size:1em; +} +input, textarea, select { +border-width:2px; +border-style: solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} +input.submit { +font-weight:bold; +} +textarea { +overflow:auto; +} +select, option { +padding-bottom:0; +} +fieldset { +padding:0; +border:0; +} +form ul li { +list-style-type:none; +margin:0 0 18px 0; +} +form label { +font-weight:bold; +/*margin:0 0 11px 0;*/ +} +form ul li input { +} + +input.checkbox { +position:relative; +top:2px; +left:0; +border:0; +} + +#page_notice .error, +#page_notice .success { +padding:4px 7px; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} +form label.submit { +display:none; +} +.form_settings input.remove { +margin-left:11px; +} + + + + +/* FORM SETTINGS */ +.form_settings fieldset { +margin-bottom:29px; +} + +.form_guide { +font-style:italic; +} + + +.form_settings .form_datas li { +width:100%; +float:left; +} + +.form_settings .form_datas label { +float:left; +} +.form_settings .form_datas textarea, +.form_settings .form_datas select, +.form_settings .form_datas input { +margin-left:11px; +float:left; +} + +.form_settings label { +margin-top:2px; +width:152px; +} + +.form_actions label { +display:none; +} + +.form_settings #settings_autosubscribe label { +display:inline; +font-weight:bold; +} + +#form_settings_profile legend, +#form_login legend, +#form_register legend { +display:none; +} + +.form_settings .form_datas p.form_guide { +clear:both; +margin-left:163px; +margin-bottom:0; +} + +.form_settings p { +margin-bottom:11px; +} + +.form_settings input.checkbox { +margin-top:3px; +margin-left:0; +} +.form_settings label.checkbox { +font-weight:normal; +margin-top:0; +margin-right:0; +margin-left:11px; +float:left; +width:90%; +} + +#form_login p.form_guide, +#form_register #settings_rememberme p.form_guide { +margin-left:0; +} + + +.form_settings .form_note { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +padding:0 7px; +} + +/* FORM SETTINGS */ + + + + +address { +float:left; +margin-bottom:18px; +margin-left:18px; +} +address .fn, +address .email { +display:none; +} + + + +#header { +width:100%; +position:relative; +float:left; +padding-top:18px; +margin-bottom:29px; +} + +#site_nav_global_primary { +float:right; +margin-right:18px; +} +#site_nav_global_primary ul li { +display:inline; +margin-left:11px; +} + + +.system_notice dt { +font-weight:bold; +text-transform:uppercase; +display:none; +} + +#site_notice { +position:absolute; +right:0; +top:49px; +float:right; +width:322px; +} +#page_notice { +clear:both; +margin-bottom:18px; +} + + + + +#footer { +float:left; +width:64%; +padding:18px; +} + + + +#site_nav_local_views { +width:100%; +float:left; +} +#site_nav_local_views dt { +display:none; +} +#site_nav_local_views li { +float:left; +margin-right:18px; +list-style-type:none; +} +#site_nav_local_views a { +float:left; +text-decoration:none; +padding:4px 11px; +-moz-border-radius-topleft:4px; +-moz-border-radius-topright:4px; +-webkit-border-top-left-radius:4px; +-webkit-border-top-right-radius:4px; +border-width:1px; +border-style:solid; +border-bottom:0; +text-shadow: 4px 4px 4px #ddd; +font-weight:bold; +} +#site_nav_local_views .nav { +float:left; +width:100%; +} + + +#site_nav_global_primary dt, +#site_nav_global_secondary dt { +display:none; +} +/* +#site_nav_global_primary .current a { +font-weight:bold; +border-style:solid; +} +*/ +#site_nav_global_secondary { +margin-bottom:11px; +} + +#site_nav_global_secondary ul li { +display:inline; +margin-right:11px; +} +#export_data li a { +padding-left:20px; +} +#export_data li a.foaf { +padding-left:30px; +} +#export_data li a.export_vcard { +padding-left:28px; +} + + + +#export_data ul { +display:inline; +} +#export_data li { +list-style-type:none; +display:inline; +margin-left:11px; +} +#export_data li:first-child { +margin-left:0; +} + + + +#licenses { +font-size:0.9em; +} + +#licenses dt { +font-weight:bold; +display:none; +} +#licenses dd { +margin-bottom:11px; +line-height:1.5; +} + +#site_content_license_cc { +margin-bottom:0; +} +#site_content_license_cc img { +display:inline; +vertical-align:top; +margin-right:4px; +} + + +#wrap { + float:left; + margin:0 auto; + width:1004px; + width:71.714em; +} + + +#core { +position:relative; +width:100%; +float:left; +margin-bottom:1em; +} + +#content { +width:644px; +padding:18px; +float:left; +border-radius:7px; +-moz-border-radius:7px; +-moz-border-radius-topleft:0; +-webkit-border-radius:7px; +-webkit-border-top-left-radius:0; +} + +#content_inner { +position:relative; +width:100%; +float;left; +} + +#aside_primary { +width:300px; +float:left; +margin-left:2px; +padding:18px 4px 18px 18px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} + + + + +/*Start: FORM NOTICE*/ +#form_notice { +width:384px; +width:458px; +float:left; +margin-left:68px; +position:relative; +line-height:1; +} +#form_notice fieldset { +border:0; +padding:0; +} +#form_notice legend { +display:none; +} +#form_notice textarea { +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +width:377px; +width:370px; +height:86px; +line-height:1.5; +padding:7px 7px 14px 7px; +} +#form_notice label { +display:block; +font-size:1.3em; +margin-bottom:7px; +} +#form_notice .form_datas 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:116px; +right:98px; +z-index:9; +} + +#form_notice .form_note dt { +font-weight:bold; +display:none; +} +#notice_text-count { +font-weight:bold; +line-height:1.15; +} + +#form_notice #notice_data-attach_view { +/*position:absolute;*/ +top:25px; +right:30px; +margin-left:4px; +padding:0; +cursor:pointer; +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; +} +/*end FORM NOTICE*/ + + + + + +/* user_profile */ +#user_profile { +position:relative; +width:633px; +min-height:123px; +float:left; +margin-bottom:17px; +margin-left:0; +} +#user_profile dt, +#user_statistics dt { +font-weight:bold; +} +#user_profile .user_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 { +float:left; +clear:left; +margin-left:125px; +width:322px; +margin-bottom:4px; +} + +#user_profile .user_fn, +#user_profile .user_nickname { +width:auto; +clear:none; +} +#user_profile .user_nickname { +margin-left:11px; +} +#user_profile .user_nickname .nickname { +font-style:italic; +font-weight:bold; +margin-left:4px; +margin-right:4px; +} + +#user_profile .user_nickname dd:before { +content: "("; +} +#user_profile .user_nickname dd:after { +content: ")"; +} + +#user_profile dt { +display:none; +} +#user_profile h2 { +display:none; +} +/* user_profile */ + +/*user_actions*/ +#user_actions { +clear:left; +float:left; +position:absolute; +top:0; +right:0; +} +#user_actions h2 { +display:none; +} +#user_actions ul { +list-style-type:none; +} +#user_actions li { +border-top-width:1px; +border-top-style:dotted; +} +#user_actions li:first-child { +border-top:0; +} +#user_actions fieldset { +border:0; +padding:0; +} +#user_actions legend { +display:none; +} + +#user_actions a, +#user_actions input.submit { +display:block; +text-align:left; +padding:4px 0 4px 19px; +} +#user_actions a { +text-decoration:none; +} +#user_subscribe a, +#TB_window input.submit, +#user_actions input.submit { +border:0; +cursor:pointer; +padding-left:16px; +width:100%; +font-size:0.9em; +} + +#user_subscribe a { +width:auto; +padding-left:20px; +} + +#user_subscribe a, +#TB_window input.submit, +.form_user_subscribe input.submit { +font-weight:bold; +} + + + +#user_send-a-message form { +clear:left; +width:322px; +margin-top:18px; +} + +#user_send-a-message textarea { +width:96%; +} + +.user_tags ul { +list-style-type:none; +} +.user_tags li { +display:inline; +margin-right:1em; +float:left; +} + + + +.aside .section { +margin-bottom:29px; +clear:both; +} +.aside .section h2 { +text-transform:uppercase; +font-size:1em; +} + +#user_statistics dt, +#user_statistics dd { +display:inline; +} +#user_statistics dt:after { +content: ":"; +} + + +#user_subscriptions, +#user_subscriptions-common { +float:left; +} +#user_subscriptions ul.users { +width:220px; +float:left; +} +#user_subscriptions .users li { +list-style-type:none; +float:left; +margin-right:7px; +margin-bottom:7px; +} +#user_subscriptions .users li .photo { +width:24px; +height:24px; +margin-right:0; +} +#user_subscriptions .users li .fn { +display:none; +} +.aside .section .more { +clear:both; +} + + + + + +/* NOTICE */ +.notice { +position:relative; +padding-top:18px; +padding-bottom:18px; +clear:both; +float:left; +width:644px; +width:96.699%; +width:100%; +border-top:1px dashed #D1D9E4; +/*-moz-border-radius:7px;*/ +} +.notices li { +list-style-type:none; +/*margin-bottom:11px;*/ +} + +/* NOTICES */ +#notices_primary { +float:left; +width:644px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} +#notices_primary h2 { +display:none; +} +.notice-data a span { +display:block; +padding-left:28px; +} + + +.notice .author { +margin-right:11px; +} +.notice .author a { +} +.notice .author:after { +/*content:":";*/ +} + +.vcard .photo { +display:inline; +margin-right:7px; +margin-bottom:7px; +float:left; +} +.vcard .url { +text-decoration:none; +} +.vcard .url:hover { +text-decoration:underline; +} +.vcard .fn { +font-style:italic; +} +.vcard .fn:hover { + +} + + +.notice .entry-title { +float:left; +width:100%; +} +.notice p.entry-content { +display:inline; +} + +.notice_video p.entry-content, +.notice_audio p.entry-content, +.notice_image p.entry-content, +.notice_location p.entry-content, +.notice_event p.entry-content, +.notice_document p.entry-content { +} +#laconicat .notice p.entry-content { +/*margin-left:199px;*/ +} +.notice p.entry-content a { + +} +.notice p.entry-content a:hover { + +} +.notice p.entry-content .tag a { + +} +.notice p.entry-content .tag a:hover { + +} + + +.notice div.entry-content { +/*border:1px solid blue;*/ +clear:left; +float:left; +width:48%; +font-size:0.95em; +} +.notice div.entry-content a, +.notice .notice-options a, +.notice .notice-options input { + +} +.notice .notice-options a, +.notice .notice-options input { +float:left; +font-size:1.025em; +} + +#laconicat .notice div.entry-content { +/*margin-left:0;*/ +} + +.notice div.entry-content dl, +.notice div.entry-content dt, +.notice div.entry-content dd { +display:inline; +} +.notice div.entry-content .timestamp dt, +.notice div.entry-content .response dt { +display:none; +} +.notice div.entry-content .timestamp a { +display:inline-block; +} +.notice div.entry-content .device dt { +text-transform:lowercase; +} +.notice div.entry-content a { + +} +.notice div.entry-content a:hover { +} + + + +.notice-data { +position:absolute; +top:18px; +right:0; +min-height:50px; +margin-bottom:4px; +} +.notice .entry-content .notice-data dt { +display:none; +} + +.notice-data a { +display:block; +outline:none; +} + +.notice-options { +padding-left:2%; +float:left; +width:50%; +position:relative; +font-size:0.95em; +} + +.notice-options a { +float:left; +} +.notice-options .notice_delete, +.notice-options .notice_reply, +.notice-options .form_favor, +.notice-options .form_disfavor { +position:absolute; +top:0; +} +.notice-options .form_favor, +.notice-options .form_disfavor { +left:0; +} +.notice-options .notice_reply { +left:29px; +} +.notice-options .notice_delete { +left:76px; +} +.notice-options .notice_reply dt { +display:none; +} + +.notice-options input, +.notice-options a { +text-indent:-9999px; +outline:none; +} + +.notice-options .notice_reply a, +.notice-options form input.submit { +display:block; +border:0; +} +.notice-options .notice_reply a, +.notice-options .notice_delete a { +text-decoration:none; +padding-left:16px; +} + +.notice-options .notice_delete { + +} + +.notice-options form input.submit { +cursor:pointer; +width:16px; +padding:2px 0; +} + +.notice-options .notice_delete dt, +.notice-options .form_favor legend, +.notice-options .form_disfavor legend { +display:none; +} +.notice-options .notice_delete fieldset, +.notice-options .form_favor fieldset, +.notice-options .form_disfavor fieldset { +border:0; +padding:0; +} + +/*END: NOTICES */ + + + + + +.pagination dt { +font-weight:bold; +display:none; +} + +.pagination .nav { +float:left; +width:100%; +list-style-type:none; +} + +.pagination .nav_prev { +float:left; +} +.pagination .nav_next { +float:right; +} + +.pagination a { +display:block; +text-decoration:none; +font-weight:bold; +padding:7px; +border:1px dotted #D1D9E4; +border-bottom:0; +} + +.pagination .nav_prev a { +-moz-border-radius-topright:7px; +-webkit-border-top-right-radius:7px; +padding-left:20px; +border-left:0; +} +.pagination .nav_next a { +-moz-border-radius-topleft:7px; +-webkit-border-top-left-radius:7px; +padding-right:20px; +border-right:0; +} + + +/* END: NOTICE */ + + + + + + + +/*START: LOAD ALONG WITH JS*/ +.notice .in-reply-to { + width:98%; + margin-left:2%; +} +.notice .in-reply-to li { +background-color:#F7F9FB; +} +.notice .in-reply-to li .in-reply-to li { +background-color:#E4E9F0; +} +.notice .in-reply-to li .in-reply-to li .in-reply-to li { +background-color:#D1D9E4; +} + + + +#user_actions #user_subscribe .form_note, +#user_actions #user_subscribe .form_datas, +#user_actions #user_subscribe .form_actions label { +display:none; +} +#form_user-relationship .form_note, +#form_user-relationship .form_datas, +#form_user-relationship .form_actions label { +display:block; +} + +#user_actions #user-relationship_submit { +margin-bottom:0; +} +#form_user-relationship .form_datas li label { +margin-right:11px; +} + +#user_relationship_xfn { +/*z-index:1000; +position:absolute; +width:521px; +height:322px;*/ +display:none; +} +#user_relationship_xfn fieldset { +background-color:#fff; +} + +/*END: LOAD ALONG WITH JS*/ + + + +/* TOP_POSTERS */ +#top-posters caption { +text-align:left; +text-transform:uppercase; +} + +#top-posters thead { +display:none; +} +#top-poster_user { +width:199px; +} +#top-poster_number-of-notices { +width:123px; +} +#top-posters tbody td { +padding-right:11px; +padding-bottom:4px; +} +#top-posters img { +margin-right:7px; +height:24px; +width:24px; +} + + + +/* tagcloud */ +#tagcloud ul { +list-style-type:none; +} +#tagcloud ul li { +display:inline; +margin-right:7px; +line-height:1.4; +} + +#tagcloud.section dt { +text-transform:uppercase; +font-weight:bold; +} +#tagcloud .weight_1 { +font-size:1em; +} +#tagcloud .weight_2 { +font-size:1.3em; +} +#tagcloud .weight_3 { +font-size:1.6em; +} +#tagcloud .weight_4 { +font-size:1.9em; +} +#tagcloud .weight_5 { +font-size:2.2em; +} + + + +#form_settings_photo .form_datas { +clear:both; +} + + + + +#photo_original, +#photo_preview { +float:left; +} +#photo_preview, +#settings_photo_action-crop { +margin-left:29px; +} +#photo_preview_view { +height:96px; +width:96px; +overflow:hidden; +} + + + + +.section .groups, +#users_featured ul { +list-style-type:none; +} +.section .groups li, +#users_featured li { +margin-top:11px; +float:left; +width:100%; +} +.section .groups li:first-child, +#users_featured li:first-child { +margin-top:0; +} + +.section .groups .vcard, +#users_featured .vcard { +float:left; +margin-bottom:-23px; +} + +.section .groups dl, +#users_featured dl { +float:left; +margin-left:63px; +clear:left; +} +.section .groups dt, +#users_featured dt { +display:none; +font-weight:bold; +} + + + +#home.logged_out h1 { +display:none; +} + +#home #intro { +margin-bottom:29px; +float:left; +width:100%; +} + +#home #intro p { +margin-bottom:18px; +font-size:1.8em; +} + +#home #intro #guide_steps { +list-style-type:none; +} +#home #intro #guide_steps li { +float:left; +margin-left:18px; +} +#home #intro #guide_steps li:first-child { +margin-left:0; +} +#home #intro #guide_steps li a { +display:block; +float:left; +width:185px; +height:109px; +border-width:1px; +border-style:dotted; +text-decoration:none; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +padding:7px; +font-size:1.6em; +font-weight:bold; +text-align:center; +} + + +#testimonials { +clear:both; +} -- cgit v1.2.3-54-g00ecf From 6fa7ac1305d516c6a50ae1f2008e71539baa4ff2 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 02:06:40 +0000 Subject: Started default stylesheet. Grouped colours for themeing. --- theme/default/css/display.css | 243 +++++++++++++++++++++ theme/identica/css/display.css | 96 +++----- .../images/icons/twotone/green/disfavourite.gif | Bin 0 -> 88 bytes 3 files changed, 270 insertions(+), 69 deletions(-) create mode 100644 theme/default/css/display.css create mode 100644 theme/identica/images/icons/twotone/green/disfavourite.gif (limited to 'theme/identica/css') diff --git a/theme/default/css/display.css b/theme/default/css/display.css new file mode 100644 index 000000000..877c833fe --- /dev/null +++ b/theme/default/css/display.css @@ -0,0 +1,243 @@ +/* theme: identica */ +html, +body, +a:active { +background-color:#ddd; +} +body { +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; +} +input, textarea, select { +border-color:#aaa; +} + +input.submit, +#form_notice.warning #notice_text-count, +#nav_register a, +.form_settings .form_note { +background-color:#A9BF4F; +} + +input:focus, textarea:focus, select:focus, +#form_notice.warning #notice_data-text { +border-color:#A9BF4F; +} +input.submit, +#nav_register a { +color:#fff; +} + +a, +div.notice-options input { +color:#002E6E; +} + +.notice p.entry-content a:visited { +background-color:#fcfcfc; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} +.notice p.entry-content .vcard a { +background-color:#fcfffc; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + +#aside_primary, +#user_subscribe a, +#TB_window input.submit, +.form_user_subscribe input.submit { +background-color:#CEE1E9; +} + + +#notice_text-count { +color:#333; +} +#form_notice.warning #notice_text-count, +#user_actions a { +color:#000; +} + +#form_notice #notice_data-attach_view { +background-image:url(../images/icons/twotone/green/paper-clip.gif); +background-repeat:no-repeat; +background-position:0 45%; +background-color:transparent; +} + +#nav_register a { +text-decoration:none; +font-weight:bold; +padding:2px 4px; +} + +#site_nav_local_views a { +border-color:#fff; +background-color:rgba(255, 255, 255, 0.2); +} +#site_nav_local_views a:hover { +background-color:rgba(255, 255, 255, 0.7); +} + + +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + + +#page_notice .error { +background-color:#F7E8E8; +} +#page_notice .success { +background-color:#EFF3DC; +} + +#export_data li a { +background-repeat:no-repeat; +background-position:0 45%; +} +#export_data li a.rss { +background-image:url(../../base/images/icons/icon_rss.jpg); +} +#export_data li a.atom { +background-image:url(../../base/images/icons/icon_atom.jpg); +} +#export_data li a.foaf { +background-image:url(../../base/images/icons/icon_foaf.gif); +} +#export_data li a.export_vcard { +background-image:url(../../base/images/icons/icon_vcard.gif); +} + + +/*user_actions*/ +#user_actions li { +border-top-color:#eee; +} +#user_subscribe a, +#TB_window input.submit, +.form_user_subscribe input.submit { +background-image: url(../images/icons/twotone/green/shield.gif); +background-position: 0 45%; +background-repeat: no-repeat; +} +.form_user_unsubscribe input.submit { +background-color:#647819; +color:#fff; +} +#user_send-a-message a { +background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat; +} +.form_user_nudge input.submit { +background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat; +} +.form_user_block input.submit { +background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat; +} + + +/* NOTICES */ +.notices li.over { +background-color:#fcfcfc; +} + +.notice-data a span { +background-color:transparent; +background-repeat:no-repeat; +background-position:0 45%; +} +.notice_video .notice-data a span { +background-image:url(../images/icons/twotone/green/camera.gif); +} +.notice_audio .notice-data a span { +background-image:url(../images/icons/twotone/green/music.gif); +} +.notice_image .notice-data a span { +background-image:url(../images/icons/twotone/green/search.gif); +} +.notice_event .notice-data a span { +background-image:url(../images/icons/twotone/green/calendar.gif); +} +.notice_location .notice-data a span { +background-image:url(../images/icons/twotone/green/flag.gif); +} +.notice_document .notice-data a span { +background-image:url(../images/icons/twotone/green/document.gif); +} + +.notice-options .notice_reply a, +.notice-options form input.submit { +background-color:transparent; +} +.notice-options .notice_reply a { +background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%; +} +.notice-options form.form_favor input.submit { +background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%; +} +.notice-options form.form_disfavor input.submit { +background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +} +.notice-options .notice_delete a { +background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; +} + +div.notice-options { +opacity:0.3; +} + +div.entry-content { +color:#333; +} +div.notice-options a, +div.notice-options input { +font-family:sans-serif; +} +.notices li.hover { +background-color:#fcfcfc; +} +.notices li.hover div.entry-content, +.notices li.hover div.notice-options { +opacity:1; +} + +/*END: NOTICES */ + + + +.pagination .nav_prev a, +.pagination .nav_next a { +background-repeat:no-repeat; +} +.pagination .nav_prev a { +background-image:url(../images/icons/twotone/green/arrow-left.gif); +background-position:0 45%; +} +.pagination .nav_next a { +background-image:url(../images/icons/twotone/green/arrow-right.gif); +background-position:100% 45%; +} + + + +#home #intro #guide_steps li a { +border-color:#ccc; +color:#fff; +} +#home #intro #step_join-now a { +background-color:#f00; +} +#home #intro #step_start-a-group a { +background-color:#0f0; +} +#home #intro #step_create-a-community a { +background-color:#00f; +} \ No newline at end of file diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index eb7b47a12..877c833fe 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -1,11 +1,12 @@ /* theme: identica */ -html { +html, +body, +a:active { background-color:#ddd; } body { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; -background-color:#ddd; } input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; @@ -14,20 +15,27 @@ input, textarea, select { border-color:#aaa; } -input:focus, textarea:focus, select:focus { +input.submit, +#form_notice.warning #notice_text-count, +#nav_register a, +.form_settings .form_note { +background-color:#A9BF4F; +} + +input:focus, textarea:focus, select:focus, +#form_notice.warning #notice_data-text { border-color:#A9BF4F; } -input.submit { -background-color:#A9BF4F; +input.submit, +#nav_register a { color:#fff; } -a { +a, +div.notice-options input { color:#002E6E; } -a:active { -background-color:#ddd; -} + .notice p.entry-content a:visited { background-color:#fcfcfc; border-radius:4px; @@ -41,27 +49,20 @@ border-radius:4px; -webkit-border-radius:4px; } - - -#aside_primary { +#aside_primary, +#user_subscribe a, +#TB_window input.submit, +.form_user_subscribe input.submit { background-color:#CEE1E9; } -#form_notice textarea { -} -#form_notice label { -color:#88171A; -} #notice_text-count { color:#333; } -#form_notice.warning #notice_text-count { +#form_notice.warning #notice_text-count, +#user_actions a { color:#000; -background-color:#A9BF4F; -} -#form_notice.warning #notice_data-text { -border-color:#A9BF4F; } #form_notice #notice_data-attach_view { @@ -71,22 +72,11 @@ background-position:0 45%; background-color:transparent; } - -#site_nav_global_primary a { -} -#form_notice .form_actions input.submit { -} #nav_register a { -background-color:#A9BF4F; -color:#fff; text-decoration:none; font-weight:bold; padding:2px 4px; - } -#nav_login a { -} - #site_nav_local_views a { border-color:#fff; @@ -132,13 +122,12 @@ background-image:url(../../base/images/icons/icon_vcard.gif); #user_actions li { border-top-color:#eee; } -#user_actions a { -color:#000; -} #user_subscribe a, #TB_window input.submit, .form_user_subscribe input.submit { -background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat; +background-image: url(../images/icons/twotone/green/shield.gif); +background-position: 0 45%; +background-repeat: no-repeat; } .form_user_unsubscribe input.submit { background-color:#647819; @@ -155,33 +144,11 @@ background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat; } -.user_tags .mark_hash { -color:#555; -} - - - -.vcard .fn { -} -.vcard .fn:hover { -} - - - - /* NOTICES */ .notices li.over { background-color:#fcfcfc; } - -.notice div.entry-content a { - -} -.notice div.entry-content a:hover { -} - - .notice-data a span { background-color:transparent; background-repeat:no-repeat; @@ -233,10 +200,6 @@ color:#333; div.notice-options a, div.notice-options input { font-family:sans-serif; -} -div.notice-options input { -color:#002E6E; - } .notices li.hover { background-color:#fcfcfc; @@ -246,10 +209,6 @@ background-color:#fcfcfc; opacity:1; } -.form_settings .form_note { -background-color:#A9BF4F; -} - /*END: NOTICES */ @@ -281,5 +240,4 @@ background-color:#0f0; } #home #intro #step_create-a-community a { background-color:#00f; -} - +} \ No newline at end of file diff --git a/theme/identica/images/icons/twotone/green/disfavourite.gif b/theme/identica/images/icons/twotone/green/disfavourite.gif new file mode 100644 index 000000000..3946869ae Binary files /dev/null and b/theme/identica/images/icons/twotone/green/disfavourite.gif differ -- cgit v1.2.3-54-g00ecf From 2fb53cdae446313546b7e65dccfef046fb7150da Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 03:54:46 +0000 Subject: Cleaning styles --- theme/base/css/display.css | 25 ++++++++++++++----------- theme/default/css/display.css | 27 +++++++++++---------------- theme/identica/css/display.css | 27 +++++++++++---------------- 3 files changed, 36 insertions(+), 43 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 1d22901fe..e9799160c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -696,6 +696,12 @@ border-top:1px dashed #D1D9E4; list-style-type:none; /*margin-bottom:11px;*/ } +.notices li.hover { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + /* NOTICES */ #notices_primary { @@ -761,20 +767,17 @@ display:inline; #laconicat .notice p.entry-content { /*margin-left:199px;*/ } -.notice p.entry-content a { - -} -.notice p.entry-content a:hover { - -} -.notice p.entry-content .tag a { - +.notice p.entry-content a:visited { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; } -.notice p.entry-content .tag a:hover { - +.notice p.entry-content .vcard a { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; } - .notice div.entry-content { /*border:1px solid blue;*/ clear:left; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 877c833fe..2d3cd9dc9 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -38,15 +38,9 @@ color:#002E6E; .notice p.entry-content a:visited { background-color:#fcfcfc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } .notice p.entry-content .vcard a { background-color:#fcfffc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } #aside_primary, @@ -78,8 +72,16 @@ font-weight:bold; padding:2px 4px; } +#content, #site_nav_local_views a { border-color:#fff; +} +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + +#site_nav_local_views a { background-color:rgba(255, 255, 255, 0.2); } #site_nav_local_views a:hover { @@ -87,10 +89,6 @@ background-color:rgba(255, 255, 255, 0.7); } -#content, -#site_nav_local_views .current a { -background-color:#fff; -} #page_notice .error { @@ -193,7 +191,9 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.notice-options { opacity:0.3; } - +.notices li.hover div.notice-options { +opacity:1; +} div.entry-content { color:#333; } @@ -204,11 +204,6 @@ font-family:sans-serif; .notices li.hover { background-color:#fcfcfc; } -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { -opacity:1; -} - /*END: NOTICES */ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 877c833fe..2d3cd9dc9 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -38,15 +38,9 @@ color:#002E6E; .notice p.entry-content a:visited { background-color:#fcfcfc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } .notice p.entry-content .vcard a { background-color:#fcfffc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } #aside_primary, @@ -78,8 +72,16 @@ font-weight:bold; padding:2px 4px; } +#content, #site_nav_local_views a { border-color:#fff; +} +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + +#site_nav_local_views a { background-color:rgba(255, 255, 255, 0.2); } #site_nav_local_views a:hover { @@ -87,10 +89,6 @@ background-color:rgba(255, 255, 255, 0.7); } -#content, -#site_nav_local_views .current a { -background-color:#fff; -} #page_notice .error { @@ -193,7 +191,9 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.notice-options { opacity:0.3; } - +.notices li.hover div.notice-options { +opacity:1; +} div.entry-content { color:#333; } @@ -204,11 +204,6 @@ font-family:sans-serif; .notices li.hover { background-color:#fcfcfc; } -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { -opacity:1; -} - /*END: NOTICES */ -- cgit v1.2.3-54-g00ecf From 6967e3ec86b421066cd3d5be74a103a3b394937c Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 04:19:14 +0000 Subject: Setting up a way to deal with different logo sizes. --- theme/base/css/display.css | 7 ++----- theme/default/css/display.css | 9 ++++++++- theme/identica/css/display.css | 7 +++++++ 3 files changed, 17 insertions(+), 6 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e9799160c..e337f1c98 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -195,13 +195,11 @@ float:left; margin-bottom:18px; margin-left:18px; } -address .fn, -address .email { -display:none; +address.vcard img.logo { +margin-right:0; } - #header { width:100%; position:relative; @@ -399,7 +397,6 @@ border-radius:7px; width:384px; width:458px; float:left; -margin-left:68px; position:relative; line-height:1; } diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 2d3cd9dc9..3c579cec7 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -2,12 +2,19 @@ html, body, a:active { -background-color:#ddd; +background-color:#777; } body { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; } +address { +margin-right:71px; +} +address .fn { +display:none; +} + input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2d3cd9dc9..d5a5ce956 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -8,6 +8,13 @@ body { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; } +address { +margin-right:71px; +} +address .fn { +display:none; +} + input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -- cgit v1.2.3-54-g00ecf From bb4a6a514bb62a0fef2314512c121951a40437e7 Mon Sep 17 00:00:00 2001 From: sarven Date: Tue, 20 Jan 2009 22:36:57 +0000 Subject: user_actions form markup and styling --- actions/showstream.php | 1 + lib/blockform.php | 15 ++++++++++++++- lib/subscribeform.php | 2 +- lib/unblockform.php | 13 ++++++++++++- lib/unsubscribeform.php | 2 +- theme/base/css/display.css | 30 ++++++++++++------------------ theme/identica/css/display.css | 35 +++++++++++++++++++++++------------ 7 files changed, 64 insertions(+), 34 deletions(-) (limited to 'theme/identica/css') diff --git a/actions/showstream.php b/actions/showstream.php index 1d79ea30d..d550ec295 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -22,6 +22,7 @@ * @category Personal * @package Laconica * @author Evan Prodromou + * @author Sarven Capadisli * @copyright 2008-2009 Control Yourself, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://laconi.ca/ diff --git a/lib/blockform.php b/lib/blockform.php index 51e43f8b5..b7790681d 100644 --- a/lib/blockform.php +++ b/lib/blockform.php @@ -88,6 +88,19 @@ class BlockForm extends Form return 'block-' . $this->profile->id; } + + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_user_block'; + } + + /** * Action of the form * @@ -127,4 +140,4 @@ class BlockForm extends Form { $this->out->submit('submit', _('Block')); } -} \ No newline at end of file +} diff --git a/lib/subscribeform.php b/lib/subscribeform.php index 8b69efd1a..231e740a7 100644 --- a/lib/subscribeform.php +++ b/lib/subscribeform.php @@ -89,7 +89,7 @@ class SubscribeForm extends Form function formClass() { - return 'form_subscribe'; + return 'form_user_subscribe'; } diff --git a/lib/unblockform.php b/lib/unblockform.php index 4cb9ae4f5..025011a82 100644 --- a/lib/unblockform.php +++ b/lib/unblockform.php @@ -88,6 +88,17 @@ class UnblockForm extends Form return 'unblock-' . $this->profile->id; } + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_user_unblock'; + } + /** * Action of the form * @@ -127,4 +138,4 @@ class UnblockForm extends Form { $this->out->submit('submit', _('Unblock')); } -} \ No newline at end of file +} diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php index b222f0e54..092369db7 100644 --- a/lib/unsubscribeform.php +++ b/lib/unsubscribeform.php @@ -89,7 +89,7 @@ class UnsubscribeForm extends Form function formClass() { - return 'form_unsubscribe'; + return 'form_user_unsubscribe'; } /** diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 3c776aea0..fc1f35e35 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -570,8 +570,7 @@ display:none; list-style-type:none; } #user_actions li { -border-top-width:1px; -border-top-style:dotted; +margin-bottom:4px; } #user_actions li:first-child { border-top:0; @@ -584,34 +583,29 @@ padding:0; display:none; } -#user_actions a, #user_actions input.submit { display:block; text-align:left; -padding:4px 0 4px 19px; +cursor:pointer; +width:100%; } #user_actions a { text-decoration:none; } -#user_subscribe a, -#TB_window input.submit, -#user_actions input.submit { -border:0; -cursor:pointer; -padding-left:16px; -width:100%; -font-size:0.9em; -} -#user_subscribe a { -width:auto; + + +.form_user_block input.submit, +.form_user_unblock input.submit { +border:0; padding-left:20px; } -#user_subscribe a, -#TB_window input.submit, + + +#user_subscribe input.submit, .form_user_subscribe input.submit { -font-weight:bold; + } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d5a5ce956..eb5f78b9e 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -125,30 +125,41 @@ background-image:url(../../base/images/icons/icon_vcard.gif); /*user_actions*/ #user_actions li { -border-top-color:#eee; +/*border-top-color:#eee;*/ } -#user_subscribe a, -#TB_window input.submit, -.form_user_subscribe input.submit { -background-image: url(../images/icons/twotone/green/shield.gif); -background-position: 0 45%; + + +.form_user_send-a-message input.submit, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit { +background-position: 0 40%; background-repeat: no-repeat; +background-color:transparent; } +.form_user_subscribe input.submit, .form_user_unsubscribe input.submit { -background-color:#647819; +background-color:#A9BF4F; color:#fff; } +.form_user_unsubscribe input.submit { +background-color:#97BFD1; +} + #user_send-a-message a { -background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat; +background-image:url(../images/icons/twotone/green/quote.gif); } .form_user_nudge input.submit { -background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat; +background-image:url(../images/icons/twotone/green/mail.gif); } -.form_user_block input.submit { -background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat; +.form_user_block input.submit, +.form_user_unblock input.submit { +background-image:url(../images/icons/twotone/green/shield.gif); +color:#000; } + /* NOTICES */ .notices li.over { background-color:#fcfcfc; @@ -242,4 +253,4 @@ background-color:#0f0; } #home #intro #step_create-a-community a { background-color:#00f; -} \ No newline at end of file +} -- cgit v1.2.3-54-g00ecf From 96e40e06493148757896c7f6061e9cbb2d8c2ceb Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 01:10:11 +0000 Subject: profilelist markup and styles --- lib/profilelist.php | 32 ++++++++++++++++++++++++-------- theme/base/css/display.css | 42 ++++++++++++++++++++++++++++++++++++++---- theme/identica/css/display.css | 5 +++-- 3 files changed, 65 insertions(+), 14 deletions(-) (limited to 'theme/identica/css') diff --git a/lib/profilelist.php b/lib/profilelist.php index 973df7bb6..b2a9925c1 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -106,32 +106,48 @@ class ProfileList extends Widget 'alt' => ($this->profile->fullname) ? $this->profile->fullname : $this->profile->nickname)); - $this->out->elementStart('span', 'nickname'); + $hasFN = ($this->profile->fullname) ? 'nickname' : 'fn nickname'; + $this->out->elementStart('span', $hasFN); $this->out->raw($this->highlight($this->profile->nickname)); $this->out->elementEnd('span'); $this->out->elementEnd('a'); if ($this->profile->fullname) { + $this->out->elementStart('dl', 'user_fn'); + $this->out->element('dt', null, 'Full name'); + $this->out->elementStart('dd'); $this->out->elementStart('span', 'fn'); $this->out->raw($this->highlight($this->profile->fullname)); $this->out->elementEnd('span'); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } if ($this->profile->location) { - $this->out->elementStart('span', 'location'); + $this->out->elementStart('dl', 'user_location'); + $this->out->element('dt', null, _('Location')); + $this->out->elementStart('dd', 'location'); $this->out->raw($this->highlight($this->profile->location)); - $this->out->elementEnd('span'); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } if ($this->profile->homepage) { - $this->out->elementStart('p', 'website'); - $this->out->elementStart('a', array('href' => $this->profile->homepage)); + $this->out->elementStart('dl', 'user_url'); + $this->out->element('dt', null, _('URL')); + $this->out->elementStart('dd'); + $this->out->elementStart('a', array('href' => $this->profile->homepage, + 'class' => 'url')); $this->out->raw($this->highlight($this->profile->homepage)); $this->out->elementEnd('a'); - $this->out->elementEnd('p'); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } if ($this->profile->bio) { - $this->out->elementStart('p', 'bio'); + $this->out->elementStart('dl', 'user_note'); + $this->out->element('dt', null, _('Note')); + $this->out->elementStart('dd', 'note'); $this->out->raw($this->highlight($this->profile->bio)); - $this->out->elementEnd('p'); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } # If we're on a list with an owner (subscriptions or subscribers)... diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 61ce2d043..f0bf6bfc1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -62,7 +62,9 @@ font-weight:bold; textarea { overflow:auto; } -select, option { +select { +} +option { padding-bottom:0; } fieldset { @@ -526,14 +528,13 @@ clear:none; } #user_profile .user_fn { margin-left:11px; -margin-left:4px; margin-right:4px; } #user_profile .user_fn .fn { font-weight:bold; font-style:normal; } -#user_profile .user_nickname .nickname { +#user_profile .nickname { font-style:italic; font-weight:bold; } @@ -553,8 +554,13 @@ display:none; #user_profile h2 { display:none; } + /* user_profile */ + + + + /*user_actions*/ #user_actions { clear:left; @@ -677,12 +683,40 @@ clear:both; +.profile #user_profile { +margin-bottom:0; +min-height:60px; +} +.profile .form_user_unsubscribe { +float:right; +} +.profiles { +list-style-type:none; +} +.profile #user_profile .user_location { +width:auto; +clear:none; +margin-left:11px; +} +.profile #user_profile dl, +.profile #user_profile dd { +display:inline; +float:none; +} +.profile #user_profile .user_note, +.profile #user_profile .user_url { +margin-left:55px; +clear:none; +display:block; +width:auto; +} /* NOTICE */ -.notice { +.notice, +.profile { position:relative; padding-top:18px; padding-bottom:18px; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index eb5f78b9e..e3b5310f7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -39,7 +39,9 @@ color:#fff; } a, -div.notice-options input { +div.notice-options input, +.form_user_block input.submit, +.form_user_unblock input.submit { color:#002E6E; } @@ -155,7 +157,6 @@ background-image:url(../images/icons/twotone/green/mail.gif); .form_user_block input.submit, .form_user_unblock input.submit { background-image:url(../images/icons/twotone/green/shield.gif); -color:#000; } -- cgit v1.2.3-54-g00ecf From 27b627c09451c099b18a7cde90f6a028f820046c Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 06:54:17 +0000 Subject: Made user_actions styles more consistent --- actions/showstream.php | 2 +- theme/base/css/display.css | 15 ++++++++++----- theme/identica/css/display.css | 9 +++++---- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'theme/identica/css') diff --git a/actions/showstream.php b/actions/showstream.php index a411fae5b..6ed6abc9e 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -330,7 +330,7 @@ class ShowstreamAction extends Action $user = User::staticGet('id', $this->profile->id); if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { - $this->elementStart('li', array('id' => 'user_send_a_new_message')); + $this->elementStart('li', array('id' => 'user_send-a-message')); $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))), _('Send a message')); $this->elementEnd('li'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5b17fa53a..c60097145 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -611,16 +611,25 @@ width:100%; } #user_actions a { text-decoration:none; +font-weight:bold; +width:100%; +display:block; } .form_user_block input.submit, -.form_user_unblock input.submit { +.form_user_unblock input.submit, +#user_send-a-message a, +.form_user_nudge input.submit { border:0; padding-left:20px; } +#user_send-a-message a { +padding:4px 4px 4px 23px; + +} #user_subscribe input.submit, @@ -631,13 +640,9 @@ padding-left:20px; #user_send-a-message form { -clear:left; -width:322px; -margin-top:18px; } #user_send-a-message textarea { -width:96%; } .user_tags ul { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index e3b5310f7..2b91c5504 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -41,7 +41,9 @@ color:#fff; a, div.notice-options input, .form_user_block input.submit, -.form_user_unblock input.submit { +.form_user_unblock input.submit, +#user_send-a-message a, +.form_user_nudge input.submit { color:#002E6E; } @@ -63,8 +65,7 @@ background-color:#CEE1E9; #notice_text-count { color:#333; } -#form_notice.warning #notice_text-count, -#user_actions a { +#form_notice.warning #notice_text-count { color:#000; } @@ -131,7 +132,7 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } -.form_user_send-a-message input.submit, +#user_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, .form_user_unblock input.submit { -- cgit v1.2.3-54-g00ecf From a57f12b06c9972b4935b7e21a4c9ea1f34647eb3 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 00:04:13 +0000 Subject: selector name cleanup --- actions/showgroup.php | 22 ++++----- actions/showstream.php | 47 +++++++++---------- lib/blockform.php | 2 +- lib/groupminilist.php | 2 +- lib/profilelist.php | 10 ++-- lib/profileminilist.php | 2 +- theme/base/css/display.css | 101 ++++++++++++++++++----------------------- theme/identica/css/display.css | 8 ++-- 8 files changed, 91 insertions(+), 103 deletions(-) (limited to 'theme/identica/css') diff --git a/actions/showgroup.php b/actions/showgroup.php index 41804c6ae..1af080c7e 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -199,7 +199,7 @@ class ShowgroupAction extends Action $this->element('h2', null, _('Group profile')); - $this->elementStart('dl', 'user_depiction'); + $this->elementStart('dl', 'entity_depiction'); $this->element('dt', null, _('Avatar')); $this->elementStart('dd'); @@ -214,10 +214,10 @@ class ShowgroupAction extends Action $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_nickname'); + $this->elementStart('dl', 'entity_nickname'); $this->element('dt', null, _('Nickname')); $this->elementStart('dd'); - $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn nickname url uid'; + $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid'; $this->element('a', array('href' => $this->group->homeUrl(), 'rel' => 'me', 'class' => $hasFN), $this->group->nickname); @@ -225,23 +225,23 @@ class ShowgroupAction extends Action $this->elementEnd('dl'); if ($this->group->fullname) { - $this->elementStart('dl', 'user_fn'); + $this->elementStart('dl', 'entity_fn'); $this->element('dt', null, _('Full name')); $this->elementStart('dd'); - $this->element('span', 'fn', $this->group->fullname); + $this->element('span', 'fn org', $this->group->fullname); $this->elementEnd('dd'); $this->elementEnd('dl'); } if ($this->group->location) { - $this->elementStart('dl', 'user_location'); + $this->elementStart('dl', 'entity_location'); $this->element('dt', null, _('Location')); $this->element('dd', 'location', $this->group->location); $this->elementEnd('dl'); } if ($this->group->homepage) { - $this->elementStart('dl', 'user_url'); + $this->elementStart('dl', 'entity_url'); $this->element('dt', null, _('URL')); $this->elementStart('dd'); $this->element('a', array('href' => $this->group->homepage, @@ -252,7 +252,7 @@ class ShowgroupAction extends Action } if ($this->group->description) { - $this->elementStart('dl', 'user_note'); + $this->elementStart('dl', 'entity_note'); $this->element('dt', null, _('Note')); $this->element('dd', 'note', $this->group->description); $this->elementEnd('dl'); @@ -260,10 +260,10 @@ class ShowgroupAction extends Action $this->elementEnd('div'); - $this->elementStart('div', array('id' => 'user_actions')); + $this->elementStart('div', 'entity_actions'); $this->element('h2', null, _('Group actions')); $this->elementStart('ul'); - $this->elementStart('li', array('id' => 'user_subscribe')); + $this->elementStart('li', array('id' => 'entity_subscribe')); $cur = common_current_user(); if ($cur) { if ($cur->isMember($this->group)) { @@ -341,7 +341,7 @@ class ShowgroupAction extends Action return; } - $this->elementStart('div', array('id' => 'user_subscriptions', + $this->elementStart('div', array('id' => 'entity_subscriptions', 'class' => 'section')); $this->element('h2', null, _('Members')); diff --git a/actions/showstream.php b/actions/showstream.php index 20d429679..f853f277d 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -169,14 +169,14 @@ class ShowstreamAction extends Action $this->element('link', array('rel' => 'alternate', 'href' => common_local_url('api', array('apiaction' => 'statuses', - 'method' => 'user_timeline.rss', + 'method' => 'entity_timeline.rss', 'argument' => $this->user->nickname)), 'type' => 'application/rss+xml', 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname))); $this->element('link', array('rel' => 'alternate feed', 'href' => common_local_url('api', array('apiaction' => 'statuses', - 'method' => 'user_timeline.atom', + 'method' => 'entity_timeline.atom', 'argument' => $this->user->nickname)), 'type' => 'application/atom+xml', 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname))); @@ -231,7 +231,7 @@ class ShowstreamAction extends Action $this->element('h2', null, _('User profile')); $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); - $this->elementStart('dl', 'user_depiction'); + $this->elementStart('dl', 'entity_depiction'); $this->element('dt', null, _('Photo')); $this->elementStart('dd'); $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE), @@ -242,7 +242,7 @@ class ShowstreamAction extends Action $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_nickname'); + $this->elementStart('dl', 'entity_nickname'); $this->element('dt', null, _('Nickname')); $this->elementStart('dd'); $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid'; @@ -253,7 +253,7 @@ class ShowstreamAction extends Action $this->elementEnd('dl'); if ($this->profile->fullname) { - $this->elementStart('dl', 'user_fn'); + $this->elementStart('dl', 'entity_fn'); $this->element('dt', null, _('Full name')); $this->elementStart('dd'); $this->element('span', 'fn', $this->profile->fullname); @@ -262,14 +262,14 @@ class ShowstreamAction extends Action } if ($this->profile->location) { - $this->elementStart('dl', 'user_location'); + $this->elementStart('dl', 'entity_location'); $this->element('dt', null, _('Location')); $this->element('dd', 'location', $this->profile->location); $this->elementEnd('dl'); } if ($this->profile->homepage) { - $this->elementStart('dl', 'user_url'); + $this->elementStart('dl', 'entity_url'); $this->element('dt', null, _('URL')); $this->elementStart('dd'); $this->element('a', array('href' => $this->profile->homepage, @@ -280,7 +280,7 @@ class ShowstreamAction extends Action } if ($this->profile->bio) { - $this->elementStart('dl', 'user_note'); + $this->elementStart('dl', 'entity_note'); $this->element('dt', null, _('Note')); $this->element('dd', 'note', $this->profile->bio); $this->elementEnd('dl'); @@ -288,7 +288,7 @@ class ShowstreamAction extends Action $tags = Profile_tag::getTags($this->profile->id, $this->profile->id); if (count($tags) > 0) { - $this->elementStart('dl', 'user_tags'); + $this->elementStart('dl', 'entity_tags'); $this->element('dt', null, _('Tags')); $this->elementStart('dd'); $this->elementStart('ul', 'tags xoxo'); @@ -307,10 +307,11 @@ class ShowstreamAction extends Action } $this->elementEnd('div'); - $this->elementStart('div', array('id' => 'user_actions')); + //XXX: entity_actions doesn't need to be outputted if entity is looking at their own profile + $this->elementStart('div', 'entity_actions'); $this->element('h2', null, _('User actions')); $this->elementStart('ul'); - $this->elementStart('li', array('id' => 'user_subscribe')); + $this->elementStart('li', array('id' => 'entity_subscribe')); $cur = common_current_user(); if ($cur) { if ($cur->id != $this->profile->id) { @@ -331,14 +332,14 @@ class ShowstreamAction extends Action $user = User::staticGet('id', $this->profile->id); if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { - $this->elementStart('li', array('id' => 'user_send-a-message')); + $this->elementStart('li', array('id' => 'entity_send-a-message')); $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)), 'title' => _('Send a direct message to this user')), _('Message')); $this->elementEnd('li'); if ($user->email && $user->emailnotifynudge) { - $this->elementStart('li', array('id' => 'user_nudge')); + $this->elementStart('li', array('id' => 'entity_nudge')); $nf = new NudgeForm($this, $user); $nf->show(); $this->elementEnd('li'); @@ -347,7 +348,7 @@ class ShowstreamAction extends Action if ($cur && $cur->id != $this->profile->id) { $blocked = $cur->hasBlocked($this->profile); - $this->elementStart('li', array('id' => 'user_block')); + $this->elementStart('li', array('id' => 'entity_block')); if ($blocked) { $ubf = new UnblockForm($this, $this->profile); $ubf->show(); @@ -366,7 +367,7 @@ class ShowstreamAction extends Action $url = common_local_url('remotesubscribe', array('nickname' => $this->profile->nickname)); $this->element('a', array('href' => $url, - 'id' => 'user_subscribe_remote'), + 'id' => 'entity_subscribe_remote'), _('Subscribe')); } @@ -393,7 +394,7 @@ class ShowstreamAction extends Action { $profile = $this->user->getSubscriptions(0, PROFILES_PER_MINILIST + 1); - $this->elementStart('div', array('id' => 'user_subscriptions', + $this->elementStart('div', array('id' => 'entity_subscriptions', 'class' => 'section')); $this->element('h2', null, _('Subscriptions')); @@ -422,7 +423,7 @@ class ShowstreamAction extends Action { $profile = $this->user->getSubscribers(0, PROFILES_PER_MINILIST + 1); - $this->elementStart('div', array('id' => 'user_subscribers', + $this->elementStart('div', array('id' => 'entity_subscribers', 'class' => 'section')); $this->element('h2', null, _('Subscribers')); @@ -462,19 +463,19 @@ class ShowstreamAction extends Action $notices->profile_id = $this->profile->id; $notice_count = (int) $notices->count(); - $this->elementStart('div', array('id' => 'user_statistics', + $this->elementStart('div', array('id' => 'entity_statistics', 'class' => 'section')); $this->element('h2', null, _('Statistics')); // Other stats...? - $this->elementStart('dl', 'user_member-since'); + $this->elementStart('dl', 'entity_member-since'); $this->element('dt', null, _('Member since')); $this->element('dd', null, date('j M Y', strtotime($this->profile->created))); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_subscriptions'); + $this->elementStart('dl', 'entity_subscriptions'); $this->elementStart('dt'); $this->element('a', array('href' => common_local_url('subscriptions', array('nickname' => $this->profile->nickname))), @@ -483,7 +484,7 @@ class ShowstreamAction extends Action $this->element('dd', null, (is_int($subs_count)) ? $subs_count : '0'); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_subscribers'); + $this->elementStart('dl', 'entity_subscribers'); $this->elementStart('dt'); $this->element('a', array('href' => common_local_url('subscribers', array('nickname' => $this->profile->nickname))), @@ -492,7 +493,7 @@ class ShowstreamAction extends Action $this->element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0'); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_notices'); + $this->elementStart('dl', 'entity_notices'); $this->element('dt', null, _('Notices')); $this->element('dd', null, (is_int($notice_count)) ? $notice_count : '0'); $this->elementEnd('dl'); @@ -504,7 +505,7 @@ class ShowstreamAction extends Action { $groups = $this->user->getGroups(0, GROUPS_PER_MINILIST + 1); - $this->elementStart('div', array('id' => 'user_groups', + $this->elementStart('div', array('id' => 'entity_groups', 'class' => 'section')); $this->element('h2', null, _('Groups')); diff --git a/lib/blockform.php b/lib/blockform.php index ea22c1cec..af766b823 100644 --- a/lib/blockform.php +++ b/lib/blockform.php @@ -150,6 +150,6 @@ class BlockForm extends Form function formActions() { - $this->out->submit('submit', _('block'), 'submit', null, _('Block this user')); + $this->out->submit('submit', _('Block'), 'submit', null, _('Block this user')); } } diff --git a/lib/groupminilist.php b/lib/groupminilist.php index f40a67b0c..fe38d0340 100644 --- a/lib/groupminilist.php +++ b/lib/groupminilist.php @@ -49,7 +49,7 @@ class GroupMiniList extends GroupList { function show() { - $this->out->elementStart('ul', 'groups xoxo'); + $this->out->elementStart('ul', 'entities groups xoxo'); $cnt = 0; diff --git a/lib/profilelist.php b/lib/profilelist.php index 403cfe065..73c129efe 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -112,7 +112,7 @@ class ProfileList extends Widget $this->out->elementEnd('a'); if ($this->profile->fullname) { - $this->out->elementStart('dl', 'user_fn'); + $this->out->elementStart('dl', 'entity_fn'); $this->out->element('dt', null, 'Full name'); $this->out->elementStart('dd'); $this->out->elementStart('span', 'fn'); @@ -122,7 +122,7 @@ class ProfileList extends Widget $this->out->elementEnd('dl'); } if ($this->profile->location) { - $this->out->elementStart('dl', 'user_location'); + $this->out->elementStart('dl', 'entity_location'); $this->out->element('dt', null, _('Location')); $this->out->elementStart('dd', 'location'); $this->out->raw($this->highlight($this->profile->location)); @@ -130,7 +130,7 @@ class ProfileList extends Widget $this->out->elementEnd('dl'); } if ($this->profile->homepage) { - $this->out->elementStart('dl', 'user_url'); + $this->out->elementStart('dl', 'entity_url'); $this->out->element('dt', null, _('URL')); $this->out->elementStart('dd'); $this->out->elementStart('a', array('href' => $this->profile->homepage, @@ -141,7 +141,7 @@ class ProfileList extends Widget $this->out->elementEnd('dl'); } if ($this->profile->bio) { - $this->out->elementStart('dl', 'user_note'); + $this->out->elementStart('dl', 'entity_note'); $this->out->element('dt', null, _('Note')); $this->out->elementStart('dd', 'note'); $this->out->raw($this->highlight($this->profile->bio)); @@ -155,7 +155,7 @@ class ProfileList extends Widget # Get tags $tags = Profile_tag::getTags($this->owner->id, $this->profile->id); - $this->out->elementStart('dl', 'user_tags'); + $this->out->elementStart('dl', 'entity_tags'); $this->out->elementStart('dt'); if ($user->id == $this->owner->id) { $this->out->element('a', array('href' => common_local_url('tagother', diff --git a/lib/profileminilist.php b/lib/profileminilist.php index f157a5529..56b768419 100644 --- a/lib/profileminilist.php +++ b/lib/profileminilist.php @@ -49,7 +49,7 @@ class ProfileMiniList extends ProfileList { function show() { - $this->out->elementStart('ul', 'users xoxo'); + $this->out->elementStart('ul', 'entities users xoxo'); $cnt = 0; diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ab287c04f..c622e2f22 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -509,7 +509,7 @@ float:left; -/* user_profile */ +/* entity_profile */ .entity_profile { position:relative; width:475px; @@ -519,22 +519,22 @@ margin-bottom:17px; margin-left:0; } .entity_profile dt, -#user_statistics dt { +#entity_statistics dt { font-weight:bold; } -.entity_profile .user_depiction { +.entity_profile .entity_depiction { float:left; position:absolute; top:0; left:0; width:96px; } -.entity_profile .user_fn, -.entity_profile .user_nickname, -.entity_profile .user_location, -.entity_profile .user_url, -.entity_profile .user_note, -.entity_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; @@ -542,16 +542,16 @@ width:322px; margin-bottom:4px; } -.entity_profile .user_fn, -.entity_profile .user_nickname { +.entity_profile .entity_fn, +.entity_profile .entity_nickname { width:auto; clear:none; } -.entity_profile .user_fn { +.entity_profile .entity_fn { margin-left:11px; margin-right:4px; } -.entity_profile .user_fn .fn { +.entity_profile .entity_fn .fn { font-weight:bold; font-style:normal; } @@ -560,11 +560,11 @@ font-style:italic; font-weight:bold; } -.entity_profile .user_fn dd:before { +.entity_profile .entity_fn dd:before { content: "("; font-weight:normal; } -.entity_profile .user_fn dd:after { +.entity_profile .entity_fn dd:after { content: ")"; font-weight:normal; } @@ -576,47 +576,47 @@ display:none; display:none; } -/* user_profile */ +/* entity_profile */ -/*user_actions*/ -#user_actions { +/*entity_actions*/ +.entity_actions { clear:left; float:left; position:absolute; top:0; right:0; } -#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 { text-decoration:none; font-weight:bold; width:100%; @@ -627,35 +627,22 @@ display:block; .form_user_block input.submit, .form_user_unblock input.submit, -#user_send-a-message a, +#entity_send-a-message a, .form_user_nudge input.submit { border:0; padding-left:20px; } -#user_send-a-message a { +#entity_send-a-message a { 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; @@ -674,11 +661,11 @@ 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: ":"; } @@ -688,21 +675,21 @@ content: ":"; #user_groups, { } -.section ul.users { +.section ul.entities { width:220px; float:left; } -.section .users li { +.section .entities li { list-style-type:none; float:left; margin-right:7px; margin-bottom:7px; } -.section .users li .photo { +.section .entities li .photo { margin-right:0; margin-bottom:0; } -.section .users li .fn { +.section .entities li .fn { display:none; } .aside .section .more { @@ -729,7 +716,7 @@ display:none; .profiles { list-style-type:none; } -.profile .entity_profile .user_location { +.profile .entity_profile .entity_location { width:auto; clear:none; margin-left:11px; @@ -739,8 +726,8 @@ margin-left:11px; display:inline; float:none; } -.profile .entity_profile .user_note, -.profile .entity_profile .user_url { +.profile .entity_profile .entity_note, +.profile .entity_profile .entity_url { margin-left:59px; clear:none; display:block; @@ -1065,9 +1052,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, @@ -1076,7 +1063,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 { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2b91c5504..c702c77e6 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -42,7 +42,7 @@ a, div.notice-options input, .form_user_block input.submit, .form_user_unblock input.submit, -#user_send-a-message a, +#entity_send-a-message a, .form_user_nudge input.submit { color:#002E6E; } @@ -55,7 +55,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,7 +132,7 @@ 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 { @@ -149,7 +149,7 @@ color:#fff; background-color:#97BFD1; } -#user_send-a-message a { +#entity_send-a-message a { background-image:url(../images/icons/twotone/green/quote.gif); } .form_user_nudge input.submit { -- cgit v1.2.3-54-g00ecf From a330bdac62ddbc15232bc65d65e869b224880e3f Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 06:33:38 +0000 Subject: Moved nudge response from util.php to nudge.php Adjusted some CSS --- actions/nudge.php | 3 ++- js/util.js | 20 ++++++++++---------- lib/util.php | 5 ----- theme/base/css/display.css | 22 ++++++++++------------ theme/identica/css/display.css | 8 ++++++-- 5 files changed, 28 insertions(+), 30 deletions(-) (limited to 'theme/identica/css') diff --git a/actions/nudge.php b/actions/nudge.php index 456106459..ca6fd3761 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -42,6 +42,7 @@ require_once INSTALLDIR.'/lib/mail.php'; * @package Laconica * @author Evan Prodromou * @author Robin Millette + * @author Sarven Capadisli * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://laconi.ca/ */ @@ -93,7 +94,7 @@ class NudgeAction extends Action $this->element('title', null, _('Nudge sent')); $this->elementEnd('head'); $this->elementStart('body'); - common_nudge_response(); + $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!')); $this->elementEnd('body'); $this->elementEnd('html'); } else { diff --git a/js/util.js b/js/util.js index bb68c2587..579b4952a 100644 --- a/js/util.js +++ b/js/util.js @@ -108,16 +108,16 @@ $(document).ready(function(){ $("form.form_group_join").each(addAjaxHidden); $("form.form_group_leave").each(addAjaxHidden); - $("#nudge").ajaxForm ({ dataType: 'xml', - beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled"); - $("form#nudge input[type=submit]").addClass("disabled"); - }, - success: function(xml) { $("#nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true)); - $("#nudge input[type=submit]").removeAttr("disabled"); - $("#nudge input[type=submit]").removeClass("disabled"); - } - }); - $("#nudge").each(addAjaxHidden); + $("#form_user_nudge").ajaxForm ({ dataType: 'xml', + beforeSubmit: function(xml) { $("#form_user_nudge input[type=submit]").attr("disabled", "disabled"); + $("#form_user_nudge input[type=submit]").addClass("disabled"); + }, + success: function(xml) { $("#form_user_nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true)); + $("#form_user_nudge input[type=submit]").removeAttr("disabled"); + $("#form_user_nudge input[type=submit]").removeClass("disabled"); + } + }); + $("#form_user_nudge").each(addAjaxHidden); var Subscribe = { dataType: 'xml', beforeSubmit: function(formData, jqForm, options) { $(".form_user_subscribe input[type=submit]").attr("disabled", "disabled"); diff --git a/lib/util.php b/lib/util.php index 4d4a3b20f..61f5d6c16 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1660,11 +1660,6 @@ function common_session_token() return $_SESSION['token']; } -function common_nudge_response() -{ - common_element('p', array('id' => 'nudge_response'), _('Nudge sent!')); -} - function common_cache_key($extra) { return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra; diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 073d2d40a..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; @@ -465,7 +461,7 @@ padding:1px 2px; } #form_notice #notice_data-attach_view { -/*position:absolute;*/ +position:absolute; top:25px; right:30px; margin-left:4px; @@ -614,10 +610,10 @@ text-align:left; cursor:pointer; width:100%; } -.entity_actions a { +.entity_actions a, +#entity_nudge p { text-decoration:none; font-weight:bold; -width:100%; display:block; } @@ -626,12 +622,14 @@ display:block; .form_user_block input.submit, .form_user_unblock input.submit, #entity_send-a-message a, -.form_user_nudge input.submit { +.form_user_nudge input.submit, +#entity_nudge p { border:0; padding-left:20px; } -#entity_send-a-message a { +#entity_send-a-message a, +#entity_nudge p { padding:4px 4px 4px 23px; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c702c77e6..fa395b03b 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, @@ -43,7 +44,8 @@ div.notice-options input, .form_user_block input.submit, .form_user_unblock input.submit, #entity_send-a-message a, -.form_user_nudge input.submit { +.form_user_nudge input.submit, +#entity_nudge p { color:#002E6E; } @@ -135,7 +137,8 @@ background-image:url(../../base/images/icons/icon_vcard.gif); #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; @@ -152,6 +155,7 @@ background-color:#97BFD1; #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); } -- cgit v1.2.3-54-g00ecf From 28981279c4d278861f3f50bff96bc8101dc943ee Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 08:54:00 +0000 Subject: Colour for group leave (same as unsubscribe) --- theme/identica/css/display.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'theme/identica/css') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index fa395b03b..1df14a7f1 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -143,12 +143,15 @@ 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; } -- cgit v1.2.3-54-g00ecf From 8daec3c245fd1127ea96e0ef1312fcad91b53a3f Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 17:01:57 +0000 Subject: Colour fix for Subscribe input.submit --- theme/identica/css/display.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 1df14a7f1..66ee3c25d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -58,8 +58,7 @@ background-color:#fcfffc; #aside_primary, #entity_subscribe a, -#TB_window input.submit, -.form_user_subscribe input.submit { +#TB_window input.submit { background-color:#CEE1E9; } -- cgit v1.2.3-54-g00ecf From 690273e20d98f33e43a490dc129a4d05dd06274c Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 19:43:08 +0000 Subject: notice stlye updates --- theme/base/css/display.css | 21 ++++++++++++++++++++- theme/identica/css/display.css | 2 ++ 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e49f27dfb..44dbff5da 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -754,6 +754,14 @@ margin-right:11px; /*content:":";*/ } +.notice .author .fn { +font-weight:bold; +} + +.notice .author .photo { +margin-bottom:0; +} + .vcard .photo { display:inline; margin-right:11px; @@ -806,7 +814,7 @@ border-radius:4px; /*border:1px solid blue;*/ clear:left; float:left; -width:48%; +/*width:48%;*/ font-size:0.95em; } .notice div.entry-content a, @@ -829,6 +837,10 @@ font-size:1.025em; .notice div.entry-content dd { display:inline; } +.notice div.entry-content .timestamp { +margin-left:59px; +} + .notice div.entry-content .timestamp dt, .notice div.entry-content .response dt { display:none; @@ -845,6 +857,11 @@ text-transform:lowercase; .notice div.entry-content a:hover { } + + + + + .notice-data { position:absolute; top:18px; @@ -867,6 +884,8 @@ float:left; width:50%; position:relative; font-size:0.95em; +width:12.5%; +float:right; } .notice-options a { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 66ee3c25d..5d07cfd9a 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -214,9 +214,11 @@ background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-re background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } +div.entry-content, div.notice-options { opacity:0.3; } +.notices li.hover div.entry-content, .notices li.hover div.notice-options { opacity:1; } -- cgit v1.2.3-54-g00ecf From 94d9329b5f9ae1906bb062911d263a2ea6d067e5 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 20:32:26 +0000 Subject: entry content opacity --- theme/identica/css/display.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 5d07cfd9a..c16dc9fd7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -214,8 +214,8 @@ background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-re background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } -div.entry-content, -div.notice-options { +.notices div.entry-content, +.notices div.notice-options { opacity:0.3; } .notices li.hover div.entry-content, -- cgit v1.2.3-54-g00ecf From 785ffd5b9b70ea1614ba66b3c7b195f39027eeb6 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 21:03:59 +0000 Subject: Populat notices and some css cleanup --- js/util.js | 2 +- lib/noticesection.php | 38 +++++++++++++++++++------------------- theme/base/css/display.css | 24 +++++++++++++++++++----- theme/identica/css/display.css | 7 ++++++- 4 files changed, 45 insertions(+), 26 deletions(-) (limited to 'theme/identica/css') diff --git a/js/util.js b/js/util.js index 579b4952a..de486cf74 100644 --- a/js/util.js +++ b/js/util.js @@ -184,7 +184,7 @@ $(document).ready(function(){ $("#form_notice").ajaxForm(PostNotice); $("#form_notice").each(addAjaxHidden); - $(".notice").hover( + $("#content .notice").hover( function () { $(this).addClass('hover'); }, diff --git a/lib/noticesection.php b/lib/noticesection.php index 9d1079070..7dfa0472d 100644 --- a/lib/noticesection.php +++ b/lib/noticesection.php @@ -54,13 +54,13 @@ class NoticeSection extends Section $cnt = 0; - $this->out->elementStart('table', 'notices'); + $this->out->elementStart('ul', 'notices'); while ($notices->fetch() && ++$cnt <= NOTICES_PER_SECTION) { $this->showNotice($notices); } - $this->out->elementEnd('table'); + $this->out->elementEnd('ul'); return ($cnt > NOTICES_PER_SECTION); } @@ -73,9 +73,15 @@ class NoticeSection extends Section function showNotice($notice) { $profile = $notice->getProfile(); - $this->out->elementStart('tr'); - $this->out->elementStart('td'); + $this->out->elementStart('li', 'hentry notice'); + $this->out->elementStart('div', 'entry-title'); $avatar = $profile->getAvatar(AVATAR_MINI_SIZE); + $this->out->elementStart('span', 'vcard author'); + $this->out->elementStart('a', array('title' => ($profile->fullname) ? + $profile->fullname : + $profile->nickname, + 'href' => $profile->noticeurl, + 'class' => 'url')); $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)), 'width' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE, @@ -83,25 +89,19 @@ class NoticeSection extends Section 'alt' => ($profile->fullname) ? $profile->fullname : $profile->nickname)); - $this->out->elementEnd('a'); - $this->out->elementEnd('td'); - $this->out->elementStart('td'); - $this->out->elementStart('a', array('title' => ($profile->fullname) ? - $profile->fullname : - $profile->nickname, - 'href' => $profile->noticeurl, - 'rel' => 'contact member', - 'class' => 'url')); $this->out->element('span', 'fn nickname', $profile->nickname); - $this->out->elementEnd('td'); - $this->out->elementStart('td'); + $this->out->elementEnd('a'); + $this->out->elementEnd('span'); + + $this->out->elementStart('p', 'entry-content'); $this->out->raw($notice->rendered); - $this->out->elementEnd('td'); + $this->out->elementEnd('p'); if ($notice->value) { - $this->out->elementStart('td'); + $this->out->elementStart('p'); $this->out->text($notice->value); - $this->out->elementEnd('td'); + $this->out->elementEnd('p'); } - $this->out->elementEnd('tr'); + $this->out->elementEnd('div'); + $this->out->elementEnd('li'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index c55b3fd23..2208529c0 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -799,7 +799,7 @@ display:inline; #laconicat .notice p.entry-content { /*margin-left:199px;*/ } -.notice p.entry-content a:visited { +#content .notice p.entry-content a:visited { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; @@ -1061,7 +1061,6 @@ background-color:#fff; text-align:left; text-transform:uppercase; } - #top_posters thead { display:none; } @@ -1071,15 +1070,30 @@ width:199px; #top_poster_number-of-notices { width:123px; } -#top_posters tbody td { + +.section tbody td { padding-right:11px; -padding-bottom:4px; +padding-bottom:11px; } -#top_posters img { +.section .vcard .photo { margin-right:7px; margin-bottom:0; } +.section .notice { +padding-top:11px; +padding-bottom:11px; + +} + +.section .notice:first { +border-top:0; +} + + + + + /* tagcloud */ .tag-cloud { list-style-type:none; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c16dc9fd7..b7ff0eb2d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -49,7 +49,12 @@ div.notice-options input, color:#002E6E; } -.notice p.entry-content a:visited { +.notice, +.profile { +border-top-color:#97BFD1; +} + +#content .notice p.entry-content a:visited { background-color:#fcfcfc; } .notice p.entry-content .vcard a { -- cgit v1.2.3-54-g00ecf From 6fa7ce5d5e37851e2f4fbf99e3dded3facde6211 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 21:08:49 +0000 Subject: Minor --- theme/identica/css/display.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'theme/identica/css') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index b7ff0eb2d..c10f46fe9 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -51,9 +51,14 @@ color:#002E6E; .notice, .profile { +border-top-color:#D1D9E4; +} +.section .notice, +.section .profile { border-top-color:#97BFD1; } + #content .notice p.entry-content a:visited { background-color:#fcfcfc; } -- cgit v1.2.3-54-g00ecf From 251551fee68f8941b5f64ea4afbe34d13b09a77d Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 21:47:33 +0000 Subject: Group top post section and styles --- lib/groupsection.php | 14 +++++++++----- theme/base/css/display.css | 4 ++++ theme/identica/css/display.css | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'theme/identica/css') diff --git a/lib/groupsection.php b/lib/groupsection.php index bf26ab48c..c19299493 100644 --- a/lib/groupsection.php +++ b/lib/groupsection.php @@ -58,13 +58,13 @@ class GroupSection extends Section $cnt = 0; - $this->out->elementStart('ul', 'entities group xoxo'); + $this->out->elementStart('table'); while ($profiles->fetch() && ++$cnt <= GROUPS_PER_SECTION) { $this->showGroup($profiles); } - $this->out->elementEnd('ul'); + $this->out->elementEnd('table'); return ($cnt > GROUPS_PER_SECTION); } @@ -76,7 +76,9 @@ class GroupSection extends Section function showGroup($group) { - $this->out->elementStart('li', 'vcard'); + $this->out->elementStart('tr'); + $this->out->elementStart('td'); + $this->out->elementStart('span', 'vcard'); $this->out->elementStart('a', array('title' => ($group->fullname) ? $group->fullname : $group->nickname, @@ -95,9 +97,11 @@ class GroupSection extends Section $group->nickname)); $this->out->element('span', 'fn org nickname', $group->nickname); $this->out->elementEnd('a'); + $this->out->elementEnd('span'); + $this->out->elementEnd('td'); if ($group->value) { - $this->out->element('span', 'value', $group->value); + $this->out->element('td', 'value', $group->value); } - $this->out->elementEnd('li'); + $this->out->elementEnd('tr'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5d2a0d3c4..3f34ee7b2 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -841,6 +841,10 @@ display:inline; .notice div.entry-content .timestamp { margin-left:59px; } +#showstream .notice div.entry-content .timestamp { +margin-left:0; +} + .notice div.entry-content .timestamp dt, .notice div.entry-content .response dt { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c10f46fe9..dd623b217 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -226,7 +226,7 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 .notices div.entry-content, .notices div.notice-options { -opacity:0.3; +opacity:0.4; } .notices li.hover div.entry-content, .notices li.hover div.notice-options { -- cgit v1.2.3-54-g00ecf From 0905586355a4e3a8c924ab8dfb5e89818b6e6270 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 02:46:03 +0000 Subject: Minor section vcard background --- theme/identica/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme/identica/css') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index dd623b217..62086d74e 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -62,7 +62,7 @@ border-top-color:#97BFD1; #content .notice p.entry-content a:visited { background-color:#fcfcfc; } -.notice p.entry-content .vcard a { +#content .notice p.entry-content .vcard a { background-color:#fcfffc; } -- cgit v1.2.3-54-g00ecf From 961c5af3cec8cf4fc3efe7e80b90ea69e6137cdd Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 03:47:32 +0000 Subject: Anonymous notice --- actions/groups.php | 4 +++- actions/public.php | 2 +- actions/showstream.php | 2 +- theme/base/css/display.css | 18 ++++++++++++++++-- theme/base/css/initial_states.css | 1 - theme/identica/css/display.css | 13 +++++++++++++ 6 files changed, 34 insertions(+), 6 deletions(-) delete mode 100644 theme/base/css/initial_states.css (limited to 'theme/identica/css') diff --git a/actions/groups.php b/actions/groups.php index 6faa497fc..261f9b3aa 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -95,9 +95,11 @@ class GroupsAction extends Action function showContent() { + $this->elementStart('p', array('id' => 'new_group')); $this->element('a', array('href' => common_local_url('newgroup'), - 'id' => 'new_group'), + 'class' => 'more'), _('Create a new group')); + $this->elementEnd('p'); $offset = ($this->page-1) * GROUPS_PER_PAGE; $limit = GROUPS_PER_PAGE + 1; diff --git a/actions/public.php b/actions/public.php index 396b60e83..f5380589a 100644 --- a/actions/public.php +++ b/actions/public.php @@ -215,7 +215,7 @@ class PublicAction extends Action $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' . '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))'); - $this->elementStart('div', 'anonymous'); + $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); $this->elementEnd('div'); } diff --git a/actions/showstream.php b/actions/showstream.php index 3005cdd88..157ccdd0c 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -538,7 +538,7 @@ class ShowstreamAction extends Action 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' . '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), $this->user->nickname, $this->user->nickname); - $this->elementStart('div', 'anonymous'); + $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); $this->elementEnd('div'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5cafd8c1f..bc06c50ab 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -234,6 +234,22 @@ clear:both; margin-bottom:18px; } + +#anon_notice { +float:left; +width:432px; +padding:11px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-width:2px; +border-style:solid; +line-height:1.5; +font-size:1.1em; +font-weight:bold; +} + + #footer { float:left; width:64%; @@ -378,7 +394,6 @@ border-radius:7px; /*Start: FORM NOTICE*/ #form_notice { -width:384px; width:458px; float:left; position:relative; @@ -395,7 +410,6 @@ display:none; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; -width:377px; width:370px; height:67px; line-height:1.5; diff --git a/theme/base/css/initial_states.css b/theme/base/css/initial_states.css deleted file mode 100644 index 8b1378917..000000000 --- a/theme/base/css/initial_states.css +++ /dev/null @@ -1 +0,0 @@ - diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 62086d74e..5088d7ac7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -119,6 +119,19 @@ background-color:#F7E8E8; background-color:#EFF3DC; } + +#anon_notice { +background-color:#97BFD1; +color:#fff; +} + +#showstream #anon_notice { +background-color:#A9BF4F; +} + + + + #export_data li a { background-repeat:no-repeat; background-position:0 45%; -- cgit v1.2.3-54-g00ecf From fbe6aa703e106dd46122f10c962204d28c94ea9e Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 04:08:12 +0000 Subject: Tag cloud font-size and line-height --- theme/base/css/display.css | 18 +++++++++++------- theme/identica/css/display.css | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ba1cc06f5..dd0b332f5 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1101,6 +1101,7 @@ border-top:0; /* tagcloud */ .tag-cloud { list-style-type:none; +text-align:center; } .aside .tag-cloud { @@ -1110,7 +1111,10 @@ font-size:0.8em; .tag-cloud li { display:inline; margin-right:7px; -line-height:1; +line-height:1.25; +} +.aside .tag-cloud li { +line-height:1.5; } .tag-cloud li a { text-decoration:none; @@ -1123,22 +1127,22 @@ font-weight:bold; font-size:1em; } .tag-cloud-2 { -font-size:1.5em; +font-size:1.25em; } .tag-cloud-3 { -font-size:2em; +font-size:1.75em; } .tag-cloud-4 { -font-size:2.5em; +font-size:2em; } .tag-cloud-5 { -font-size:3em; +font-size:2.25em; } .tag-cloud-6 { -font-size:3.5em; +font-size:2.75em; } .tag-cloud-7 { -font-size:4em; +font-size:3.25em; } #publictagcloud #tagcloud.section dt { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 5088d7ac7..f41a32508 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -123,6 +123,7 @@ background-color:#EFF3DC; #anon_notice { background-color:#97BFD1; color:#fff; +border-color:#fff; } #showstream #anon_notice { -- cgit v1.2.3-54-g00ecf From e2afca803df2de87fd242d6462938e7a29716a17 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 04:54:54 +0000 Subject: Cleanup --- theme/base/css/display.css | 237 ++++++----------------------------------- theme/identica/css/display.css | 36 +++---- 2 files changed, 47 insertions(+), 226 deletions(-) (limited to 'theme/identica/css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index dd0b332f5..d5532a5c9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1,4 +1,12 @@ -/* theme: base */ +/** theme: base + * + * @package Laconica + * @author Sarven Capadisli + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -13,7 +21,6 @@ font-size:1em; line-height:1.65; position:relative; margin:0 auto; -width:1004px; width:71.714em; } h1,h2,h3,h4,h5,h6 { @@ -34,7 +41,6 @@ h6 { font-size:0.9em; } caption { font-weight:bold; } - legend { font-weight:bold; font-size:1.3em; @@ -59,8 +65,6 @@ font-weight:bold; textarea { overflow:auto; } -select { -} option { padding-bottom:0; } @@ -74,7 +78,6 @@ margin:0 0 18px 0; } form label { font-weight:bold; -/*margin:0 0 11px 0;*/ } input.checkbox { position:relative; @@ -104,16 +107,10 @@ margin-bottom:29px; .form_settings input.remove { margin-left:11px; } - -.form_guide { -font-style:italic; -} - .form_settings .form_data li { width:100%; float:left; } - .form_settings .form_data label { float:left; } @@ -123,7 +120,6 @@ float:left; margin-left:11px; float:left; } - .form_settings label { margin-top:2px; width:152px; @@ -132,6 +128,9 @@ width:152px; .form_actions label { display:none; } +.form_guide { +font-style:italic; +} .form_settings #settings_autosubscribe label { display:inline; @@ -185,7 +184,6 @@ padding:0 7px; } - address { float:left; margin-bottom:18px; @@ -291,12 +289,7 @@ width:100%; #site_nav_global_secondary dt { display:none; } -/* -#site_nav_global_primary .current a { -font-weight:bold; -border-style:solid; -} -*/ + #site_nav_global_secondary { margin-bottom:11px; } @@ -350,10 +343,9 @@ margin-right:4px; } #wrap { - float:left; - margin:0 auto; - width:1004px; - width:71.714em; +float:left; +margin:0 auto; +width:71.714em; } #core { @@ -489,9 +481,9 @@ margin-top:11px; #notice_to select { float:left; } - /*end FORM NOTICE*/ + /* entity_profile */ .entity_profile { position:relative; @@ -559,9 +551,9 @@ display:none; .entity_profile h2 { display:none; } - /* entity_profile */ + /*entity_actions*/ .entity_actions { float:right; @@ -642,11 +634,6 @@ display:inline; content: ":"; } -#user_subscriptions, -#user_subscribers, -#user_groups, { - -} .section ul.entities { width:220px; float:left; @@ -721,9 +708,6 @@ margin-right:11px; } - - - /* NOTICE */ .notice, .profile { @@ -735,11 +719,9 @@ float:left; width:100%; border-top-width:1px; border-top-style:dashed; -/*-moz-border-radius:7px;*/ } .notices li { list-style-type:none; -/*margin-bottom:11px;*/ } .notices li.hover { border-radius:4px; @@ -767,11 +749,6 @@ padding-left:28px; .notice .author { margin-right:11px; } -.notice .author a { -} -.notice .author:after { -/*content:":";*/ -} .notice .author .fn { font-weight:bold; @@ -795,29 +772,20 @@ text-decoration:underline; } .vcard .fn { font-style:italic; -} -.vcard .fn:hover { - } .notice .entry-title { float:left; width:100%; } +#shownotice .notice .entry-title { +font-size:2.2em; +} + .notice p.entry-content { display:inline; } -.notice_video p.entry-content, -.notice_audio p.entry-content, -.notice_image p.entry-content, -.notice_location p.entry-content, -.notice_event p.entry-content, -.notice_document p.entry-content { -} -#laconicat .notice p.entry-content { -/*margin-left:199px;*/ -} #content .notice p.entry-content a:visited { border-radius:4px; -moz-border-radius:4px; @@ -932,10 +900,6 @@ text-decoration:none; padding-left:16px; } -.notice-options .notice_delete { - -} - .notice-options form input.submit { cursor:pointer; width:16px; @@ -953,9 +917,19 @@ display:none; border:0; padding:0; } - /*END: NOTICES */ + + +#groups p { +margin-bottom:18px; +} +#groups #new_group a { +padding-left:20px; +} + + + .pagination dt { font-weight:bold; display:none; @@ -995,10 +969,9 @@ border-left:0; padding-right:20px; border-right:0; } - /* END: NOTICE */ -/*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; } @@ -1013,67 +986,10 @@ margin-bottom:18px; margin-left:18px; } -/*START: LOAD ALONG WITH JS*/ -.notice .in-reply-to { - width:98%; - margin-left:2%; -} -.notice .in-reply-to li { -background-color:#F7F9FB; -} -.notice .in-reply-to li .in-reply-to li { -background-color:#E4E9F0; -} -.notice .in-reply-to li .in-reply-to li .in-reply-to li { -background-color:#D1D9E4; -} -.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, -#form_user-relationship .form_data, -#form_user-relationship .form_actions label { -display:block; -} -.entity_actions #user-relationship_submit { -margin-bottom:0; -} -#form_user-relationship .form_data li label { -margin-right:11px; -} - -#user_relationship_xfn { -/*z-index:1000; -position:absolute; -width:521px; -height:322px;*/ -display:none; -} -#user_relationship_xfn fieldset { -background-color:#fff; -} - -/*END: LOAD ALONG WITH JS*/ /* TOP_POSTERS */ -#top_posters caption { -text-align:left; -text-transform:uppercase; -} -#top_posters thead { -display:none; -} -#top_poster_user { -width:199px; -} -#top_poster_number-of-notices { -width:123px; -} - .section tbody td { padding-right:11px; padding-bottom:11px; @@ -1086,7 +1002,6 @@ margin-bottom:0; .section .notice { padding-top:11px; padding-bottom:11px; - } .section .notice:first-child { @@ -1095,19 +1010,14 @@ border-top:0; } - - - /* tagcloud */ .tag-cloud { list-style-type:none; text-align:center; } - .aside .tag-cloud { font-size:0.8em; } - .tag-cloud li { display:inline; margin-right:7px; @@ -1181,82 +1091,3 @@ clear:both; #form_settings_avatar .form_actions { margin-bottom:0; } - -#groups_related ul, -#users_featured ul { -list-style-type:none; -} -#groups_related li, -#users_featured li { -margin-top:11px; -float:left; -width:100%; -} -#groups_related li:first-child, -#users_featured li:first-child { -margin-top:0; -} - -#groups_related .vcard, -#users_featured .vcard { -float:left; -margin-bottom:-23px; -} - -#groups_related dl, -#users_featured dl { -float:left; -margin-left:63px; -clear:left; -} -#groups_related dt, -#users_featured dt { -display:none; -font-weight:bold; -} - -#home.logged_out h1 { -display:none; -} - -#home #intro { -margin-bottom:29px; -float:left; -width:100%; -} - -#home #intro p { -margin-bottom:18px; -font-size:1.8em; -} - -#home #intro #guide_steps { -list-style-type:none; -} -#home #intro #guide_steps li { -float:left; -margin-left:18px; -} -#home #intro #guide_steps li:first-child { -margin-left:0; -} -#home #intro #guide_steps li a { -display:block; -float:left; -width:185px; -height:109px; -border-width:1px; -border-style:dotted; -text-decoration:none; -border-radius:7px; --moz-border-radius:7px; --webkit-border-radius:7px; -padding:7px; -font-size:1.6em; -font-weight:bold; -text-align:center; -} - -#testimonials { -clear:both; -} diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index f41a32508..17e2aee9e 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -1,4 +1,12 @@ -/* theme: identica */ +/** theme: identica + * + * @package Laconica + * @author Sarven Capadisli + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + html, body, a:active { @@ -151,12 +159,6 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } -/*user_actions*/ -#user_actions li { -/*border-top-color:#eee;*/ -} - - #entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, @@ -259,6 +261,10 @@ background-color:#fcfcfc; /*END: NOTICES */ +#groups #new_group a { +background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; +} + .pagination .nav_prev a, .pagination .nav_next a { @@ -272,19 +278,3 @@ background-position:0 45%; background-image:url(../images/icons/twotone/green/arrow-right.gif); background-position:100% 45%; } - - - -#home #intro #guide_steps li a { -border-color:#ccc; -color:#fff; -} -#home #intro #step_join-now a { -background-color:#f00; -} -#home #intro #step_start-a-group a { -background-color:#0f0; -} -#home #intro #step_create-a-community a { -background-color:#00f; -} -- cgit v1.2.3-54-g00ecf From 500ed2f5eb752a1a1e82d83c8c8b1c58897789b8 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 05:23:28 +0000 Subject: Cleanup --- actions/remotesubscribe.php | 16 ++++++++++++++-- actions/showstream.php | 2 +- theme/base/css/display.css | 16 ++++++++++++++-- theme/identica/css/display.css | 13 +++++++------ 4 files changed, 36 insertions(+), 11 deletions(-) (limited to 'theme/identica/css') diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 3c8346fbe..f727a63b8 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -92,14 +92,26 @@ class RemotesubscribeAction extends Action { # id = remotesubscribe conflicts with the # button on profile page - $this->elementStart('form', array('id' => 'remsub', 'method' => 'post', - 'action' => common_local_url('remotesubscribe'))); + $this->elementStart('form', array('id' => 'form_remote_subscribe', + 'method' => 'post', + 'class' => 'form_settings', + 'action' => common_local_url('remotesubscribe'))); + $this->elementStart('fieldset'); + $this->element('legend', 'Subscribe to a remote user'); $this->hidden('token', common_session_token()); + + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); $this->input('nickname', _('User nickname'), $this->nickname, _('Nickname of the user you want to follow')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('profile_url', _('Profile URL'), $this->profile_url, _('URL of your profile on another compatible microblogging service')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('submit', _('Subscribe')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/actions/showstream.php b/actions/showstream.php index 157ccdd0c..2fd56ad2e 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -367,7 +367,7 @@ class ShowstreamAction extends Action $url = common_local_url('remotesubscribe', array('nickname' => $this->profile->nickname)); $this->element('a', array('href' => $url, - 'id' => 'entity_subscribe_remote'), + 'class' => 'entity_remote_subscribe'), _('Subscribe')); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d5532a5c9..b4f3ffd54 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -144,7 +144,8 @@ font-weight:bold; #form_settings_avatar legend, #newgroup legend, #editgroup legend, -#form_tag_user legend { +#form_tag_user legend, +#form_remote_subscribe legend { display:none; } @@ -586,7 +587,8 @@ cursor:pointer; width:100%; } .entity_actions a, -#entity_nudge p { +#entity_nudge p, +.entity_remote_subscribe { text-decoration:none; font-weight:bold; display:block; @@ -606,6 +608,16 @@ padding-left:20px; padding:4px 4px 4px 23px; } +.entity_remote_subscribe { +padding:4px; +border-width:2px; +border-style:solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + + .entity_tags ul { list-style-type:none; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 17e2aee9e..f61d063b6 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -26,7 +26,8 @@ display:none; input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -input, textarea, select { +input, textarea, select, +.entity_remote_subscribe { border-color:#aaa; } @@ -34,7 +35,8 @@ border-color:#aaa; input.submit, #form_notice.warning #notice_text-count, #nav_register a, -.form_settings .form_note { +.form_settings .form_note, +.entity_remote_subscribe { background-color:#A9BF4F; } @@ -43,7 +45,8 @@ input:focus, textarea:focus, select:focus, border-color:#A9BF4F; } input.submit, -#nav_register a { +#nav_register a, +.entity_remote_subscribe { color:#fff; } @@ -74,9 +77,7 @@ background-color:#fcfcfc; background-color:#fcfffc; } -#aside_primary, -#entity_subscribe a, -#TB_window input.submit { +#aside_primary { background-color:#CEE1E9; } -- cgit v1.2.3-54-g00ecf