kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2011-06-30 05:24 am
  • Add Memory
  • Share This Entry

[dw-free] New Style: Crisped by timeasmymeasure

[commit: http://hg.dwscoalition.org/dw-free/rev/8fd9d2c209ae]

http://bugs.dwscoalition.org/show_bug.cgi?id=3667

New style Crisped with default theme Fresh Cotton, by [personal profile] timeasmymeasure.

Patch and previews by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers.dat
  • bin/upgrading/s2layers/crisped/layout.s2
  • bin/upgrading/s2layers/crisped/themes.s2
  • cgi-bin/LJ/S2Theme.pm
  • cgi-bin/LJ/S2Theme/crisped.pm
  • htdocs/img/customize/previews/crisped/freshcotton.png
--------------------------------------------------------------------------------
diff -r c69aa69d0dca -r 8fd9d2c209ae bin/upgrading/s2layers.dat
--- a/bin/upgrading/s2layers.dat	Thu Jun 30 00:08:13 2011 -0500
+++ b/bin/upgrading/s2layers.dat	Thu Jun 30 00:24:37 2011 -0500
@@ -34,6 +34,9 @@
 core2base/layout         layout                      core2
 core2base/themes         theme+                      core2base/layout
 
+crisped/layout           layout(core2base/layout)    core2
+crisped/themes           theme+                      crisped/layout
+
 crossroads/layout        layout(core2base/layout)    core2
 crossroads/themes        theme+                      crossroads/layout
 
diff -r c69aa69d0dca -r 8fd9d2c209ae bin/upgrading/s2layers/crisped/layout.s2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/upgrading/s2layers/crisped/layout.s2	Thu Jun 30 00:24:37 2011 -0500
@@ -0,0 +1,760 @@
+layerinfo type = "layout";
+layerinfo name = "Crisped";
+layerinfo redist_uniq = "crisped/layout";
+layerinfo author_name = "timeasmymeasure";
+layerinfo author_email = "timeasmymeasure@gmail.com";
+layerinfo lang = "en";
+
+set layout_authors = [ {"name" => "timeasmymeasure", "type" => "user"} ];
+
+##===============================
+## Presentation
+##===============================
+
+set layout_type = "two-columns-left";
+set userpics_position = "right";
+set sidebar_width = "20em";
+set sidebar_width_doubled = "40em";
+
+##===============================
+## Colors
+##===============================
+
+propgroup colors_child {
+    property Color color_page_subtitle { des = "Page subtitle color"; }
+    property Color color_calendar_background { des = "Calendar background color"; }
+    property Color color_calendar_link { des = "Calendar link color"; }
+    property Color color_calendar_link_active { des = "Calendar active link color"; }
+    property Color color_calendar_link_hover { des = "Calendar hover link color"; }
+    property Color color_calendar_link_visited { des = "Calendar visited link color"; }
+    property Color color_calendar_text { des = "Calendar text color "; }
+}
+
+##===============================
+## Fonts
+##===============================
+
+set font_base = "Palatino Linotype, Book Antiqua, Georgia, Times New Roman";
+set font_fallback = "serif";
+set font_journal_title_size = "1.8";
+set font_journal_title_units = "em";
+set font_journal_subtitle_size = "1.55";
+set font_journal_subtitle_units = "em";
+set font_entry_title_size = "1.1";
+set font_entry_title_units = "em";
+set font_module_heading_size = "1.1";
+set font_module_heading_units = "em";
+
+##===============================
+## Stylesheet
+##===============================
+
+function print_stylesheet () {
+
+    var string userpic_css = "";
+
+    if($*userpics_position == "left") {
+        $userpic_css = """
+
+        .has-userpic .entry .userpic {
+            float: left;
+            margin: 5px 20px 20px 10px;
+            }
+
+        .has-userpic .comment .userpic {
+            display: block;
+            float: left;
+            margin: 5px 10px;
+            }
+
+        """;
+    }
+    elseif($*userpics_position == "right") {
+        $userpic_css = """
+
+        .has-userpic .entry .userpic {
+            float: right;
+            margin: 5px 10px 20px 20px;
+            }
+
+        .has-userpic .comment .userpic {
+            display: block;
+            float: right;
+            margin: 5px 10px;
+            }
+
+        """;
+    }
+
+"""
+
+/* Crisped */
+/* by timeasmymeasure*/
+
+/* Main
+***************************************************************************/
+
+* {
+    margin: 0;
+    padding: 0;
+    }
+
+body {
+    margin: 30px 0 0 0;
+    } 
+
+a, a:link, a:visited {
+    text-decoration: none;
+    }
+
+code, kbd, pre, tt, textarea {
+    font-family: monospace;
+    }
+
+input, textarea {
+    background-color: $*color_entry_background;
+    border: 1px solid $*color_entry_text;
+    color: $*color_entry_text;
+    }
+
+::-moz-selection {
+    background-color: $*color_calendar_background;
+    color: $*color_calendar_text;
+    }
+
+blockquote {
+    background-color: $*color_calendar_background;
+    color: $*color_calendar_text;
+    margin: 15px 15px 15px 70px;
+    padding: 10px;
+    width: 65%;
+    }
+
+ul {
+    margin: 5px 0 5px 15px;
+    list-style-position: inside;
+    list-style-type: square;
+    }
+
+ol {
+    margin: 5px 0 5px 15px;
+    list-style-position: inside;
+    list-style-type: decimal;
+    }
+
+span.poster {
+    padding: 5px;
+    }
+
+hr,
+.page-separator {
+    display: none;
+    }
+
+/* Page Containers
+***************************************************************************/
+
+#canvas {
+    margin: 0 auto;
+    width: 92%;
+    }
+
+#primary > .inner:first-child {
+    padding: 1em .5em;
+    }
+
+#secondary > .inner:first-child {
+    padding: .5em;
+    }
+
+.two-columns #secondary > .inner:first-child,
+.three-columns #secondary > .inner:first-child {
+    padding-top: 4em;
+    }
+
+#tertiary > .inner:first-child {
+    padding: .5em;
+    }
+
+.three-columns #tertiary > .inner:first-child {
+    padding-top: 4em;
+    }
+
+/* Header
+***************************************************************************/
+
+#header {
+    padding: 10px;
+    margin: 0 0 10px;
+    letter-spacing: -0.1em;
+    line-height: 120%;
+    }
+
+h1#title {
+    font-weight: lighter;
+    margin: 0;
+    padding: 0;
+    text-transform: uppercase;
+    }
+
+h2#subtitle,
+h2#pagetitle {
+    color: $*color_page_subtitle;
+    font-weight: lighter;
+    margin: 0;
+    padding: 0;
+    text-transform: lowercase;
+    }
+
+/* Navigation
+***************************************************************************/
+
+.navigation { 
+    margin: 5px 0; 
+    font-size: $*font_entry_title_size$*font_entry_title_units;
+    text-transform: uppercase;
+    }
+
+/* Entries
+***************************************************************************/
+
+.entry {
+    border-bottom-width: 2px;
+    border-left: none;
+    border-top: none;
+    margin-bottom: 15px;
+    padding-bottom: 10px;
+    }
+
+.entry .header {
+    background-color: $*color_entry_title_background;
+    color: $*color_entry_title;
+    margin-bottom: 5px;
+    padding: 5px 10px;
+    text-align: right;
+    }
+
+h3.entry-title {
+    font-weight: normal;
+    text-transform: uppercase;
+    }
+
+.datetime {
+    color: $*color_entry_link;
+    font-size: .75em;
+    text-transform: uppercase;
+    }
+
+.entry .userpic img {
+    background-color: $*color_entry_border;
+    padding: 10px;
+    }
+
+.entry-content {
+    margin-top: 10px;
+    padding: 15px;
+    }
+
+.metadata {
+    margin-top: 5px;
+    padding: 10px 15px 5px;
+    text-transform: uppercase;
+    }
+
+span.metadata-item-location,
+span.metadata-item-music,
+span.metadata-item-mood,
+div.tag ul {
+    color: $*color_entry_link;
+    text-align: right;
+    text-transform: uppercase;
+    }
+
+.tag {
+    margin: 5px 0;
+    padding: 15px;
+    text-transform: uppercase;
+    }
+
+span.tag-text {
+    text-transform: uppercase;
+    }
+
+.tag ul li {
+    font-weight: normal;
+    margin: 5px 5px 0 0;
+    text-align: right;
+    }
+
+.entry .footer {
+    clear: both;
+    }
+
+ul.entry-management-links {
+    margin-top: 5px;
+    text-align: center;
+    }
+
+ul.entry-management-links li {
+    display: inline;
+    margin: 0 auto;
+    text-align: center;
+    }
+
+ul.entry-interaction-links {
+    margin-top: 5px;
+    text-align: center;
+    }
+
+ul.entry-interaction-links li {
+    display: inline;
+    font-size: 1.05em;
+    margin-right: 5px;
+    text-transform: uppercase;
+    }
+
+/* Comments
+***************************************************************************/
+
+.comment-wrapper .comment {
+    background-color: $*color_entry_background;
+    border-right: 1px solid $*color_entry_border;
+    border-bottom: 2px solid $*color_entry_border;
+    color: $*color_entry_text;
+    padding-bottom: 10px;
+    margin-bottom: 15px;
+    }
+
+.comment .header {
+    background-color: $*color_comment_title_background;
+    color: $*color_comment_title;
+    padding: 5px 10px;
+    margin-bottom: 5px;
+    text-align: right;
+    }
+
+.partial .comment-title {
+    margin-bottom: 5px;
+    padding: 5px 10px;
+    text-align: right;
+    }
+
+.comment-poster {
+    text-transform: uppercase;
+    }
+
+.comment .userpic img {
+    background-color: $*color_entry_border;
+    padding: 10px;
+    }
+
+.comment-content {
+    margin-top: 10px;
+    padding: 15px;
+    }
+
+.comment .footer {
+    clear: both;
+    color: $*color_entry_text;
+    font-weight: bold;
+    padding: 0 10px;
+    text-align: left;
+    text-transform: uppercase;
+    }
+
+ul.comment-management-links {
+    text-align: left;
+    }
+
+.bottomcomment {
+    background-color: $*color_entry_background;
+    border-right: 1px solid $*color_entry_border;
+    border-bottom: 2px solid $*color_entry_border;
+    padding: 10px;
+    }
+
+#qrformdiv input {
+    margin: 1px;
+    }
+
+table.talkform {
+    background-color: $*color_entry_background;
+    border-right: 1px solid $*color_entry_border;
+    border-bottom: 2px solid $*color_entry_border;
+    color: $*color_entry_text;
+    margin-bottom: 10px;
+    padding: 10px;
+    width: 100%;
+    }
+
+table.talkform input {
+    margin: 1px;
+    }
+
+/* Archive Pages
+***************************************************************************/
+
+.month {
+    background-color: $*color_entry_background;
+    border-right: 1px solid $*color_entry_border;
+    border-bottom: 2px solid $*color_entry_border;
+    color: $*color_entry_text;
+    margin-bottom: 15px;
+    padding: 20px;
+    }
+
+.month table {
+    border: none;
+    margin: auto;
+    width: 100%;
+    }
+
+.month caption {
+    display: none;
+    }
+
+.month h3 {
+    color: $*color_entry_title;
+    font-size: $*font_entry_title_size$*font_entry_title_units;
+    font-weight: normal;
+    text-transform: uppercase;
+    }
+
+table.month th {
+    background-color: $*color_calendar_background;
+    border: 1px solid $*color_entry_border;
+    color: $*color_calendar_text;
+    margin: 0 2px;
+    padding: 5px 2px;
+    font-size: 1.05em;
+    font-weight: normal;
+    text-align: center;
+    text-transform: uppercase;
+    }
+
+table.month td {
+    border: none;
+    }
+
+table.month td.day {
+    border: 1px solid $*color_entry_border;
+    padding: 10px;
+    text-align: center;
+    }
+
+.month td.day-has-entries {
+    background-color: $*color_calendar_background;
+    color: $*color_calendar_text;
+    }
+
+.month td.day-has-entries p {
+    display: inline;
+    font-size: 1.05em;
+    font-weight: bold;
+    padding-left: 5px;
+    }
+
+.month td.day-has-entries p a {
+    color: $*color_calendar_link;
+    }
+
+.month td.day-has-entries p a:visited {
+    color: $*color_calendar_link_visited;
+    }
+
+.month td.day-has-entries p a:hover {
+    color: $*color_calendar_link_hover;
+    }
+
+.month td.day-has-entries p a:active {
+    color: $*color_calendar_link_active;
+    }
+
+/* Tags Page
+***************************************************************************/
+
+.page-tags .tags-container {
+    background-color: $*color_entry_background;
+    border-right: 1px solid $*color_entry_border;
+    border-bottom: 2px solid $*color_entry_border;
+    color: $*color_entry_text;
+    margin-bottom: 10px;
+    }
+
+.page-tags .tags-container h2 {
+    background-color: $*color_entry_title_background;
+    color: $*color_entry_title;
+    padding: 5px 10px;
+    font-size: $*font_entry_title_size$*font_entry_title_units;
+    font-weight: normal;
+    text-transform: uppercase;
+    }
+
+.page-tags .tags-container .ljtaglist {
+    padding: 10px;
+    }
+
+.page-tags .tags-container .manage-tags-link {
+    padding: 10px;
+    }
+
+/* Icons Page
+***************************************************************************/
+
+.page-icons .icons-container {
+    background-color: $*color_entry_background;
+    border-right: 1px solid $*color_entry_border;
+    border-bottom: 2px solid $*color_entry_border;
+    color: $*color_entry_text;
+    margin-bottom: 10px;
+    }
+
+.page-icons .icons-container h2 {
+    background-color: $*color_entry_title_background;
+    color: $*color_entry_title;
+    padding: 5px 10px;
+    font-size: $*font_entry_title_size$*font_entry_title_units;
+    font-weight: normal;
+    text-transform: uppercase;
+    }
+
+.page-icons .icons-container ul {
+    list-style: none;
+    margin-left: 0;
+    }
+
+.page-icons .icons-container li,
+.page-icons .icons-container .keywords ul {
+    display: inline;
+    }
+
+.page-icons .icons-container .inner {
+    padding: 15px;
+    }
+
+.page-icons .icons-container .icon {
+    margin-top: 10px;
+    }
+
+/* Modules
+***************************************************************************/
+
+.module {
+    border-bottom-width: 2px;
+    border-left: none;
+    border-top: none;
+    margin-bottom: 15px;
+    padding-bottom: 10px;
+    }
+
+h2.module-header {
+    background-color: $*color_module_title_background;
+    color: $*color_module_title;
+    font-weight: normal;
+    margin: 0 0 5px 0;
+    padding: 5px 10px;
+    text-align: right;
+    text-transform: uppercase;
+    }
+
+h2.module-header a {
+    color: $*color_module_title;
+    }
+
+.module-content {
+    margin-top: 10px;
+    padding: 15px;
+    }
+
+ul.module-list,
+ul.module-list-item {
+    list-style: none;
+    }
+
+ul.module-list li,
+ul.module-list-item li {
+    padding: 0 0 0 5px;
+    }
+
+.module-content .userpic {
+    text-align: center;
+    }
+
+.module-content .userpic img {
+    background-color: $*color_module_border;
+    padding: 10px;
+    }
+
+.journal-name {
+    margin-top: 5px;
+    text-align: center;
+    text-transform: uppercase;
+    }
+
+.journal-website-name {
+    text-align: center;
+    text-transform: uppercase;
+    }
+
+ul.userlite-interaction-links {
+    margin: 5px 0 0;
+    list-style: none;
+    text-align: center;
+    }
+
+ul.userlite-interaction-links.icon-links li {
+    display: inline;
+    margin: 0 auto;
+    text-align: center;
+    }
+
+.module-navlinks {
+    font-size: 1.35em;
+    text-align: right;
+    letter-spacing: -0.1em;
+    list-style: none;
+    }
+
+.module-navlinks ul.module-list {
+    text-transform: uppercase;
+    }
+
+.manage-link,
+.manage-tags-link {
+    margin-top: 10px;
+    text-align: right;
+    text-transform: uppercase;
+    }
+
+.module-calendar table {
+    margin: 0 auto;
+    text-align: center;
+    }
+
+.module-calendar th {
+    background-color: $*color_calendar_background;
+    border: 1px solid $*color_module_border;
+    color: $*color_calendar_text;
+    margin: 0 2px;
+    padding: 3px 8px;
+    text-transform: uppercase;
+    }
+
+.module-calendar td.empty-day {
+    border: 1px solid $*color_module_border;
+    margin: 0 2px;
+    text-transform: uppercase;
+    }
+
+.module-calendar td.entry-day {
+    background-color: $*color_calendar_background;
+    border: 1px solid $*color_module_border;
+    color: $*color_calendar_text;
+    margin: 0 1px;
+    text-transform: uppercase;
+    }
+
+.module-calendar td.entry-day a {
+    color: $*color_calendar_link;
+    }
+
+.module-calendar td.entry-day a:visited {
+    color: $*color_calendar_link_visited;
+    }
+
+.module-calendar td.entry-day a:hover {
+    color: $*color_calendar_link_hover;
+    }
+
+.module-calendar td.entry-day a:active {
+    color: $*color_calendar_link_active;
+    }
+
+.module-search .search-box {
+    padding: .05em;
+    }
+
+.module-search .search-button {
+    margin-left: 1px;
+    }
+
+/* Contextual Pop-ups
+***************************************************************************/
+
+div.ContextualPopup {
+    text-transform: uppercase;
+    }
+
+div.ContextualPopup div.Inner {
+    background-color: $*color_entry_background;
+    color: $*color_entry_text;
+    border: 1px solid $*color_entry_title;
+    }
+
+div.ContextualPopup .Userpic {
+    background-color: $*color_entry_border;
+    margin: 5px;
+    padding: 5px;
+    }
+
+div.ContextualPopup .Content {
+    background-color: $*color_entry_background;
+    color: $*color_entry_text;
+    border: none;
+    margin: auto;
+    }
+
+div.ContextualPopup div.Inner a,
+div.ContextualPopup div.Inner a:visited,
+div.ContextualPopup div.Inner a:link {
+    color: $*color_entry_link;
+    text-decoration: none;
+    }
+
+div.ContextualPopup .Relation {
+    color: $*color_entry_text;
+    text-transform: uppercase;
+    }
+
+/* Navigation Strip
+***************************************************************************/
+
+#lj_controlstrip td {
+    background-color: $*color_entry_background;
+    border: 1px solid $*color_entry_border;
+    color: $*color_entry_text;
+    text-transform: uppercase;
+    }
+
+#lj_controlstrip_statustext{
+    color: $*color_entry_text;
+    }
+
+#lj_controlstrip input {
+    background-color: $*color_entry_background;
+    border: 1px solid $*color_entry_text;
+    color: $*color_entry_text;
+    padding: 0 5px;
+    text-transform: uppercase;
+    }
+
+#lj_controlstrip a {
+    color: $*color_entry_link;
+    }
+
+#lj_controlstrip a:visited {
+    color: $*color_entry_link_visited ;
+    }
+
+#lj_controlstrip a:hover {
+    color: $*color_entry_link_hover;
+    }
+
+#lj_controlstrip a:active {
+    color: $*color_entry_link_active;
+    }
+
+$userpic_css
+
+""";
+}
diff -r c69aa69d0dca -r 8fd9d2c209ae bin/upgrading/s2layers/crisped/themes.s2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/upgrading/s2layers/crisped/themes.s2	Thu Jun 30 00:24:37 2011 -0500
@@ -0,0 +1,50 @@
+#NEWLAYER: crisped/freshcotton
+layerinfo type = "theme";
+layerinfo name = "Fresh Cotton";
+layerinfo redist_uniq = "crisped/freshcotton";
+layerinfo author_name = "timeasmymeasure";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#ededed";
+set color_page_link = "#7B98C1";
+set color_page_link_active = "#7B98C1";
+set color_page_link_hover = "#757575";
+set color_page_link_visited = "#7B98C1";
+set color_page_text = "#5f5f5f";
+set color_page_title = "#7B98C1";
+set color_page_subtitle = "#757575";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_border = "#dcdcdc";
+set color_entry_link = "#7B98C1";
+set color_entry_link_active = "#7B98C1";
+set color_entry_link_hover = "#757575";
+set color_entry_link_visited = "#7B98C1";
+set color_entry_text = "#5f5f5f";
+set color_entry_title = "#757575";
+set color_entry_title_background = "#dcdcdc";
+set color_entry_interaction_links = "#757575";
+set color_comment_title = "#757575";
+set color_comment_title_background = "#dcdcdc";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#fff";
+set color_module_border = "#dcdcdc";
+set color_module_link = "#7B98C1";
+set color_module_link_active = "#7B98C1";
+set color_module_link_hover = "#757575";
+set color_module_link_visited = "#7B98C1";
+set color_module_title = "#757575";
+set color_module_title_background = "#dcdcdc";
+set color_calendar_background = "#ededed";
+set color_calendar_text = "#757575";
diff -r c69aa69d0dca -r 8fd9d2c209ae cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Thu Jun 30 00:08:13 2011 -0500
+++ b/cgi-bin/LJ/S2Theme.pm	Thu Jun 30 00:24:37 2011 -0500
@@ -41,6 +41,7 @@
         brittle => 'brittle/rust',
         compartmentalize => 'compartmentalize/poppyfields',
         core2base => 'core2base/testing',
+        crisped => 'crisped/freshcotton',
         crossroads => 'crossroads/lettuce',
         drifting => 'drifting/blue',
         dustyfoot => 'dustyfoot/dreamer',
diff -r c69aa69d0dca -r 8fd9d2c209ae cgi-bin/LJ/S2Theme/crisped.pm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cgi-bin/LJ/S2Theme/crisped.pm	Thu Jun 30 00:24:37 2011 -0500
@@ -0,0 +1,14 @@
+package LJ::S2Theme::crisped;
+use base qw( LJ::S2Theme );
+use strict;
+
+sub layouts { ( "1" => "one-column", "2l" => "two-columns-left", "2r" => "two-columns-right", "3" => "three-columns-sides", "3r" => "three-columns-right", "3l" => "three-columns-left" ) }
+sub layout_prop { "layout_type" }
+
+sub header_props {
+    my $self = shift;
+    my @props = qw( color_page_subtitle );
+    return $self->_append_props( "header_props", @props );
+}
+
+1;
diff -r c69aa69d0dca -r 8fd9d2c209ae htdocs/img/customize/previews/crisped/freshcotton.png
Binary file htdocs/img/customize/previews/crisped/freshcotton.png has changed
--------------------------------------------------------------------------------