diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-06 07:59:45 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-06 07:59:45 -0700 |
| commit | 194fba6fa8c87517ea70c41514f75ebc2d9bdf12 (patch) | |
| tree | 1f82fa4f86628fc083534597552031157996f62c | |
| parent | 6e59de2fb5b379a7a839e27c92f7546ee568cf00 (diff) | |
| parent | 49505f28bb68e84b926d7907a33c7f814e78eb3c (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev
| -rw-r--r-- | lib/gallery.common.css | 3 | ||||
| -rw-r--r-- | themes/wind/views/no_sidebar.html.php | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css index c422fe6e..b679fbd2 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -202,6 +202,9 @@ form .g-error { .g-block { } +.g-block-content { +} + .g-message-box { width: 100%; } diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php index c609d4d9..d0d3eba6 100644 --- a/themes/wind/views/no_sidebar.html.php +++ b/themes/wind/views/no_sidebar.html.php @@ -1,5 +1,5 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <div class="g-warning"> - <?= t("No active sidebar panels. <a href=\"%url\">Add panels</a>", + <?= t("No active sidebar blocks. <a href=\"%url\">Add blocks</a>", array("url" => html::mark_clean(url::site("admin/sidebar")))) ?> </div> |