diff options
Diffstat (limited to 'themes')
-rw-r--r-- | themes/admin_default/views/admin.html.php | 19 | ||||
-rw-r--r--[-rwxr-xr-x] | themes/default/images/ico-error.png | bin | 701 -> 701 bytes | |||
-rw-r--r--[-rwxr-xr-x] | themes/default/images/ico-help.png | bin | 786 -> 786 bytes | |||
-rw-r--r--[-rwxr-xr-x] | themes/default/images/ico-info.png | bin | 778 -> 778 bytes | |||
-rw-r--r--[-rwxr-xr-x] | themes/default/images/ico-success.png | bin | 537 -> 537 bytes | |||
-rw-r--r--[-rwxr-xr-x] | themes/default/images/ico-warning.png | bin | 666 -> 666 bytes | |||
-rw-r--r-- | themes/default/views/page.html.php | 15 |
7 files changed, 12 insertions, 22 deletions
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index 62f9761f..2a231057 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -6,19 +6,14 @@ <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <title><?= t("Admin Dashboard") ?></title> <link rel="shortcut icon" href="<?= url::file("themes/default/images/favicon.ico") ?>" type="image/x-icon" /> - <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>" - media="screen,projection" /> - <link rel="stylesheet" type="text/css" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>" - media="screen,projection" /> - <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>" - media="screen,projection" /> - <link rel="stylesheet" type="text/css" href="<?= url::file("themes/default/css/screen.css") ?>" - media="screen,projection" /> - <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>" - media="screen,projection" /> + + <?= $theme->css("lib/yui/reset-fonts-grids.css") ?> + <?= $theme->css("lib/themeroller/ui.base.css") ?> + <?= $theme->css("lib/superfish/css/superfish.css") ?> + <?= $theme->css("themes/default/css/screen.css") ?> + <?= $theme->theme_css("css/screen.css") ?> <!--[if IE]> - <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>" - media="screen,print,projection" /> + <?= $theme->theme_css("css/fix-ie.css") ?> <![endif]--> <?= $theme->script("lib/jquery.js") ?> diff --git a/themes/default/images/ico-error.png b/themes/default/images/ico-error.png Binary files differindex c37bd062..c37bd062 100755..100644 --- a/themes/default/images/ico-error.png +++ b/themes/default/images/ico-error.png diff --git a/themes/default/images/ico-help.png b/themes/default/images/ico-help.png Binary files differindex 5c870176..5c870176 100755..100644 --- a/themes/default/images/ico-help.png +++ b/themes/default/images/ico-help.png diff --git a/themes/default/images/ico-info.png b/themes/default/images/ico-info.png Binary files differindex 12cd1aef..12cd1aef 100755..100644 --- a/themes/default/images/ico-info.png +++ b/themes/default/images/ico-info.png diff --git a/themes/default/images/ico-success.png b/themes/default/images/ico-success.png Binary files differindex a9925a06..a9925a06 100755..100644 --- a/themes/default/images/ico-success.png +++ b/themes/default/images/ico-success.png diff --git a/themes/default/images/ico-warning.png b/themes/default/images/ico-warning.png Binary files differindex 628cf2da..628cf2da 100755..100644 --- a/themes/default/images/ico-warning.png +++ b/themes/default/images/ico-warning.png diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index 3ae3e155..2e68f571 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -24,17 +24,12 @@ <? endif ?> </title> <link rel="shortcut icon" href="<?= $theme->theme_url("images/favicon.ico") ?>" type="image/x-icon" /> - <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>" - media="screen,print,projection" /> - <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>" - media="screen" /> - <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>" - media="screen,print,projection" /> - <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>" - media="screen,print,projection" /> + <?= $theme->css("lib/yui/reset-fonts-grids.css") ?> + <?= $theme->css("lib/superfish/css/superfish.css") ?> + <?= $theme->css("lib/themeroller/ui.base.css") ?> + <?= $theme->theme_css("css/screen.css") ?> <!--[if lt IE 8]> - <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>" - media="screen,print,projection" /> + <?= $theme->theme_css("css/fix-ie.css") ?> <![endif]--> <? if ($theme->page_type == 'album'): ?> <? if ($thumb_proportion != 1): ?> |