diff options
author | Nathan Kinkade <nath@nkinka.de> | 2011-04-22 16:54:55 +0000 |
---|---|---|
committer | Nathan Kinkade <nath@nkinka.de> | 2011-04-22 16:54:55 +0000 |
commit | 1f7c1f18c651c58048e92d615c71ac0fe6691c10 (patch) | |
tree | 4527c4bc08000a07c180cd1fe81792d71195d58b /themes | |
parent | de6f3fce9110b777d61dec97f2a3a61d887a5ccd (diff) | |
parent | 55da59c942c0f7171b515f0718fea8506ed4b116 (diff) |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'themes')
-rw-r--r-- | themes/admin_wind/views/admin.html.php | 6 | ||||
-rw-r--r-- | themes/wind/views/page.html.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index 9e011c69..a56b6f41 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -41,11 +41,11 @@ media="screen,print,projection" /> <![endif]--> - <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below --> - <?= $theme->get_combined("script") ?> - <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below --> <?= $theme->get_combined("css") ?> + + <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below --> + <?= $theme->get_combined("script") ?> </head> <body <?= $theme->body_attributes() ?>> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 0e5bdf6b..2b86556d 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -71,11 +71,11 @@ media="screen,print,projection" /> <![endif]--> - <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below --> - <?= $theme->get_combined("script") ?> - <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below --> <?= $theme->get_combined("css") ?> + + <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below --> + <?= $theme->get_combined("script") ?> </head> <body <?= $theme->body_attributes() ?>> |