Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[ljcom] r12728: LJSUP-13769: S2 styles Journal Promo blo...

Committer: esavintcev
LJSUP-13769: S2 styles Journal Promo block
U   trunk/bin/upgrading/s2layers/component/layout.s2
U   trunk/bin/upgrading/s2layers/sup/layout.s2
U   trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
U   trunk/htdocs/stc/voxhtml/death/screen.css
U   trunk/htdocs/stc/voxhtml/hearts-and-daisies/screen.css
U   trunk/htdocs/stc/voxhtml/kaboom/screen.css
U   trunk/htdocs/stc/voxhtml/pixipets/screen.css
U   trunk/htdocs/stc/voxhtml/poe/screen.css
U   trunk/htdocs/stc/voxhtml/scraps-blue/screen.css
U   trunk/htdocs/stc/voxhtml/scraps-green/screen.css
U   trunk/htdocs/stc/voxhtml/scraps-pink/screen.css
U   trunk/htdocs/stc/voxhtml/scraps-yellow/screen.css
Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2012-10-04 13:02:41 UTC (rev 12728)
@@ -2379,11 +2379,11 @@
 function print_journalpromo () {
     var Page p = get_page();
 
-    if ($p->render_journalpromo()) {
+    if ($p->is_journalpromo()) {
         """
         <div class="compBg compContent" style="border: 1px solid $*outside_border;">
         """;
-            $p->journalpromo();
+            $p->render_journalpromo();
         """
         </div>
         <div><img src="$*PALIMGROOT/component/clear.gif" width="1" height="4" alt="" border="0" /></div>

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2012-10-04 13:02:41 UTC (rev 12728)
@@ -344,6 +344,7 @@
      return $user->ljuser({"in_journal" => $journal_name}); 
  }
 
+
 function _journalpromo {
     var Page p = get_page();
     

Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2012-10-04 13:02:41 UTC (rev 12728)
@@ -723,9 +723,9 @@
 function print_journalpromo () {
     var Page p = get_page();
 
-    if ($p->render_journalpromo()) {
+    if ($p->is_journalpromo()) {
         """<div class="ind-entry" style="overflow: hidden; padding: 15px 0; zoom:1;">""";
-            $p->journalpromo();
+            $p->render_journalpromo();
         "</div>";
     }
 }

Modified: trunk/htdocs/stc/voxhtml/death/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/death/screen.css	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/htdocs/stc/voxhtml/death/screen.css	2012-10-04 13:02:41 UTC (rev 12728)
@@ -381,3 +381,9 @@
 {
 color:#fff!important;
 }
+
+
+
+.appwidget-journalpromo {
+    margin: 0 0 29px;
+}

Modified: trunk/htdocs/stc/voxhtml/hearts-and-daisies/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/hearts-and-daisies/screen.css	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/htdocs/stc/voxhtml/hearts-and-daisies/screen.css	2012-10-04 13:02:41 UTC (rev 12728)
@@ -347,3 +347,9 @@
 
 
 
+
+.appwidget-journalpromo {
+    margin: 0 0 33px;
+    padding: 0 0 56px;
+    background: url(divider.gif?v=1) no-repeat 50% 100%;
+}

Modified: trunk/htdocs/stc/voxhtml/kaboom/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/kaboom/screen.css	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/htdocs/stc/voxhtml/kaboom/screen.css	2012-10-04 13:02:41 UTC (rev 12728)
@@ -366,3 +366,7 @@
 
 
 
+
+.appwidget-journalpromo {
+    margin: 0 0 29px;
+}

Modified: trunk/htdocs/stc/voxhtml/pixipets/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/pixipets/screen.css	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/htdocs/stc/voxhtml/pixipets/screen.css	2012-10-04 13:02:41 UTC (rev 12728)
@@ -333,4 +333,3 @@
 #content-inner,
 #header-photo,
 .asset-body { height: 1%; }
-

Modified: trunk/htdocs/stc/voxhtml/poe/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/poe/screen.css	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/htdocs/stc/voxhtml/poe/screen.css	2012-10-04 13:02:41 UTC (rev 12728)
@@ -471,3 +471,6 @@
 
 
 
+.appwidget-journalpromo {
+    margin: 0 0 29px;
+}

Modified: trunk/htdocs/stc/voxhtml/scraps-blue/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/scraps-blue/screen.css	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/htdocs/stc/voxhtml/scraps-blue/screen.css	2012-10-04 13:02:41 UTC (rev 12728)
@@ -403,4 +403,10 @@
 }
 
 /* Win IE < 7 */
-* html #header-name a { word-wrap: break-word; }
\ No newline at end of file
+* html #header-name a { word-wrap: break-word; }
+
+
+
+.appwidget-journalpromo {
+    margin: 0 0 15px;
+}

Modified: trunk/htdocs/stc/voxhtml/scraps-green/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/scraps-green/screen.css	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/htdocs/stc/voxhtml/scraps-green/screen.css	2012-10-04 13:02:41 UTC (rev 12728)
@@ -403,4 +403,10 @@
 }
 
 /* Win IE < 7 */
-* html #header-name a { word-wrap: break-word; }
\ No newline at end of file
+* html #header-name a { word-wrap: break-word; }
+
+
+
+.appwidget-journalpromo {
+    margin: 0 0 15px;
+}

Modified: trunk/htdocs/stc/voxhtml/scraps-pink/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/scraps-pink/screen.css	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/htdocs/stc/voxhtml/scraps-pink/screen.css	2012-10-04 13:02:41 UTC (rev 12728)
@@ -403,4 +403,10 @@
 }
 
 /* Win IE < 7 */
-* html #header-name a { word-wrap: break-word; }
\ No newline at end of file
+* html #header-name a { word-wrap: break-word; }
+
+
+
+.appwidget-journalpromo {
+    margin: 0 0 15px;
+}

Modified: trunk/htdocs/stc/voxhtml/scraps-yellow/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/scraps-yellow/screen.css	2012-10-04 11:37:29 UTC (rev 12727)
+++ trunk/htdocs/stc/voxhtml/scraps-yellow/screen.css	2012-10-04 13:02:41 UTC (rev 12728)
@@ -403,4 +403,10 @@
 }
 
 /* Win IE < 7 */
-* html #header-name a { word-wrap: break-word; }
\ No newline at end of file
+* html #header-name a { word-wrap: break-word; }
+
+
+
+.appwidget-journalpromo {
+    margin: 0 0 15px;
+}

Tags: css, esavintcev, ljcom, s2, savintsev_egor
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