Changeset 2356 for trunk/template/yoga


Ignore:
Timestamp:
May 23, 2008, 12:15:48 PM (16 years ago)
Author:
rvelices
Message:
  • merge r2355 from 1.7 to trunk: fix display of menubar related tags in IE7
  • optimized sql query in permalinks
  • remove some unused global variable declarations
  • fix bug in admin/themeconf.inc.php
Location:
trunk/template/yoga
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/template/yoga/fix-ie5-ie6.css

    r2352 r2356  
    1717}
    1818
    19 /* fix tag clouds : IE doesn't like anything but inline */
    20 #menubar #menuTagCloud LI
    21 {
    22   display: inline;
    23 }
    2419
    2520/* fix quickconnect layout */

  • trunk/template/yoga/fix-khtml.css

    r2352 r2356  
    1111    margin-bottom: 5px;
    1212}
     13
     14#menubar #menuTagCloud LI
     15{
     16  display: inline-block;/* required for Safari 3.1 - otherwise overflows on the right */
     17}
     18
    1319/* end Safari/Konqueror */
    1420

  • trunk/template/yoga/menubar.css

    r2084 r2356  
    145145#menubar #menuTagCloud LI
    146146{
    147   display: inline;      /* FF doesn't see the inline-block below */
     147  display: inline;
    148148  white-space: nowrap;  /* No line break in the LI but Opera set nowrap to */
    149   display: inline-block;/* the whole UL, inline-block fix it.              */
    150   /* IE wants inline in fix-ie5-ie6.css */
    151149}

  • trunk/template/yoga/theme/admin/themeconf.inc.php

    r2332 r2356  
    1515      case 'cat_modify':
    1616      case 'cat_move':
    17       case 'cat_options':     
     17      case 'cat_options':
    1818      case 'element_set':
    1919      case 'cat_perm':
    2020      case 'permalinks':
    2121      case 'picture_modify':
    22         if (isset($_GET['cat']) and $_GET['cat']='caddie') {
     22        if (isset($_GET['cat']) and $_GET['cat']=='caddie') {
    2323          return 3;
    2424        }
    … …  
    4141      case 'plugin':
    4242        return 5;
    43     } 
     43    }
    4444  }
    4545  return 0;
Note: See TracChangeset for help on using the changeset viewer.