From 842fc85b9a42aaa0ce31c71e05507ed5eeaa6dc4 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt <nukeawhale@gmail.com> Date: Sat, 9 Feb 2013 11:34:25 +0100 Subject: [PATCH] moved iframe height and width fix from js to css --- core/css/styles.css | 2 ++ settings/templates/help.php | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 556ca6b82bb..e6a4bf61995 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -319,6 +319,8 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin .arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -moz-transform:rotate(270deg); -o-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); } .arrow.up { top:-8px; right:2em; } .arrow.down { -webkit-transform:rotate(180deg); -moz-transform:rotate(180deg); -o-transform:rotate(180deg); -ms-transform:rotate(180deg); transform:rotate(180deg); } +.help-includes {overflow: hidden; width: 100%; height: 100%; -moz-box-sizing: border-box; box-sizing: border-box; padding-top: 2.8em; } +.help-iframe {width: 100%; height: 100%; margin: 0;padding: 0; border: 0; overflow: auto;} /* ---- BREADCRUMB ---- */ div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; } diff --git a/settings/templates/help.php b/settings/templates/help.php index 7383fdcf56a..192bac4ad4a 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -10,5 +10,6 @@ <?php } ?> <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a> </div> -<br /><br /> -<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe> \ No newline at end of file +<div class="help-includes"> + <iframe src="<?php echo($_['url']); ?>" class="help-iframe">abc</iframe> +</div> -- GitLab