Ignore:
Timestamp:
Jun 24, 2006, 2:17:41 PM (18 years ago)
Author:
chrisaga
Message:

merge manualy from trunk r1389:1392

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

Legend:

Unmodified
Added
Removed

  • branches/branch-1_6/template/yoga

    • Property svn:ignore

      •  

        old new  
        11-local-layout.css
        22local-layout.css
         3thumbnails-fix-ie5-ie6.css.essai
         4thumbnails.tpl.essai

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

    r1386 r1393  
    120120}
    121121
    122 /* should be in admin.css ? CSS properties also used in popuphelp */
    123 
    124 SPAN.pwgScreen {
    125   border-bottom: 1px dotted black;
    126 }
    127 
    128 SPAN.filename:before {
    129   content: "[";
    130 }
    131 
    132 SPAN.filename:after {
    133   content: "]";
    134 }
    135 
    136122/* begin chronology/calendar elements*/
    137123#content DIV.calendarViews {

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

    r1390 r1393  
    11/* $Id$ */
    2 
     2@import "admin/default-layout.css";
    33BODY {
    44    margin: 5px;
    … …  
    8080  overflow: auto;
    8181}
    82 SELECT.categoryList {
    83   width: 100%;
    84 }
    85 
    86 /** go to an admin.css ? **/
    87 
    88 TABLE.table2 {
    89   border: 1px solid black;
    90   margin: 1em auto;
    91   padding: 0;
    92 }
    93 
    94 TABLE.table2 TD, TABLE.table2 TH {
    95   padding: 0 1em;
    96 }
    97 
    98 TABLE.table2 TR {
    99   text-align: left;
    100 }
    101 
    102 TABLE.table2 TR.throw {
    103   text-align: center;
    104 }
    105 
    106 .hour {
    107   white-space: pre;
    108 }
    109 
    110 .number {
    111   text-align: right;
    112 }
    113  
    114 TABLE#dailyStats {
    115   width: 60%;
    116 }
    117 
    118 TABLE#detailedStats {
    119   width: 80%;
    120 }
    121 
    122 FORM#add_virtual P { text-align: left; }
    123 FORM#categoryOrdering, FORM#addVirtual {
    124   padding-left: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
    125   padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
    126 }
    127 FORM#categoryOrdering p {
    128         text-align: left;
    129         margin-top: 1em;
    130         margin-bottom: 1em;
    131 }
    132 UL.categoryUl {
    133   list-style: none;
    134   padding: 0;
    135   margin: 0;
    136 }
    137 
    138 LI.categoryLi {
    139   border: 1px solid gray;
    140   padding: 0px 5px;
    141   margin-bottom: 5px;
    142 }
    143 
    144 FORM#categoryOrdering UL.categoryActions {
    145   float: right;
    146   margin-top: 5px;
    147 }
    148 
    149 FORM#cat_modify TABLE { width: auto; }
    15082
    15183/**
    … …  
    246178}
    247179
    248 FIELDSET.elementEdit A {
    249   display: block;
    250   float: right;
    251 }
    252 
    253 TABLE.doubleSelect {
    254   text-align: center;
    255   margin: 0 auto;
    256   width: 100%;
    257 }
    258 
    259 TABLE.doubleSelect TD {
    260   padding: 0 5px;
    261   width: 50%;
    262 }
    263 
    264 FORM#categoryPermissions LI {
    265   display:inline;
    266   white-space: nowrap;
    267 }
    268 
    269180#theHeader H1 {
    270181  margin-bottom: 0.5em;
    … …  
    274185  margin-top: 0;
    275186  padding: 0;
    276 }
    277 
    278 BODY#theAdminPage #theHeader P {
    279   display: none;
    280187}
    281188
Note: See TracChangeset for help on using the changeset viewer.