Максим Червонный (fiskus_boulder) wrote in changelog,
Максим Червонный
fiskus_boulder
changelog

[ljcom] r10814: LJSUP-9204: New S2 style, Spring Daze

Committer: mchervonniy
LJSUP-9204: New S2 style, Spring Daze
U   trunk/bin/upgrading/s2layers/sup/themes.s2
U   trunk/cgi-bin/LJ/S2Theme/sup.pm
A   trunk/htdocs/stc/sup/s/spring-daze.css
A   trunk/htdocs/stc/sup/s/spring-daze.ie.css
Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2011-08-09 03:41:09 UTC (rev 10813)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2011-08-09 04:13:28 UTC (rev 10814)
@@ -884,3 +884,30 @@
     """</div><div class="hr"><hr /></div>""";
 }
 
+#NEWLAYER: sup/spring-daze
+layerinfo "type" = "theme";
+layerinfo "name" = "Spring Daze";
+layerinfo "redist_uniq" = "sup/spring-daze";
+set theme_css = "spring-daze.css";
+set layout_type = "2CR";
+set active_theme = "x3";
+set friends_show_date = true;
+set theme_designer = "Kristen_L";
+set text_read_comments = "1 // #";
+
+function _print_CSS {
+    var Page p = get_page();
+    
+    if ($*use_stylesheets) {
+        $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/style.css"]);
+        $p->need_res({"args" => "media=\"print\"" }, ["stc/sup/s/print.css"]);
+        
+        if ($*use_theme_stylesheet) {
+            if ($*theme_css) {
+                $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/$*theme_css"]);
+                # $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/$*theme_css.ie.css"]);
+                $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/spring-daze.ie.css"]);
+            }
+        }
+    }
+}

Modified: trunk/cgi-bin/LJ/S2Theme/sup.pm
===================================================================
--- trunk/cgi-bin/LJ/S2Theme/sup.pm	2011-08-09 03:41:09 UTC (rev 10813)
+++ trunk/cgi-bin/LJ/S2Theme/sup.pm	2011-08-09 04:13:28 UTC (rev 10814)
@@ -137,7 +137,12 @@
 
 package LJ::S2Theme::sup::ipad;
 use base qw(LJ::S2Theme::sup);
-sub cats { qw( premium ipad ) }
+sub cats { qw( sup premium ipad ) }
 sub designer { "mars" }
 
+package LJ::S2Theme::sup::spring_daze;
+use base qw(LJ::S2Theme::sup);
+sub cats { qw( sup spring daze minimalism cute natural ) }
+sub designer { "Kristen L" }
+
 1;

