Changeset 30971


Ignore:
Timestamp:
02/16/15 10:02:26 (5 years ago)
Author:
plg
Message:

merge r30970 from trunk to branch 2.7

bug 3179 fixed: back merge r26971 (bug:2700) which introduced jBreadCrumb with this bug on Safari and not working. Maybe a future plugin instead.

Location:
branches/2.7/themes/elegant
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.7/themes/elegant/local_head.tpl

    r27212 r30971  
    1 {html_style} 
    2 .browsePath ul li span a:before, .browsePath ul li.last:before 
    3 {ldelim} 
    4   content: "{$LEVEL_SEPARATOR}"; 
    5 } 
    6 {/html_style} 
    71{footer_script} 
    82  var p_main_menu = "{$elegant.p_main_menu}", p_pict_descr = "{$elegant.p_pict_descr}", p_pict_comment = "{$elegant.p_pict_comment}"; 
    9   jQuery(document).ready(function() { 
    10       jQuery(".browsePath").jBreadCrumb(); 
    11   }); 
    123{/footer_script} 
    134{if $BODY_ID=='thePicturePage'} 
     
    167        {combine_script id='elegant.scripts' load='footer' require='jquery' path='themes/elegant/scripts.js'} 
    178{/if} 
    18 {combine_script id='jquery.jBreadCrumb' load='footer' require='jquery' path='themes/elegant/js/jquery.jBreadCrumb.js'} 
    19  
    20  
    21 <!--[if lt IE 8]> 
     9        <!--[if lt IE 8]> 
    2210                <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/elegant/fix-ie7.css"> 
    2311        <![endif]--> 
  • branches/2.7/themes/elegant/theme.css

    r26971 r30971  
    274274#the_page .content .stuffs              { margin: 0!important} 
    275275.categoryActions .theme_menuf   { display: none;} 
    276  
    277 /* BreadCrumb */ 
    278 .browsePath 
    279 { 
    280         margin: 0; 
    281         padding: 0; 
    282         float: left; 
    283         display: block; 
    284         height: 26px; 
    285         overflow: hidden; 
    286         width: 990px; 
    287         padding:5px; 
    288 } 
    289 .browsePath ul 
    290 { 
    291         margin: 0; 
    292         padding: 0; 
    293         height: 26px; 
    294         display: block; 
    295 } 
    296 .browsePath ul li 
    297 { 
    298         display: block; 
    299         float: left; 
    300         position: relative; 
    301         height: 26px; 
    302         overflow: hidden; 
    303         line-height: 26px; 
    304         margin: 0px; 
    305         font-size: .9167em; 
    306 } 
    307 .browsePath ul li a:before, .browsePath ul li.last:before 
    308 { 
    309   content: "/"; 
    310   display: inline-block; 
    311   margin-left: 0.2em; 
    312   margin-right: 0.2em; 
    313   text-align: center; 
    314   text-decoration: inherit; 
    315   text-transform: none; 
    316   width: 1em; 
    317 } 
    318 .browsePath ul li div.chevronOverlay 
    319 { 
    320         position: absolute; 
    321         right: 0; 
    322         top: 0; 
    323         z-index: 2; 
    324 } 
    325 .browsePath ul li span 
    326 { 
    327         display: block; 
    328         overflow: hidden; 
    329 } 
    330 .browsePath ul li a 
    331 { 
    332         display: block; 
    333         position: relative; 
    334         height: 26px; 
    335         line-height: 26px; 
    336         overflow: hidden; 
    337         float: left; 
    338 } 
    339 .browsePath ul li.first a 
    340 { 
    341         height: 26px !important; 
    342         text-indent:-1000em; 
    343         width:26px; 
    344         padding: 0; 
    345         margin: 0; 
    346         overflow: hidden; 
    347   background:url(icon/icons_sprite.png) no-repeat -26px 0; 
    348 } 
    349 .browsePath ul li.first a:hover 
    350 { 
    351   background-image:url(icon/icons_sprite-hover.png);   
    352 } 
    353 .browsePath ul li.last 
    354 { 
    355         background: none; 
    356         margin-right: 0; 
    357         padding-right: 0; 
    358 } 
  • branches/2.7/themes/elegant/themeconf.inc.php

    r30962 r30971  
    1616global $conf; 
    1717include(PHPWG_THEMES_PATH.'elegant/admin/upgrade.inc.php'); 
    18 add_event_handler('loc_begin_picture', 'level_separator_elegant'); 
    19 function level_separator_elegant() 
    20 { 
    21   global $template; 
    22   $template->assign( 'LEVEL_SEPARATOR', '#&$' ); 
    23 } 
     18 
    2419add_event_handler('init', 'set_config_values_elegant'); 
    2520function set_config_values_elegant() 
Note: See TracChangeset for help on using the changeset viewer.