diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-03-28 21:04:44 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-03-28 21:04:44 -0700 |
| commit | ea43c5f06f5c7242f1d5811fe427e55c87497ecc (patch) | |
| tree | 7ee253a40c57c8ea8066305e36b633fa2d7500e4 /themes | |
| parent | 2eea7b874aa06f08ed58a85197473233b54693aa (diff) | |
| parent | e8eb23db42bb929548af358452f1b65e16b61913 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 8 | ||||
| -rw-r--r-- | themes/wind/css/screen.css | 6 | ||||
| -rw-r--r-- | themes/wind/views/no_sidebar.html.php | 2 | ||||
| -rw-r--r-- | themes/wind/views/page.html.php | 6 |
4 files changed, 17 insertions, 5 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index fa79119a..2f64c847 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -4,7 +4,13 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title><?= t("Admin dashboard") ?></title> + <title> + <? if ($page_title): ?> + <?= $page_title ?> + <? else: ?> + <?= t("Admin dashboard") ?> + <? endif ?> + </title> <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" /> <?= $theme->css("yui/reset-fonts-grids.css") ?> diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index e96b259d..f8e26073 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -213,10 +213,16 @@ td { padding-left: 0; } +/* Sidebar ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + #g-sidebar .g-block-content { padding-left: 1em; } +#g-sidebar #g-image-block { + overflow: hidden; +} + /* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */ #g-content #g-album-grid { diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php index 83686318..a9eb0e3e 100644 --- a/themes/wind/views/no_sidebar.html.php +++ b/themes/wind/views/no_sidebar.html.php @@ -1,6 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <ul class="g-message-block"> - <li class="g-warning"><?= t("No active sidebar blocks." ?> + <li class="g-warning"><?= t("No active sidebar blocks.") ?> <br/><a href="<?= url::site("admin/sidebar") ?>"><?= t("Add blocks") ?></a> </li> </ul> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 61e34145..ebfbf700 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -35,10 +35,10 @@ <![endif]--> <? if ($theme->page_type == "collection"): ?> <? if ($thumb_proportion != 1): ?> - <? $new_width = $thumb_proportion * 213 ?> - <? $new_height = $thumb_proportion * 240 ?> + <? $new_width = round($thumb_proportion * 213) ?> + <? $new_height = round($thumb_proportion * 240) ?> <style type="text/css"> - #g-content #g-album-grid .g-item { + .g-view #g-content #g-album-grid .g-item { width: <?= $new_width ?>px; height: <?= $new_height ?>px; /* <?= $thumb_proportion ?> */ |