diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-18 09:28:48 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-18 09:28:48 -0700 |
| commit | 090c4d016baec6376d6d26c347c3e1ca11a929d5 (patch) | |
| tree | ddab7b8e10cf635b7f45c0c18bdf809c848334a3 /themes/admin_wind/views | |
| parent | c9a030dd08711f89a985504ce26378a315d7ff1f (diff) | |
| parent | 4949a2ce0b5daca7afe86a261be447440fce7eff (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
lib/gallery.common.css
themes/admin_wind/views/admin.html.php
themes/night_wind/views/sidebar.html.php
themes/wind/views/sidebar.html.php
Diffstat (limited to 'themes/admin_wind/views')
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index 4ee08d95..b788eb93 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -50,7 +50,7 @@ <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>"> ← <?= t("back to the ...") ?> </a> - <div id="g-site-admin-menu" class="g-clearfix"> + <div id="g-site-admin-menu" class="ui-helper-clearfix"> <?= $theme->admin_menu() ?> </div> <?= $theme->admin_header_bottom() ?> |