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 /modules/gallery/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 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/admin_themes.html.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php index a75d9f04..f7e77a01 100644 --- a/modules/gallery/views/admin_themes.html.php +++ b/modules/gallery/views/admin_themes.html.php @@ -14,7 +14,7 @@ <div id="g-site-theme"> <h2> <?= t("Gallery theme") ?> </h2> - <div class="g-block g-selected g-clearfix"> + <div class="g-block g-selected ui-helper-clearfix"> <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>" alt="<?= html::clean_attribute($themes[$site]->name) ?>" /> <h3> <?= $themes[$site]->name ?> </h3> @@ -29,7 +29,7 @@ <? foreach ($themes as $id => $info): ?> <? if (!$info->site) continue ?> <? if ($id == $site) continue ?> - <div class="g-block g-clearfix"> + <div class="g-block ui-helper-clearfix"> <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>"> <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>" alt="<?= html::clean_attribute($info->name) ?>" /> @@ -52,7 +52,7 @@ <div id="g-admin-theme"> <h2> <?= t("Admin theme") ?> </h2> - <div class="g-block g-selected g-clearfix"> + <div class="g-block g-selected ui-helper-clearfix"> <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>" alt="<?= html::clean_attribute($themes[$admin]->name) ?>" /> <h3> <?= $themes[$admin]->name ?> </h3> @@ -67,7 +67,7 @@ <? foreach ($themes as $id => $info): ?> <? if (!$info->admin) continue ?> <? if ($id == $admin) continue ?> - <div class="g-block g-clearfix"> + <div class="g-block ui-helper-clearfix"> <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>"> <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>" alt="<?= html::clean_attribute($info->name) ?>" /> |