1.1 --- a/bin/upgrading/s2layers/sundaymorning/layout.s2	Mon Jan 23 11:27:38 2012 +0800
     1.2 +++ b/bin/upgrading/s2layers/sundaymorning/layout.s2	Fri Jan 27 13:27:07 2012 +0800
     1.3 @@ -283,7 +283,7 @@
     1.4      var string page_link_hover_colors = generate_color_css( $*color_page_link_hover, new Color, new Color );
     1.5      var string page_link_visited_colors = generate_color_css( $*color_page_link_visited, new Color, new Color );
     1.6  
     1.7 -    var string page_content_title_colors = generate_color_css( $*color_entry_title, $*color_entry_background, $*color_entry_border );
     1.8 +    var string page_content_title_colors = generate_color_css( $*color_entry_text, $*color_entry_background, $*color_entry_border );
     1.9  
    1.10      var string container_background = generate_background_css( $*image_background_page_url, $*image_background_page_repeat, $image_background_page_position, new Color );
    1.11  
    1.12 @@ -871,28 +871,6 @@
    1.13      padding-left: 1px;
    1.14  }
    1.15  
    1.16 -.tags-container {
    1.17 -    $entry_colors
    1.18 -    padding: 10px;
    1.19 -}
    1.20 -
    1.21 -.tags-container h2 {
    1.22 -    padding: .2em;
    1.23 -    margin: 0 10px 20px 0;
    1.24 -    font-size: 1.2em;
    1.25 -    $page_content_title_colors
    1.26 -}
    1.27 -
    1.28 -.tags-container ul {
    1.29 -    margin: 10px;
    1.30 -    padding: 0;
    1.31 -    text-align: left;
    1.32 -}
    1.33 -.tags-container li {
    1.34 -    margin-left: 10px;
    1.35 -    padding: 0;
    1.36 -}
    1.37 -
    1.38  .manage-link {
    1.39      text-align: center;
    1.40      font-size: .7em;
    1.41 @@ -961,6 +939,111 @@
    1.42      padding-left: 5px;
    1.43  }
    1.44  
    1.45 +/*--- Tags Page ---*/
    1.46 +
    1.47 +.tags-container {
    1.48 +    $entry_colors
    1.49 +    padding: 10px;
    1.50 +}
    1.51 +
    1.52 +.tags-container h2 {
    1.53 +    $page_content_title_colors
    1.54 +    font-size: 1.2em;
    1.55 +    margin: 0 10px 20px 0;
    1.56 +    padding: .2em;
    1.57 +}
    1.58 +
    1.59 +.tags-container ul {
    1.60 +    margin: 10px;
    1.61 +    padding: 0;
    1.62 +    text-align: left;
    1.63 +}
    1.64 +.tags-container li {
    1.65 +    margin-left: 10px;
    1.66 +    padding: 0;
    1.67 +}
    1.68 +
    1.69 +/*--- Icons Page ---*/
    1.70 +
    1.71 +.icons-container {
    1.72 +    $entry_colors
    1.73 +    padding: 10px;
    1.74 +    }
    1.75 +
    1.76 +.icons-container a {
    1.77 +    color: $*color_entry_link;
    1.78 +    }
    1.79 +
    1.80 +.icons-container a;visited {
    1.81 +    color: $*color_entry_link_visited;
    1.82 +    }
    1.83 +
    1.84 +.icons-container a:hover {
    1.85 +    color: $*color_entry_link_hover;
    1.86 +    }
    1.87 +
    1.88 +.icons-container a:active {
    1.89 +    color: $*color_entry_link_active;
    1.90 +    }
    1.91 +
    1.92 +.icons-container h2 {
    1.93 +    $page_content_title_colors
    1.94 +    font-size: 1.2em;
    1.95 +    margin: 0 10px 20px 0;
    1.96 +    padding: .2em;
    1.97 +    }
    1.98 +
    1.99 +.sorting-options ul {
   1.100 +    padding-left: 0;
   1.101 +    }
   1.102 +
   1.103 +.sorting-options ul li {
   1.104 +    display: inline;
   1.105 +    list-style: none;
   1.106 +    }
   1.107 +
   1.108 +.page-icons .comment {
   1.109 +    background: transparent;
   1.110 +    border: none;
   1.111 +    margin: 0;
   1.112 +    padding: 0;
   1.113 +    }
   1.114 +
   1.115 +.page-icons .icon {
   1.116 +    margin: 1em 0;
   1.117 +    }
   1.118 +
   1.119 +.icon-image {
   1.120 +    float: left;
   1.121 +    clear: left;
   1.122 +    margin-bottom: .25em;
   1.123 +    min-width: 100px;
   1.124 +    padding-right: 1em;
   1.125 +    }
   1.126 +
   1.127 +.icon-info {
   1.128 +    min-height: 100px;
   1.129 +    }
   1.130 +
   1.131 +.icon-info span {
   1.132 +    font-weight: bold;
   1.133 +    }
   1.134 +
   1.135 +.icon-info .default {
   1.136 +    text-decoration: underline;
   1.137 +    }
   1.138 +
   1.139 +.icon-info .keywords ul {
   1.140 +    display: inline;
   1.141 +    padding-left: 0;
   1.142 +    }
   1.143 +
   1.144 +.icon-info .keywords ul li {
   1.145 +    display: inline;
   1.146 +    list-style: none;
   1.147 +    padding: 0;
   1.148 +    }
   1.149 +
   1.150  #commenttext {
   1.151      width: 95%;
   1.152  }

     2.1 --- a/bin/upgrading/s2layers/transmogrified/layout.s2	Mon Jan 23 11:27:38 2012 +0800
     2.2 +++ b/bin/upgrading/s2layers/transmogrified/layout.s2	Fri Jan 27 13:27:07 2012 +0800
     2.3 @@ -107,11 +107,13 @@
     2.4      property Color color_navigation_text { des = "Page back/forwards text"; }
     2.5      property Color color_navigation_border { des = "Page back/forwards border"; }
     2.6  
     2.7 -    property Color color_tagspage_background { des = "Tags page background"; }
     2.8 -    property Color color_tagspage_border { des = "Tags page border"; }
     2.9 -    property Color color_tagspage_title { des = "Tags page title text"; }
    2.10 -    property Color color_tagspage_title_border { des = "Tags page title border"; }
    2.11 -    property Color color_tagspage_title_background { des = "Tags page title background"; }
    2.12 +    ### Also used for the custom Icons page; implemented later hence the inaccurate name.
    2.13 +    property Color color_tagspage_background { des = "Tags and Icons page background"; }
    2.14 +    property Color color_tagspage_border { des = "Tags and Iconspage border"; }
    2.15 +    property Color color_tagspage_title { des = "Tags and Icons page title text"; }
    2.16 +    property Color color_tagspage_title_border { des = "Tags and Icons page title border"; }
    2.17 +    property Color color_tagspage_title_background { des = "Tags and Icons page title background"; }
    2.18 +
    2.19  }
    2.20  
    2.21  propgroup images {
    2.22 @@ -432,16 +434,6 @@
    2.23          z-index: 20;
    2.24       }
    2.25  
    2.26 -    .tags-container {
    2.27 -        background-color: $*color_tagspage_background;
    2.28 -       border: 1px solid $*color_tagspage_border;
    2.29 -        padding: 10px;
    2.30 -        margin-top: 10px;
    2.31 -    }
    2.32 -
    2.33 -    .page-tags #wrap {
    2.34 -        margin-$sidebar_position_alt: 20px;
    2.35 -    }
    2.36      .module {
    2.37          $module_background
    2.38      }
    2.39 @@ -924,20 +916,6 @@
    2.40          display: block;
    2.41          }
    2.42  
    2.43 -    .page-tags #content h2 {
    2.44 -        padding: 0.2em;
    2.45 -        margin: 0;
    2.46 -        border: solid 1px $*color_tagspage_title_border;
    2.47 -        color: $*color_tagspage_title;
    2.48 -        background-color: $*color_tagspage_title_background;
    2.49 -        font-size: 1.2em;
    2.50 -        margin-bottom: 20px;
    2.51 -    }
    2.52 -
    2.53 -    .page-tags #content h2 {
    2.54 -        margin-right: 10px;
    2.55 -    }
    2.56 -
    2.57      .month-wrapper, #archive-month dl {
    2.58          padding: 10px;
    2.59          position: relative;
    2.60 @@ -1005,6 +983,100 @@
    2.61          padding-left: 5px;
    2.62      }
    2.63  
    2.64 +    /*--- Tags Page ---*/
    2.65 +
    2.66 +    .page-tags #wrap {
    2.67 +        margin-$sidebar_position_alt: 20px;
    2.68 +        }
    2.69 +
    2.70 +    .tags-container {
    2.71 +        background-color: $*color_tagspage_background;
    2.72 +        border: 1px solid $*color_tagspage_border;
    2.73 +        margin-top: 10px;
    2.74 +        padding: 10px;
    2.75 +        }
    2.76 +
    2.77 +    .tags-container h2 {
    2.78 +        background-color: $*color_tagspage_title_background;
    2.79 +        border: solid 1px $*color_tagspage_title_border;
    2.80 +        color: $*color_tagspage_title;
    2.81 +        font-size: 1.2em;
    2.82 +        margin: 0 0 20px;
    2.83 +        padding: .2em;
    2.84 +        }
    2.85 +
    2.86 +    /*--- Icons Page ---*/
    2.87 +
    2.88 +    .page-icons #wrap {
    2.89 +        margin-$sidebar_position_alt: 20px;
    2.90 +        }
    2.91 +
    2.92 +    .icons-container {
    2.93 +        background-color: $*color_tagspage_background;
    2.94 +        border: 1px solid $*color_tagspage_border;
    2.95 +        margin-top: 10px;
    2.96 +        padding: 10px;
    2.97 +        }
    2.98 +
    2.99 +    .icons-container h2 {
   2.100 +        background-color: $*color_tagspage_title_background;
   2.101 +        border: solid 1px $*color_tagspage_title_border;
   2.102 +        color: $*color_tagspage_title;
   2.103 +        font-size: 1.2em;
   2.104 +        margin: 0 0 20px;
   2.105 +        padding: .2em;
   2.106 +        }
   2.107 +
   2.108 +    .sorting-options ul {
   2.109 +        padding-left: 0;
   2.110 +        text-align: center;
   2.111 +        }
   2.112 +
   2.113 +    .sorting-options ul li {
   2.114 +        display: inline;
   2.115 +        list-style: none;
   2.116 +        }
   2.117 +
   2.118 +    .page-icons .comment {
   2.119 +        margin: 0;
   2.120 +        padding: 0;
   2.121 +        }
   2.122 +
   2.123 +    .page-icons .icon {
   2.124 +        margin: 1em 0;
   2.125 +        }
   2.126 +
   2.127 +    .icon-image {
   2.128 +        float: left;
   2.129 +        clear: left;
   2.130 +        margin-bottom: .25em;
   2.131 +        min-width: 100px;
   2.132 +        padding-right: 1em;
   2.133 +        }
   2.134 +
   2.135 +    .icon-info {
   2.136 +        min-height: 100px;
   2.137 +        }
   2.138 +
   2.139 +    .icon-info span {
   2.140 +        font-weight: bold;
   2.141 +        }
   2.142 +
   2.143 +    .icon-info .default {
   2.144 +        text-decoration: underline;
   2.145 +        }
   2.146 +
   2.147 +    .icon-info .keywords ul {
   2.148 +        display: inline;
   2.149 +        padding-left: 0;
   2.150 +        }
   2.151 +
   2.152 +    .icon-info .keywords ul li {
   2.153 +        display: inline;
   2.154 +        list-style: none;
   2.155 +        padding: 0;
   2.156 +        }
   2.157 +
   2.158      #commenttext {
   2.159          width: 95%;
   2.160      }

     3.1 --- a/bin/upgrading/s2layers/transmogrified/themes.s2	Mon Jan 23 11:27:38 2012 +0800
     3.2 +++ b/bin/upgrading/s2layers/transmogrified/themes.s2	Fri Jan 27 13:27:07 2012 +0800
     3.3 @@ -1502,29 +1502,33 @@
     3.4  
     3.5      .navigation a,
     3.6      .month a,
     3.7 -    .day  .entry a,
     3.8 -    .page-tags .tags-container a {
     3.9 +    .day .entry a,
    3.10 +    .page-tags .tags-container a,
    3.11 +    .page-icons .icons-container a {
    3.12          color: $*color_entry_link;
    3.13          }
    3.14  
    3.15      .navigation a:visited,
    3.16      .month a:visited,
    3.17      .day .entry a:visited,
    3.18 -    .page-tags .tags-container a:visited {
    3.19 +    .page-tags .tags-container a:visited,
    3.20 +    .page-icons .icons-container a:visited {
    3.21          color: $*color_entry_link_visited;
    3.22          }
    3.23  
    3.24      .navigation a:hover,
    3.25      .month a:hover,
    3.26      .day .entry a:hover,
    3.27 -    .page-tags .tags-container a:hover {
    3.28 +    .page-tags .tags-container a:hover,
    3.29 +    .page-icons .icons-container a:hover {
    3.30          color: $*color_entry_link_hover;
    3.31          }
    3.32  
    3.33      .navigation a:active,
    3.34      .month a:active,
    3.35      .day .entry a:active,
    3.36 -    .page-tags .tags-container a:active {
    3.37 +    .page-tags .tags-container a:active,
    3.38 +    .page-icons .icons-container a:active {
    3.39          color: $*color_entry_link_active;
    3.40          }
    3.41      """;
    3.42 @@ -2479,15 +2483,10 @@
    3.43  
    3.44      .entry .userpic img, .comment .userpic img {
    3.45          box-shadow: 4px 5px 5px #94978B;
    3.46 -        -o-box-shadow: 4px 5px 5px #94978B;
    3.47 -        -moz-box-shadow: 4px 5px 5px #94978B;
    3.48 -        -webkit-box-shadow: 4px 5px 5px #94978B;
    3.49          }
    3.50  
    3.51      .entry, .comment {
    3.52          border-radius: 8px;
    3.53 -        -moz-border-radius: 8px;
    3.54 -        -webkit-border-radius: 8px;
    3.55          }
    3.56  
    3.57      .entry-wrapper-odd .entry, .comment-wrapper-odd .comment, .text_noentries_day,
    3.58 @@ -2507,14 +2506,10 @@
    3.59  
    3.60      .month-wrapper {
    3.61          border-radius: 8px;
    3.62 -        -moz-border-radius: 8px;
    3.63 -        -webkit-border-radius: 8px;
    3.64          }
    3.65  
    3.66      .month .inner dl {
    3.67          border-radius: 8px;
    3.68 -        -moz-border-radius: 8px;
    3.69 -        -webkit-border-radius: 8px;
    3.70          padding: 10px;
    3.71          }
    3.72  
    3.73 @@ -2540,23 +2535,25 @@
    3.74          font-weight: bold;
    3.75          }
    3.76  
    3.77 -    .page-tags #content h2 {
    3.78 +    .tags-container,
    3.79 +    .icons-container {
    3.80 +        border-radius: 8px;
    3.81 +        }
    3.82 +
    3.83 +    .tags-container h2,
    3.84 +    .icons-container h2 {
    3.85          border-left: solid 1px $*color_tagspage_title_border;
    3.86          border-top: solid 1px $*color_tagspage_title_border;
    3.87          border-right: solid 3px $*color_tagspage_title_border;
    3.88          border-bottom: solid 3px $*color_tagspage_title_border;
    3.89          }
    3.90  
    3.91 -    .tags-container {
    3.92 +    .page-icons .comment {
    3.93          border-radius: 8px;
    3.94 -        -moz-border-radius: 8px;
    3.95 -        -webkit-border-radius: 8px;
    3.96          }
    3.97  
    3.98      .module-header {
    3.99          border-radius: 8px;
   3.100 -        -moz-border-radius: 8px;
   3.101 -        -webkit-border-radius: 8px;
   3.102          }
   3.103  
   3.104      .module-section-two h2 {
   3.105 @@ -3234,15 +3231,10 @@
   3.106  
   3.107      .entry .userpic img, .comment .userpic img {
   3.108          box-shadow: 4px 5px 5px #94978B;
   3.109 -        -o-box-shadow: 4px 5px 5px #94978B;
   3.110 -        -moz-box-shadow: 4px 5px 5px #94978B;
   3.111 -        -webkit-box-shadow: 4px 5px 5px #94978B;
   3.112          }
   3.113  
   3.114      .entry, .comment {
   3.115          border-radius: 8px;
   3.116 -        -moz-border-radius: 8px;
   3.117 -        -webkit-border-radius: 8px;
   3.118          }
   3.119  
   3.120      .month {
   3.121 @@ -3251,15 +3243,11 @@
   3.122  
   3.123      .month .inner dl {
   3.124          border-radius: 8px;
   3.125 -        -moz-border-radius: 8px;
   3.126 -        -webkit-border-radius: 8px;
   3.127          padding: 10px;
   3.128          }
   3.129  
   3.130      .month-wrapper {
   3.131          border-radius: 8px;
   3.132 -        -moz-border-radius: 8px;
   3.133 -        -webkit-border-radius: 8px;
   3.134          }
   3.135  
   3.136      .month .day-has-entries {
   3.137 @@ -3278,17 +3266,14 @@
   3.138          font-weight: bold;
   3.139          }
   3.140  
   3.141 -    .tags-container {
   3.142 +    .tags-container,
   3.143 +    .icons-container {
   3.144          border-radius: 8px;
   3.145          color: $*color_entry_text;
   3.146 -        -moz-border-radius: 8px;
   3.147 -        -webkit-border-radius: 8px;
   3.148          }
   3.149  
   3.150      .module-header {
   3.151          border-radius: 8px;
   3.152 -        -moz-border-radius: 8px;
   3.153 -        -webkit-border-radius: 8px;
   3.154          }
   3.155  
   3.156      .module-calendar .entry-day,