diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-21 20:45:57 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-21 20:45:57 -0700 |
| commit | 7e9eca7f6714bcc23db1688565574c9af3253825 (patch) | |
| tree | a7adcbf1d7fd19c868e471fbf70547b661a08832 /themes | |
| parent | 7b35091b47f0b1ed2677795885553c07fd7bf168 (diff) | |
| parent | e8eb23db42bb929548af358452f1b65e16b61913 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/wind/css/screen.css | 6 | ||||
| -rw-r--r-- | themes/wind/views/page.html.php | 6 |
2 files changed, 9 insertions, 3 deletions
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/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 ?> */ |