Changeset 1383 for branches


Ignore:
Timestamp:
Jun 24, 2006, 8:47:07 AM (18 years ago)
Author:
chrisaga
Message:

merge : from trunk r:1381:1382 into branch 1.6 (feature 433)

Location:
branches/branch-1_6/template/yoga
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r1342 r1383  
    7575}
    7676
    77 /* fix IE with another layout */
    78 * html #content UL.thumbnails SPAN.wrap2 {
    79   display: block;
    80   position: relative;
    81   text-align: left;
    82 }
    83 * html #content UL.thumbnails SPAN.wrap2 A,
    84 * html #content UL.thumbnails SPAN.wrap2 LABEL {
    85   overflow: visible;
    86   position: absolute;
    87   top: 50%;
    88   text-align: center;
    89 }
    90 * html #content UL.thumbnails IMG.thumbnail {
    91   position: relative;
    92   top: -50%;
    93   /*\*//*/
    94     margin-top: -40%;
    95   /**/
    96 }
    97 * html #content UL.thumbnails SPAN.wrap2 input {
    98   position: absolute;
    99   left: 0;
    100   top: -50%;  /* same as other browsers but not so pretty */
    101 }
    102 
    10377#content .navigationBar, #content .additional_info {
    10478    margin: 10px 0;
    … …  
    164138  margin: 0 0 0.5em 0;
    165139  padding: 0;
    166   overflow: hidden; /* these 2 lines ensure the floating child is kept in the DIV */
    167   width: 100%;      /* don't ask why. It's a very usefull trick                   */
     140  overflow: hidden; /* these 2 lines keep the floating child in the DIV */
     141  width: 100%;      /* don't ask why. It's a very usefull trick         */
    168142}
    169143
    … …  
    300274}
    301275
    302 * html #content UL.thumbnailCategories {
    303   width: 99%; /* buggy IE box model */
    304 }
    305 
    306276#content UL.thumbnailCategories LI {
    307277  margin:0;

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

    r1329 r1383  
    11/* $Id$ */
    2 /* Issues in IE from 5 to 6 only to to be used with IE7                       */
     2/* Issues in IE from 5 to 6 only not to be used with IE7                      */
    33
    44/* fix lack of :hover behaviour for non link objects */
    … …  
    2121  background-color: transparent;
    2222}
     23
     24/* fix IE with another layout for thumbnails */
     25#content UL.thumbnails SPAN.wrap2 {
     26  display: block;
     27  position: relative;
     28  text-align: left;
     29}
     30#content UL.thumbnails SPAN.wrap2 A,
     31#content UL.thumbnails SPAN.wrap2 LABEL {
     32  overflow: visible;
     33  position: absolute;
     34  top: 50%;
     35  text-align: center;
     36}
     37#content UL.thumbnails IMG.thumbnail {
     38  position: relative;
     39  top: -50%;
     40  /*\*//*/
     41    margin-top: -40%;
     42  /**/
     43}
     44#content UL.thumbnails SPAN.wrap2 input {
     45  position: absolute;
     46  left: 0;
     47  top: -50%;  /* same as other browsers but not so pretty */
     48}
     49
     50/* fix category thumbnails on main page */
     51#content UL.thumbnailCategories {
     52  width: 99%; /* buggy IE box model */
     53}
     54

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

    r1367 r1383  
    5353
    5454  <!-- BEGIN calendar -->
    55   <h2>{calendar.TITLE}
    56 </h2>
     55  <h2>{calendar.TITLE}</h2>
    5756  <!-- END calendar -->
    5857
Note: See TracChangeset for help on using the changeset viewer.