moved iframe height and width fix from js to css

diff --git a/core/css/styles.css b/core/css/styles.css
index 556ca6b82bbfb04e70468e630f83b264974fae42..e6a4bf6199530571f156fec6d4939e9b8802465d 100644 (file)
--- 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 7383fdcf56a069d95a208a7e3de6f934da97937b..315cbfdb9a2940f83fd3167a388b3a09cf9cf5f9 100644 (file)
--- 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>