changelog_bot (changelog_bot) wrote in changelog,
changelog_bot
changelog_bot
changelog

[livejournal] r17088: OPSC-123 Merge oauth branch to trunk

Committer: aurbanowich
OPSC-123 Merge oauth branch to trunk
* stage 1.2 : merge trunk to branches/oauth

U   branches/oauth/cgi-bin/Apache/LiveJournal.pm
U   branches/oauth/htdocs/stc/ie.css
Modified: branches/oauth/cgi-bin/Apache/LiveJournal.pm
===================================================================
--- branches/oauth/cgi-bin/Apache/LiveJournal.pm	2010-08-05 07:22:17 UTC (rev 17087)
+++ branches/oauth/cgi-bin/Apache/LiveJournal.pm	2010-08-05 07:22:20 UTC (rev 17088)
@@ -1098,18 +1098,8 @@
     return LJ::Request::DECLINED
 }
 
-sub crossdomain_content {
-    return Apache::LiveJournal::Interface::Api::crossdomain();
-}
-
 sub userpic_trans
 {
-    # crossdomain.xml addon
-    if (LJ::Request->uri eq '/crossdomain.xml') {
-        LJ::Request->handler("perl-script");
-        LJ::Request->set_handlers(PerlHandler => \&crossdomain_content);
-        return LJ::Request::OK;
-    }
 
     if (LJ::Request->uri eq '/crossdomain.xml') {
         Apache::LiveJournal::Interface::Api->load; 

Modified: branches/oauth/htdocs/stc/ie.css
===================================================================
--- branches/oauth/htdocs/stc/ie.css	2010-08-05 07:22:17 UTC (rev 17087)
+++ branches/oauth/htdocs/stc/ie.css	2010-08-05 07:22:20 UTC (rev 17088)
@@ -33,5 +33,31 @@
     zoom:1;
     }
 
+/* LJTimes
+__________________________________________*/
+* HTML .b-ljtimes-wrapper {
+	position: absolute;
+	bottom: auto;
+	top: expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? documentElement.scrollTop +(documentElement.clientHeight-this.clientHeight) : document.body.scrollTop +(document.body.clientHeight-this.clientHeight));
+	}
+.b-ljtimes-login .i-ljtimes-checkbox {
+	vertical-align: -3px;
+	}
+.b-ljtimes-logged-submit {
+	height: 34px;
+	padding: 5px 22px 0;
+	}
+* HTML .b-ljtimes-login-form {
+	zoom: 1;
+	}
+* HTML .i-ljtimes-bl,
+* HTML .i-ljtimes-br {
+	behavior: expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none", this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "', sizingMethod='image')", this.src = "transparent.gif"):(this.origBg = this.origBg? this.origBg : this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''), this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "', sizingMethod='scale')", this.runtimeStyle.backgroundImage = "none")),this.pngSet=true));
+	}
+* HTML .i-ljtimes-drag,
+* HTML .i-ljtimes-click {
+	behavior: expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none", this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "', sizingMethod='image')", this.src = "transparent.gif"):(this.origBg = this.origBg? this.origBg : this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''), this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "', sizingMethod='crop')", this.runtimeStyle.backgroundImage = "none")),this.pngSet=true));
+	}
 
 
+

Tags: css, fortl, livejournal, pm
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments