Committer: esavintcev
LJSUP-7762: Mail.RuU trunk/htdocs/stc/lj_base.css U trunk/templates/CommentForm/Form.tmpl
Modified: trunk/htdocs/stc/lj_base.css =================================================================== --- trunk/htdocs/stc/lj_base.css 2011-03-10 10:47:54 UTC (rev 18502) +++ trunk/htdocs/stc/lj_base.css 2011-03-10 10:58:50 UTC (rev 18503) @@ -1061,7 +1061,10 @@ overflow: visible; position: static; display: block; - margin: 0 0 10px; + width: auto; + height: auto; + margin: 0 0 5px; + padding: 0; zoom: 1; } .b-postform-login:before, @@ -1102,6 +1105,8 @@ top: 26px; left: 0; display: block; + width: auto; + height: auto; margin: 0; padding: 0; border: 0; @@ -1116,6 +1121,8 @@ top: 25px; left: -1px; display: block; + width: auto; + height: auto; margin: 0; padding: 3px 5px; border: 1px solid #CCC; @@ -1132,7 +1139,10 @@ .b-postform-login-services-item { position: static; display: none; + width: auto; + height: auto; margin: 0; + padding: 0; } .b-postform-login-services:hover .b-postform-login-services-item { display: block; @@ -1140,6 +1150,8 @@ BODY .b-postform-login-services-item A:link, BODY .b-postform-login-services-item A:visited { display: block; + width: auto; + height: auto; margin: 0; padding: 3px 7px 3px 3px; -moz-border-radius: 3px; @@ -1152,6 +1164,8 @@ BODY .b-postform-login-services-item A:hover, BODY .b-postform-login-services-item A:active { display: block; + width: auto; + height: auto; margin: 0; padding: 3px 7px 3px 3px; -moz-border-radius: 3px; @@ -1174,7 +1188,11 @@ cursor: default; } .b-postform-login-services-item IMG { + position: static; + width: auto; + height: auto; margin: 0 5px 0 0; + padding: 0; vertical-align: -4px; border: 0; } @@ -1232,13 +1250,16 @@ BODY .b-postform-mailru .b-postform-login-services-mailru A:visited, BODY .b-postform-mailru .b-postform-login-services-mailru A:hover, BODY .b-postform-mailru .b-postform-login-services-mailru A:active { + position: static; display: block; + width: auto; + height: auto; margin: 0; padding: 0; -moz-border-radius: 0; border-radius: 0; border: 0; - background: #FFF !important; + background: transparent !important; color: #222 !important; text-decoration: none; } @@ -1249,6 +1270,7 @@ .b-postform-twitter .b-postform-login-services-twitter IMG, .b-postform-openid .b-postform-login-services-openid IMG, .b-postform-mailru .b-postform-login-services-mailru IMG { + position: static; display: block; width: 17px; height: 16px; @@ -1275,6 +1297,8 @@ position: static; float: none; display: block; + width: auto; + height: auto; margin: 0 0 0 55px; padding: 0; font: 12px/1.1 Arial,sans-serif; @@ -1310,30 +1334,38 @@ .b-postform-login-item .i-bubble-arrow-border { margin: -6px 0 0; } - .b-postform-login-anonymous .b-postform-login-opts { + .b-postform-login-anonymous .b-postform-login-opts, + .b-postform-user-cookie .b-postform-login-user .b-postform-login-opts, + .b-postform-facebook-cookie .b-postform-login-facebook .b-postform-login-opts, + .b-postform-twitter-cookie .b-postform-login-twitter .b-postform-login-opts, + .b-postform-openid-cookie .b-postform-login-openid .b-postform-login-opts, + .b-postform-mailru-cookie .b-postform-login-mailru .b-postform-login-opts { position: static; display: block; + width: auto; + height: auto; margin: 0; padding: 8px 0; } - .b-postform-login-user .b-postform-login-opts { - position: static; - display: block; - margin: 0; - padding: 8px 0; - } .b-postform-login-livejournal .b-postform-login-opts { position: static; display: block; + width: auto; + height: auto; margin: 0; padding: 4px 2px; } .b-postform-login-ljedit .b-postform-login-opts { position: static; display: block; + width: auto; + height: auto; margin: 0; padding: 5px 0; } + .b-postform-login-ljedit .b-postform-login-opts .b-postform-login-img { + vertical-align: -4px; + } Modified: trunk/templates/CommentForm/Form.tmpl =================================================================== --- trunk/templates/CommentForm/Form.tmpl 2011-03-10 10:47:54 UTC (rev 18502) +++ trunk/templates/CommentForm/Form.tmpl 2011-03-10 10:58:50 UTC (rev 18503) @@ -28,12 +28,14 @@ <div class="b-postform-login-item b-postform-login-ljedit"> <TMPL_IF remote_banned> <div class="b-postform-login-opts"> + <img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" class="b-postform-login-img" /> <TMPL_VAR ml_loggedin> <TMPL_VAR ml_banned> </div> <TMPL_ELSE> <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span> <div class="b-postform-login-opts"> + <img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" class="b-postform-login-img" /> <TMPL_VAR ml_loggedin> <input type="hidden" name="usertype" value="cookieuser" /> <input type="hidden" name="cookieuser" value="<TMPL_VAR remote_username>" id="cookieuser" /> @@ -42,7 +44,7 @@ </div> </div> <TMPL_ELSE> - <div class="b-postform-login b-postform-livejournal"> + <div class='b-postform-login b-postform-<TMPL_IF expr="usertype_default eq 'anonymous'">anonymous b-postform-anonymous-cookie<TMPL_ELSIF expr="usertype_default eq 'cookieuser'">user b-postform-user-cookie<TMPL_ELSIF expr="usertype_default eq 'facebook_cookie'">facebook b-postform-facebook-cookie<TMPL_ELSIF expr="usertype_default eq 'twitter_cookie'">twitter b-postform-twitter-cookie<TMPL_ELSIF expr="usertype_default eq 'openid_cookie'">openid b-postform-openid-cookie<TMPL_ELSIF expr="usertype_default eq 'mailru_cookie'">mailru b-postform-mailru-cookie</TMPL_IF>'> <div class="b-postform-login-services"> <div class="b-postform-login-services-items"> <span class="b-postform-login-services-item b-postform-login-services-anonymous"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/anonymous.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span></a></span>