Projet

Général

Profil

Révision fc457866

Ajouté par Mathieu Schiano Di Schiabica il y a plus de 8 ans

Update rubik 4.2 -> 4.3

Voir les différences:

drupal7/sites/all/themes/rubik/template.php
8 8
  }
9 9

  
10 10
   // add in a specific stylesheet for overrides in IE7. (BLAH)
11
  drupal_add_css(drupal_get_path('theme', 'rubik') . '/ie.css', array(
11
  drupal_add_css(drupal_get_path('theme', 'rubik') . '/css/ie.css', array(
12 12
    'browsers' => array(
13 13
      '!IE' => FALSE,
14 14
    ),
......
17 17
    'every_page' => TRUE,
18 18
  ));
19 19

  
20
  // Disable sticky in the sidebar. Set option in JS
21
  $disable_sticky = theme_get_setting('rubik_disable_sticky_sidebar');
22
  drupal_add_js(array('rubik' => array('disable_sticky' => $disable_sticky)), array('type' => 'setting'));
20 23
}
21 24

  
22 25
/**
......
25 28
 */
26 29
function rubik_css_alter(&$css) {
27 30
  if (isset($css['modules/overlay/overlay-child.css'])) {
28
    $css['modules/overlay/overlay-child.css']['data'] = drupal_get_path('theme', 'rubik') . '/overlay-child.css';
31
    $css['modules/overlay/overlay-child.css']['data'] = drupal_get_path('theme', 'rubik') . '/css/overlay-child.css';
29 32
  }
30 33
  if (isset($css['modules/shortcut/shortcut.css'])) {
31
    $css['modules/shortcut/shortcut.css']['data'] = drupal_get_path('theme', 'rubik') . '/shortcut.css';
34
    $css['modules/shortcut/shortcut.css']['data'] = drupal_get_path('theme', 'rubik') . '/css/shortcut.css';
32 35
  }
33 36
}
34 37

  
......
140 143

  
141 144
  // Overlay is enabled.
142 145
  $vars['overlay'] = (module_exists('overlay') && overlay_get_mode() === 'child');
143

  
144
  // Disable sticky in the sidebar. Set option in JS
145
  $disable_sticky = theme_get_setting('rubik_disable_sticky_sidebar');
146
  drupal_add_js(array('rubik' => array('disable_sticky' => $disable_sticky)), array('type' => 'setting'));
147

  
148 146
}
149 147

  
150 148
/**
......
499 497
 */
500 498
function rubik_preprocess_textfield(&$vars) {
501 499
  if ($vars['element']['#size'] >= 30 && empty($vars['element']['#field_prefix']) && empty($vars['element']['#field_suffix'])) {
502
    $vars['element']['#size'] = '';
500
    // Set text field to default size.
501
    $vars['element']['#size'] = 20;
503 502
    if (!isset($vars['element']['#attributes']['class'])
504 503
      || !is_array($vars['element']['#attributes']['class'])) {
505 504
       $vars['element']['#attributes']['class'] = array();

Formats disponibles : Unified diff