summaryrefslogtreecommitdiff
path: root/plugins/help/skins
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-11-11 14:10:56 +0100
committerThomas Bruederli <thomas@roundcube.net>2012-11-11 14:10:56 +0100
commite43dcb0df3e7ea6c05a8c1473b0da7834d5e39d9 (patch)
tree8aee0551cff7030213e94502f7b1e2a1152bad7c /plugins/help/skins
parent03149131f754dd122f8707fbfc9e7ff47e9d6524 (diff)
parent71649445a0b81ee13f2326f0e35316f5fdbc91e6 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins/help/skins')
-rw-r--r--plugins/help/skins/larry/help.css5
-rw-r--r--plugins/help/skins/larry/templates/help.html8
2 files changed, 10 insertions, 3 deletions
diff --git a/plugins/help/skins/larry/help.css b/plugins/help/skins/larry/help.css
index 20caa7a87..931ae1b61 100644
--- a/plugins/help/skins/larry/help.css
+++ b/plugins/help/skins/larry/help.css
@@ -38,3 +38,8 @@
.toolbar a.button.license {
background: url(help.png) center -130px no-repeat;
}
+
+.iframebox.help_about,
+.iframebox.help_license {
+ overflow: auto;
+}
diff --git a/plugins/help/skins/larry/templates/help.html b/plugins/help/skins/larry/templates/help.html
index 9790c1570..63cf0c21c 100644
--- a/plugins/help/skins/larry/templates/help.html
+++ b/plugins/help/skins/larry/templates/help.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/this/help.css" />
</head>
<body>
@@ -18,8 +17,11 @@
<roundcube:container name="helptabs" id="helptabsbar" />
</div>
-<div id="pluginbody" class="uibox offset scroller">
-<roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:99%" src="/watermark.html" />
+<div id="pluginbody" class="uibox offset">
+ <div class="iframebox help_<roundcube:var name='env:action' />">
+ <roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:100%" src="/watermark.html" />
+ </div>
+ <roundcube:object name="message" id="message" class="statusbar" />
</div>
</div>