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

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

Committer: esavintcev
LJSUP-13769: S2 styles Journal Promo block
U   trunk/bin/upgrading/s2layers/sup/layout.s2
U   trunk/bin/upgrading/s2layers/sup/themes.s2
U   trunk/htdocs/stc/sup/s/style.css
U   trunk/htdocs/stc/sup/s/x-3.css
U   trunk/htdocs/stc/sup/s/x-5.css
Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2012-10-01 14:26:29 UTC (rev 12712)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2012-10-01 15:22:43 UTC (rev 12713)
@@ -1110,6 +1110,7 @@
     } else {
         $comments_count = "";
     }
+
     _print_entry($e);
     _journalpromo();
 

Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2012-10-01 14:26:29 UTC (rev 12712)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2012-10-01 15:22:43 UTC (rev 12713)
@@ -705,12 +705,12 @@
                         <div class="hr"><hr /></div>
 """;
     }
+
     foreach var Entry e ($.entries) {
         _print_entry($e);
-        """
-        <!-- $e.itemid -->
-        """;
+        _journalpromo();
     }
+
     if (size $.entries > 0 and ($.nav.backward_url != "" or $.nav.forward_url != "" or ($p.view == "recent" and $*page_recent_items != 1) or ($p.view == "friends" and $*page_friends_items != 1))) {
 """
                 <ul class="page-nav">
