Projet

Général

Profil

Révision 578c6d8f

Ajouté par Assos Assos il y a presque 10 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/themes/mayo/templates/page.tpl.php
84 84
    $page_style = 'padding: ' . $page_margin . ';';
85 85
  }
86 86
  else {
87
    $main_style = 'padding: 0px ' . $page_margin . ';';
87
    $main_style = 'padding: 0px ' . $page_margin . '; box-sizing: border-box;';
88 88
  }
89 89

  
90 90
  $header_style = '';
......
115 115
  if (empty($logo_left_margin)) $logo_left_margin = '0px';
116 116
  $logo_top_margin = theme_get_setting('logo_top_margin');
117 117
  if (empty($logo_top_margin)) $logo_top_margin = '0px';
118
  $logo_style = 'padding-left: ' . $logo_left_margin . '; padding-top: ' . $logo_top_margin . ';';
118
  $logo_style = 'margin-left: ' . $logo_left_margin . '; margin-top: ' . $logo_top_margin . ';';
119 119

  
120 120
  $sitename_style = '';
121 121
  $sitename_left_margin = theme_get_setting('sitename_left_margin');
122 122
  if (empty($sitename_left_margin)) $sitename_left_margin = '0px';
123 123
  $sitename_top_margin = theme_get_setting('sitename_top_margin');
124 124
  if (empty($sitename_top_margin)) $sitename_top_margin = '0px';
125
  $sitename_style = 'padding-left: ' . $sitename_left_margin . '; padding-top: ' . $sitename_top_margin . ';';
125
  $sitename_style = 'margin-left: ' . $sitename_left_margin . '; margin-top: ' . $sitename_top_margin . ';';
126 126

  
127 127
  $searchbox_style = '';
128 128
  $searchbox_right_margin = theme_get_setting('searchbox_right_margin');
129 129
  if (empty($searchbox_right_margin)) $searchbox_right_margin = '0px';
130 130
  $searchbox_top_margin = theme_get_setting('searchbox_top_margin');
131 131
  if (empty($searchbox_top_margin)) $searchbox_top_margin = '0px';
132
  $searchbox_style = 'padding-right: ' . $searchbox_right_margin . '; padding-top: ' . $searchbox_top_margin . ';';
132
  $searchbox_style = 'margin-right: ' . $searchbox_right_margin . '; margin-top: ' . $searchbox_top_margin . ';';
133 133

  
134 134
  $menubar_style = '';
135 135
  $menubar_bg_value = theme_get_setting('menubar_bg_value');
......
278 278
        <?php print render($title_prefix); ?>
279 279
        <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
280 280
        <?php print render($title_suffix); ?>
281
        <?php if ($tabs): ?><div class="tabs"><?php print render($tabs); ?></div><?php endif; ?>
281
        <?php if ($tabs): ?><div class="tabs clearfix"><?php print render($tabs); ?></div><?php endif; ?>
282 282
        <?php print render($page['help']); ?>
283 283
        <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
284 284
        <?php print render($page['content']); ?>

Formats disponibles : Unified diff