From 17284239feed2c892fd98657103a5c3db079914d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 1 Jul 2008 11:54:42 -0400 Subject: [PATCH] fixup formatting on remotesubscribe link darcs-hash:20080701155442-84dde-948a31801bc639a0e5d7d9c04bee1fc0b1df7667.gz --- actions/showstream.php | 3 +- theme/stoica/display.css | 93 +++++++++++++++++++++------------------- 2 files changed, 50 insertions(+), 46 deletions(-) diff --git a/actions/showstream.php b/actions/showstream.php index 8e4933d403..56f6737230 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -172,7 +172,8 @@ class ShowstreamAction extends StreamAction { function show_remote_subscribe_link($profile) { $url = common_local_url('remotesubscribe', array('nickname' => $profile->nickname)); - common_element('a', array('href' => $url), + common_element('a', array('href' => $url, + 'class' => 'remotesubscribe'), _t('Subscribe')); } diff --git a/theme/stoica/display.css b/theme/stoica/display.css index 9dd861c939..806303e621 100644 --- a/theme/stoica/display.css +++ b/theme/stoica/display.css @@ -24,7 +24,7 @@ a { } a:hover { text-decoration: underline; - } + } img, img a { border: 0; } @@ -38,7 +38,7 @@ h1 { padding: 0 20px; width: 760px; background: url(bg-header.gif) repeat-x #FCFFF5; - } + } #header { position: relative; margin: 0 auto; @@ -49,7 +49,7 @@ h1 { } #logo { margin-top: 9px; - } + } p#branding { margin: 0; padding: 6px 0 3px 0; @@ -61,7 +61,7 @@ p#branding { p#branding a { color: #dab134; } - + #header h1.pagetitle { margin: 0; padding: 0; @@ -77,10 +77,10 @@ p#branding a { padding: 0; color: #FCFFF5; } - + /* ===== Begin Navigation Styling ===== */ - -/* ----- Navigation ------ */ + +/* ----- Navigation ------ */ #nav { float: right; margin: 0; @@ -128,7 +128,7 @@ p#branding a { } #nav_views li a:hover { text-decoration: none; - } + } #nav_views li.current a, #nav_views li.current a:hover { color: #3F606F; background-color: #FCFFF5; @@ -136,14 +136,14 @@ p#branding a { } #nav_views li.current a:hover { color: #193441; - } + } #nav_views li a:hover { color: #FCFFF5; background-color: #3F606F; border-right: 1px solid #6A8787; } - -/* ----- Nav Footer ----- */ + +/* ----- Nav Footer ----- */ #nav_sub { clear: both; margin: 18px auto 0 auto; @@ -161,7 +161,7 @@ p#branding a { } #nav_sub li a { padding: 6px 24px 6px 0; - } + } #nav_sub li a:hover { text-decoration: underline; } @@ -182,7 +182,7 @@ p#branding a { #content label { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; - } + } .instructions, .success, .error { font-weight: normal; margin: 36px 0 0 0; @@ -192,16 +192,16 @@ p#branding a { line-height: 15px; border: 1px solid #91AA9D; color: #FCFFF5; - } + } .success { background-color: #48705b; - } + } .error { background-color: #ce3728; } - - + + /* ----- Profile -----*/ #profile { clear: left; @@ -224,7 +224,7 @@ p#branding a { font-size: 11px; text-transform: uppercase; color: #91AA9D; - } + } #profile p { margin: 0 10px 0 0; font-size: 12px; @@ -232,12 +232,12 @@ p#branding a { } #profile p.location { margin: 0 10px 12px 0; - font-style: italic; - } + font-style: italic; + } #profile p.notice_current { font-size: 18px; line-height: 21px; - } + } #profile_avatar { float: left; margin-right: 4px; @@ -252,13 +252,13 @@ p#branding a { } .avatar.original { margin: 0 10px 18px 0; - } + } a.nickname { font-family: Verdana, Arial, Helvetica, sans-serif; font-weight: bold; font-size: 12px; padding-right: 3px; - } + } #profile_information { float: left; position: relative; @@ -270,7 +270,7 @@ a.nickname { } .statistics h2 { margin: 12px 0 3px 0; - } + } dl.statistics { margin: 0; font-size: 12px; @@ -286,21 +286,21 @@ dl.statistics { } .statistics dd { clear: right; - } + } .statistics dt:after { content: ":"; } #subscriptions { float: left; margin: 18px 0 30px 0; - } + } #subscriptions_avatars { /*float: left;*/ margin: 6px 0 0 0; padding: 0; list-style-type: none; width: 270px; - } + } #subscriptions_avatars li .avatar.mini { float: left; margin: 0 3px 3px 0; @@ -326,8 +326,8 @@ ul.subscriptions li, ul.subscribers li { float: left; padding: 0; } -/* ----- End Subscriptions & Subscribers -----*/ - +/* ----- End Subscriptions & Subscribers -----*/ + #notices { clear: both; margin: 0 auto; @@ -339,7 +339,7 @@ ul.subscriptions li, ul.subscribers li { } #notices a:hover { text-decoration: underline; - } + } .notice_single { clear: both; display: block; @@ -353,12 +353,12 @@ ul.subscriptions li, ul.subscribers li { } .notice_single:hover { background-color: #F3F8EA; - } + } .notice_single p { display: inline; margin: 0; padding: 0; - } + } .avatar { float: left; margin: 0 10px 0 0; @@ -372,7 +372,7 @@ p.time { } p.time a { color: #91AA9D; - } + } #pagination { margin: 18px auto; @@ -393,7 +393,7 @@ p.time a { } #nav_pagination li.before { margin-right: 1px; - } + } #nav_pagination li a { padding: 6px 15px; line-height: 21px; @@ -405,7 +405,7 @@ p.time a { color: #FCFFF5; text-decoration: none; } - + #footer { clear: both; margin: 0 auto; @@ -415,7 +415,7 @@ p.time a { } #footer p { margin-top: 9px; - } + } #cc { float: left; margin: 3px 10px 0 0; @@ -431,7 +431,7 @@ form { form { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; - } + } form label { display: block; font-size: 12px; @@ -464,7 +464,7 @@ textarea, input { } textarea:focus, input:focus { background-color: #f0f6eb; - } + } textarea { width: 270px; border: 1px solid #D8E2D7; @@ -475,8 +475,8 @@ textarea { line-height: 21px; color: #91aa9d; font-family: Verdana, Arial, Helvetica, sans-serif; - } - + } + /* ----- Status Form ----- */ #status_form { height: 96px; @@ -485,7 +485,7 @@ textarea { #status_form p { margin: 36px 0 0 0; padding: 0; - } + } #status_label { display: block; clear: both; @@ -524,7 +524,7 @@ textarea { #status_submit:hover { background-color: #904632; } - + /* ----- Subscribe Form ----- */ #subscribe .submit, #unsubscribe .submit, #remotesubscribe .button { margin: 0; @@ -537,7 +537,7 @@ textarea { background-color: #c15d42; color: #fcfff5; border: 0; - } + } #subscribe .button:hover, #unsubscribe .button:hover { background-color: #904632; cursor: pointer; @@ -547,7 +547,11 @@ input#profile_url { padding: 3px; margin: 0 0 10px 0; } -/* ----- Login Form -----*/ +a#remotesubscribe { + display: block; +} + +/* ----- Login Form -----*/ input#license { width: auto; } @@ -567,4 +571,3 @@ input#openid_url { } /* ===== End Forms Styling ===== */ - \ No newline at end of file