@@ -750,6 +750,7 @@
     if ($.has_entries) {
         foreach var Entry e ($.entries) {
             _print_entry($e);
+            _journalpromo();
         }
     } else {
 """
@@ -856,7 +857,10 @@
         } else {
             $comments_count = "";
         }
+
         _print_entry($e);
+        _journalpromo();
+
         if ($.entry.comments.enabled) {
 """
                         <div id="$*text_comments_id" class="entry-wrap entry-comments entry-comments-s1">
@@ -915,6 +919,7 @@
     } else {
 
         _print_entry($e);
+        _journalpromo();
         
         if ($.entry.comments.enabled) {
 """
@@ -1220,12 +1225,12 @@
                         <div class="hr"><hr /></div>
 """;
     }
+
     foreach var Entry e ($.entries) {
         _print_entry($e);
-        """
-        <!-- $e.itemid -->
-        """;
+        _journalpromo();
     }
+
     if (size $.entries > 0 and ($.nav.backward_url != "" or $.nav.forward_url != "" or ($p.view == "recent" and $*page_recent_items != 1) or ($p.view == "friends" and $*page_friends_items != 1))) {
 """
                 <ul class="page-nav">
@@ -1265,6 +1270,7 @@
     if ($.has_entries) {
         foreach var Entry e ($.entries) {
             _print_entry($e);
+            _journalpromo();
         }
     } else {
 """
@@ -1371,7 +1377,10 @@
         } else {
             $comments_count = "";
         }
+
         _print_entry($e);
+        _journalpromo();
+
         if ($.entry.comments.enabled) {
 """
                         <div id="$*text_comments_id" class="entry-wrap entry-comments entry-comments-s1">
@@ -1430,6 +1439,7 @@
     } else {
 
         _print_entry($e);
+        _journalpromo();
         
         if ($.entry.comments.enabled) {
 """
@@ -1735,12 +1745,12 @@
                         <div class="hr"><hr /></div>
 """;
     }
+
     foreach var Entry e ($.entries) {
         _print_entry($e);
-        """
-        <!-- $e.itemid -->
-        """;
+        _journalpromo();
     }
+
     if (size $.entries > 0 and ($.nav.backward_url != "" or $.nav.forward_url != "" or ($p.view == "recent" and $*page_recent_items != 1) or ($p.view == "friends" and $*page_friends_items != 1))) {
 """
                 <ul class="page-nav">
@@ -1780,6 +1790,7 @@
     if ($.has_entries) {
         foreach var Entry e ($.entries) {
             _print_entry($e);
+            _journalpromo();
         }
     } else {
 """
@@ -1886,7 +1897,10 @@
         } else {
             $comments_count = "";
         }
+
         _print_entry($e);
+        _journalpromo();
+
         if ($.entry.comments.enabled) {
 """
                         <div id="$*text_comments_id" class="entry-wrap entry-comments entry-comments-s1">
@@ -1945,6 +1959,7 @@
     } else {
 
         _print_entry($e);
+        _journalpromo();
         
         if ($.entry.comments.enabled) {
 """
@@ -2250,12 +2265,12 @@
                         <div class="hr"><hr /></div>
 """;
     }
+
     foreach var Entry e ($.entries) {
         _print_entry($e);
-        """
-        <!-- $e.itemid -->
-        """;
+        _journalpromo();
     }
+
     if (size $.entries > 0 and ($.nav.backward_url != "" or $.nav.forward_url != "" or ($p.view == "recent" and $*page_recent_items != 1) or ($p.view == "friends" and $*page_friends_items != 1))) {
 """
                 <ul class="page-nav">
@@ -2295,6 +2310,7 @@
     if ($.has_entries) {
         foreach var Entry e ($.entries) {
             _print_entry($e);
+            _journalpromo();
         }
     } else {
 """
@@ -2401,7 +2417,10 @@
         } else {
             $comments_count = "";
         }
+
         _print_entry($e);
+        _journalpromo();
+
         if ($.entry.comments.enabled) {
 """
                         <div id="$*text_comments_id" class="entry-wrap entry-comments entry-comments-s1">
@@ -2460,6 +2479,7 @@
     } else {
 
         _print_entry($e);
+        _journalpromo();
         
         if ($.entry.comments.enabled) {
 """
@@ -4009,12 +4029,12 @@
                         <div class="hr"><hr /></div>
 """;
     }
+
     foreach var Entry e ($.entries) {
         _print_entry($e);
-        """
-        <!-- $e.itemid -->
-        """;
+        _journalpromo();
     }
+
     if (size $.entries > 0 and ($.nav.backward_url != "" or $.nav.forward_url != "" or ($p.view == "recent" and $*page_recent_items != 1) or ($p.view == "friends" and $*page_friends_items != 1))) {
 """
                 <ul class="page-nav">
@@ -4054,6 +4074,7 @@
     if ($.has_entries) {
         foreach var Entry e ($.entries) {
             _print_entry($e);
+            _journalpromo();
         }
     } else {
 """
@@ -4160,7 +4181,10 @@
         } else {
             $comments_count = "";
         }
+
         _print_entry($e);
+        _journalpromo();
+
         if ($.entry.comments.enabled) {
 """
                         <div id="$*text_comments_id" class="entry-wrap entry-comments entry-comments-s1">
@@ -4219,6 +4243,7 @@
     } else {
 
         _print_entry($e);
+        _journalpromo();
         
         if ($.entry.comments.enabled) {
 """

Modified: trunk/htdocs/stc/sup/s/style.css
===================================================================
--- trunk/htdocs/stc/sup/s/style.css	2012-10-01 14:26:29 UTC (rev 12712)
+++ trunk/htdocs/stc/sup/s/style.css	2012-10-01 15:22:43 UTC (rev 12713)
@@ -830,8 +830,8 @@
 
 /* LJSUP-13769 */
 .appwidget-journalpromo {
-    margin: 20px auto;
-    }
+	margin: 20px auto;
+	}
 
 
 

Modified: trunk/htdocs/stc/sup/s/x-3.css
===================================================================
--- trunk/htdocs/stc/sup/s/x-3.css	2012-10-01 14:26:29 UTC (rev 12712)
+++ trunk/htdocs/stc/sup/s/x-3.css	2012-10-01 15:22:43 UTC (rev 12713)
@@ -288,6 +288,13 @@
 
 
 
+/* LJSUP-13769 */
+.appwidget-journalpromo {
+	margin: 0 20px;
+	}
+
+
+
 /* tiny screens */
 @media all and (max-width: 1100px) {
 	HTML,

Modified: trunk/htdocs/stc/sup/s/x-5.css
===================================================================
--- trunk/htdocs/stc/sup/s/x-5.css	2012-10-01 14:26:29 UTC (rev 12712)
+++ trunk/htdocs/stc/sup/s/x-5.css	2012-10-01 15:22:43 UTC (rev 12713)
@@ -156,3 +156,10 @@
 .header .hr {
 	display:none;
 	}
+
+
+
+/* LJSUP-13769 */
+.appwidget-journalpromo {
+	margin: 0 0 45px;
+	}

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