Changeset 6497


Ignore:
Timestamp:
Jun 9, 2010, 11:34:49 AM (14 years ago)
Author:
nikrou
Message:

Feature 1728 fixed : use autoHeight accordion param
merge from trunk

Location:
branches/2.1/admin/themes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/admin/themes/clear/theme.css

    r6364 r6497  
    167167
    168168.sort { clear: none; }
    169 #214ug { margin-left:248px; font-size:12px; }
     169#debug { margin-left:248px; font-size:12px; }
    170170/* menubar is on all admin pages => No specific css file */
    171171#menubar {
    172 display:inline; float:left; left:0; margin: 10px 0 0 10px; min-height:475px; height:475px; /* should be 477 */
     172display:inline; float:left; left:0; margin: 10px 0 0 10px;
    173173padding:0; width:207px; z-index:99; text-align: left; }
    174 #menubar ul.scroll { height:163px; overflow-y:auto;
     174#menubar ul.scroll { overflow-y:auto;
    175175 /* Only IE family supports colored scrollbar */
    176176 scrollbar-face-color: #ddd; scrollbar-shadow-color: #bbb; scrollbar-highlight-color: #fff;
    177177 scrollbar-3dlight-color: #d6d6d6; scrollbar-darkshadow-color: #ccc; scrollbar-track-color: #eee;
    178178 scrollbar-arrow-color: #0cccc; }
    179 
    180 #menubar dd { margin: 0; padding: 0; height:232px; }
     179#menubar dd { margin: 0; padding: 0;}
    181180#menubar dl { width: 207px; border:0; margin: 0; padding: 0; display: block; min-height:35px; border:1px solid #ddd; background-color:#f1f1f1; border-left:1px solid #aaa; border-right:1px solid #aaa;}
    182181#menubar dl.first {border-top:1px solid #aaa;}
     
    191190#menubar ul { color: #ccc; margin:0; line-height: 25px;
    192191  list-style-type: none; list-style-position: inside; padding: 0; }
    193 
    194192#adminHome       {background-color:#ddd;}
    195193#adminHome:hover {background-color:#d0d0d0;}
     
    250248.bigbutton input:hover { cursor:pointer; background:transparent url(images/transparent.gif) repeat scroll left top; border:0; padding:0;}
    251249/* hacks */
    252 html>body #menubar {min-height:477px; height:477px;} /* IE 7 and modern browsers */
    253250* html[lang="en"] body .content h2 , *+html[lang="en"] body .content h2 { text-transform:capitalize; } /* IE */
    254251*+html  .bigtext { left: 70px; }
  • branches/2.1/admin/themes/default/template/admin.tpl

    r6364 r6497  
    88    header: "dt.rdion",
    99    event: "click",
     10    autoHeight: false,
    1011    active: {$ACTIVE_MENU}
    1112  });
  • branches/2.1/admin/themes/roma/theme.css

    r6364 r6497  
    150150#menubar {
    151151background:transparent url(images/menuBoxBottom_new.png) no-repeat scroll left bottom;
    152 border:0; display:inline; float:left; left:0; margin: 10px 0 0 10px; min-height:522px; height:522px; /* should be 477 */
     152border:0; display:inline; float:left; left:0; margin: 10px 0 0 10px;
    153153padding:0; width:230px; z-index:99; text-align: left; }
    154 #menubar ul.scroll { height:163px; overflow-y:auto;
     154#menubar ul.scroll { overflow-y:auto;
    155155 /* Only IE family supports colored scrollbar */
    156156 scrollbar-face-color: #222; scrollbar-shadow-color: #444; scrollbar-highlight-color: #000;
    157157 scrollbar-3dlight-color: #292929; scrollbar-darkshadow-color: #333; scrollbar-track-color: #111;
    158158 scrollbar-arrow-color: #ff3333; }
    159 
    160159#menubar dd {
    161160background: transparent url(images/menubar-detail.png) repeat-y top left;
    162 margin: 10px 0 0 0; padding: 0; height:232px; }
     161margin: 0; padding: 0 0 10px 0; }
    163162#menubar dl {
    164163background:transparent url(images/menuBoxTop_new.png) no-repeat scroll left top;
     
    166165#menubar dl.first {
    167166background:transparent url(images/menubar-top.png) no-repeat scroll left 1px; }
     167#menubar dl.last { padding: 0 0 24px 0;}
    168168#menubar dt { margin: 0; display: block; background: none; left:10px; font-weight:bold;
    169 position:relative; padding: 5px 1px 4px 5px; top:-10px; font-size: 13px; color: #666;  outline:none;}
     169position:relative; padding: 5px 1px 4px 5px; top:-8px; font-size: 13px; color: #666;  outline:none;}
    170170#menubar dt  span { background-color: #111; cursor:pointer; }
    171171#menubar li { margin: 0 0 0 6px; }
     
    233233.bigbutton input:hover { cursor:pointer; background:transparent url(images/transparent.gif) repeat scroll left top; border:0; padding:0;}
    234234/* hacks */
    235 html>body #menubar {min-height:522px; height:522px;} /* IE 7 and modern browsers */
    236235* html[lang="en"] body .content h2 , *+html[lang="en"] body .content h2 { text-transform:capitalize; } /* IE */
    237236*+html  .bigtext { left: 70px; }
Note: See TracChangeset for help on using the changeset viewer.