Added: trunk/htdocs/stc/sup/s/spring-daze.css
===================================================================
--- trunk/htdocs/stc/sup/s/spring-daze.css	                        (rev 0)
+++ trunk/htdocs/stc/sup/s/spring-daze.css	2011-08-09 04:13:28 UTC (rev 10814)
@@ -0,0 +1,319 @@
+BODY {
+	font:62.5%/150% "Trebuchet MS", Arial, sans-serif;
+	}
+#page {
+	background:#F7F0E3 url(http://wh.livejournal.ru/s2/spring-daze/bg.png) no-repeat 0 0;
+	color:#80A000;
+	}
+A {
+	color:#00A8C6;
+	text-decoration:underline;
+	}
+A:hover {
+	text-decoration:none;
+	}
+
+.header {
+	padding:25px 0 0 100px;
+	overflow:hidden;
+	background:url(http://wh.livejournal.ru/s2/spring-daze/header.png) no-repeat 38% 41px;
+	}
+.header H1 {
+	text-align:right;
+	text-transform:uppercase;
+	margin:0 110px 0 0;
+	font-size:1em;
+	}
+.header H2 {
+	padding:0 340px 0 0;
+	color:#00A8C6;
+	font-size:4.4em;
+	line-height:80%;
+	text-align:right;
+	font-weight:normal;
+	}
+.header H3 {
+	padding:0 340px 0 0;
+	font:2.4em/100% Georgia, serif;
+	color:#94B5B9;
+	text-align:right;
+	}
+.header .userpic {
+	float:right;
+	background-color:#E4F2C3;
+	}
+.header .nav {
+	text-align:right;
+	float:right;
+	width:230px;
+	margin:0 10px 0 0;
+	}
+.header .item {
+	padding:0 0 .5em;
+	display:list-item;
+	list-style:none;
+	font-size:1em;
+	text-transform:uppercase;
+	}
+.header .item-rss A {
+	padding-right:0;
+	}
+.header .item,
+.header .item A {
+	line-height:1.2em;
+	}
+.header .item-selected A {
+	color:#80A000;
+	font-size:1.2em;
+	text-decoration:none;
+	}
+
+.layout {
+	padding:0 20px 0 25px;
+	}
+
+.entry-title {
+	font-size:2.4em;
+	color:#00A8C6;
+	margin:12px 0;
+	padding:0 150px 0 0;
+	}
+.entry-title A {
+	text-decoration:none;
+	}
+.entry-title A:hover {
+	text-decoration:underline;
+	}
+.entry-linkbar {
+	text-align:center;
+	}
+.content .entry .entry-text {
+	padding-top:0;
+	}
+.view-archive .entry-text {
+	overflow:hidden;
+	}
+.entry-text .vcard {
+	float:right;
+	}
+.entry-text .vcard DT,
+.entry-text .vcard .username {
+	display:none;
+	}
+.entry-text .entry-date {
+	font:1.2em Georgia,serif;
+	color:#719AA0;
+	margin:-1em 0 0;
+	margin:-0.5em 0 0;
+	position:relative;
+	}
+.entry-text .entry-date ABBR {
+	border:none;
+	}
+.entry-content {
+	font-size:1em;
+	line-height:1.5em;
+	}
+.ljtags {
+	color:#67949B;
+	margin:20px 0 0;
+	}
+.entrymenu {
+	float:left;
+	}
+.content .entry .entrymenu {
+	padding:0;
+	}
+.entrysubmenu,
+.entrymenu {
+	/*margin:14px 0;*/
+	}
+.content .entry .entrysubmenu LI,
+.content .entry .entrymenu LI {
+	display:inline-block;
+	vertical-align:middle;
+	font-size:1.2em;
+	line-height:1.5em;
+	margin:0 14px 0 0;
+	padding:14px 2px 12px 0;
+	text-align:center;
+	}
+.content .entry .entrysubmenu .comments,
+.content .entry .entrymenu .comments {
+	width:38px;
+	background:url(http://wh.livejournal.ru/s2/spring-daze/comments.png) no-repeat 0 0;
+	}
+#page .btn SPAN SPAN SPAN {
+	margin:0;
+	line-height:1.5em;
+	}
+
+.content-inner .hr {
+	background:url(http://wh.livejournal.ru/s2/spring-daze/hr.png);
+	height:32px;
+	margin:20px 0;
+	}
+.hr HR {
+	display:none;
+	}
+
+/* sidebar at right */
+.column-right .content,
+.l-type-2CR .content {
+	float:right;
+	margin-left:-100%;
+	margin-right:0;
+	width:100%;
+	}
+.column-right .content-inner,
+.l-type-2CR .content-inner {
+	position:relative;
+	overflow:hidden;
+	margin-left:0;
+	margin-right:340px;
+	}
+.column-right .sidebar,
+.l-type-2CR .sidebar {
+	float:right;
+	width:100%;
+	}
+.column-right .sidebar-inner,
+.l-type-2CR .sidebar-inner {
+	position:relative;
+	float:right;
+	overflow:hidden;
+	width:300px;
+	}
+
+/* sidebar at left */
+.column-left .content,
+.l-type-2CL .content {
+	float:left;
+	margin-right:-100%;
+	margin-left:0;
+	width:100%;
+	}
+.column-left .content-inner,
+.l-type-2CL .content-inner {
+	position:relative;
+	overflow:hidden;
+	margin-right:0;
+	margin-left:340px;
+	}
+.column-left .sidebar,
+.l-type-2CL .sidebar {
+	float:left;
+	width:100%;
+	}
+.column-left .sidebar-inner,
+.l-type-2CL .sidebar-inner {
+	position:relative;
+	float:left;
+	overflow:hidden;
+	width:300px;
+	}
+
+.content-inner {
+	margin-top:20px;
+	}
+/*
+ * don't forget about weight of CSS rules
+.calendar-wrap TABLE TBODY TD SPAN {
+*/
+.sidebar-cal DT {
+	display:none;
+	}
+.view-archive .content .entry .entry-text,
+.sidebar .calendar-wrap {
+	font-size:1em;
+	}
+.calendar-wrap {
+	height:30em;
+	width:300px;
+	}
+.calendar-wrap CAPTION,
+.sbar-cal-nav {
+	font-size:1.9em;
+	padding:0 0 10px 0;
+	}
+.calendar-wrap CAPTION A,
+.sbar-cal-nav A {
+	text-decoration:none;
+	margin:0 5px 0 0;
+	line-height:1.2em;
+	}
+.sbar-cal-nav A:hover {
+	text-decoration:underline;
+	}
+#page .calendar-wrap TABLE {
+	border-collapse:collapse;
+	width:100%;
+	text-align:center;
+	}
+#page .calendar-wrap TABLE THEAD TH {
+	background-color:#C1D88C;
+	color:#FFF;
+	font-size:1.4em;
+	font-weight:bold;
+	border:1px solid #FFF;
+	border-width:0 1px;
+	padding:8px 0;
+	font-variant:small-caps;
+	}
+#page .calendar-wrap TABLE TBODY TD {
+	font-size:1.8em;
+	color:#7AA0A5;
+	font-weight:normal;
+	}
+#page .calendar-wrap TABLE TBODY TD A {
+	display:block;
+	text-align:center;
+	background-color:#E4F2C3;
+	text-decoration:none;
+	padding:12px 0;
+	margin:-12px 0;
+	}
+#page .calendar-wrap TABLE TBODY TD SPAN {
+	display:block;
+	text-align:center;
+	padding:12px 0;
+	}
+#page .calendar-wrap TABLE TBODY TD SPAN SPAN {
+	display:inline;
+	padding:0;
+	}
+.sidebar-block {
+	margin:0 0 20px;
+	}
+.sidebar-block DT {
+	color:#90B31E;
+	font:1.5em/1.8em Georgia,serif;
+	}
+.sidebar-summary DD,
+.sidebar-links DD {
+	font-size:1em;
+	}
+.sidebar-powered DD {
+	color:#7aa0a4;
+	}
+.sidebar-block LI {
+	list-style-position:inside;
+	list-style-type:disc;
+	font-size:1.4em;
+	line-height:1.5em;
+	color:#719AA0;
+	}
+.sidebar-tags DD {
+	font-size:1.2em;
+	}
+.sidebar-tags .comma {
+	display:none;
+	}
+.sidebar-tags .tags {
+	text-align:left;
+	}
+.sidebar-powered {
+	text-align:left;
+	color:#719AA0;
+	}
+

Added: trunk/htdocs/stc/sup/s/spring-daze.ie.css
===================================================================
--- trunk/htdocs/stc/sup/s/spring-daze.ie.css	                        (rev 0)
+++ trunk/htdocs/stc/sup/s/spring-daze.ie.css	2011-08-09 04:13:28 UTC (rev 10814)
@@ -0,0 +1,7 @@
+.content .entry .entrysubmenu LI,
+.content .entry .entrymenu LI {
+	*display:inline;
+	*zoom:1;
+	}
+
+

Tags: css, fiskus_boulder, ljcom, pm, s2
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