Changeset 1262


Ignore:
Timestamp:
Apr 22, 2006, 10:02:12 PM (18 years ago)
Author:
chrisaga
Message:
  • merge trunk r1260:1261 into branch 1.6 (minor improvements and fixes in template)
Location:
branches/branch-1_6
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/branch-1_6/template-common/default-layout.css

    r1183 r1262  
    3232  height: 140px;                /* max thumbnail height + 2px */
    3333}
    34 #content DIV.comment BLOCKQUOTE/*,
    35 #content DIV.thumbnailCategory DIV.description*/ {
     34#content DIV.comment BLOCKQUOTE {
    3635  margin-left: 150px;           /*maximum thumbnail width + ~10px */
    3736}

  • branches/branch-1_6/template/yoga/content.css

    r1254 r1262  
    303303  font-size: 90%;
    304304  overflow: auto;
    305   width: inherit;
     305  /*width: inherit;*/
    306306}
    307307
    … …  
    320320#content DIV.thumbnailCategory DIV.illustration {
    321321  text-align: left;
    322   margin: 2px 0 2px 2px;
     322  margin: 2px 0 0 2px;
    323323  float: left;
    324324}

  • branches/branch-1_6/template/yoga/default-colors.css

    r1185 r1262  
    3131  background-color: #f5f5f5;            /* whitesmoke */
    3232}
    33 
     33INPUT[type="radio"] {   /* for Opera */
     34  border: none;
     35  background-color: transparent;
     36}
    3437
    3538.errors { /* Errors display */

  • branches/branch-1_6/template/yoga/default-layout.css

    r1256 r1262  
    138138  float: left;
    139139  width: auto;
    140   margin-right: 10px;
     140  margin-right: 1em;
    141141  padding: 0;
    142142}
    … …  
    161161FORM.filter FIELDSET LABEL * TEXTAREA {
    162162  display: inline;
    163   vertical-align: baseline;
     163  vertical-align: top;
    164164  margin: 0 0.5em 0 0;
    165165}

  • branches/branch-1_6/template/yoga/fix-ie5-ie6.css

    r1206 r1262  
    1010}
    1111
     12/* to get less hugly checkboxes at least in tagSelection */
     13UL.tagSelection LI INPUT {
     14  border: none;
     15  background-color: transparent;
     16}

  • branches/branch-1_6/template/yoga/mainpage_categories.tpl

    r1173 r1262  
    11<!-- BEGIN categories -->
     2<!-- $Id:$ -->
    23<ul class="thumbnailCategories">
    34  <!-- BEGIN category -->
    … …  
    1314      <div class="description">
    1415        <h3>
     16          <a href="{categories.category.URL}">{categories.category.NAME}</a>
    1517          {categories.category.ICON}
    16           <a href="{categories.category.URL}">{categories.category.NAME}</a>
    1718        </h3>
    1819        <p>{categories.category.CAPTION_NB_IMAGES}</p>
Note: See TracChangeset for help on using the changeset viewer.