Permalink
Browse files

BUGFIX:fixed broken styling of iframe in IE for member and group import

  • Loading branch information...
1 parent 80feb8c commit a93f8841d7d010b540198dc877b41963bd83c474 Jeremy Bridson committed with chillu Jan 14, 2013
Showing with 9 additions and 2 deletions.
  1. +2 −2 admin/code/SecurityAdmin.php
  2. +2 −0 admin/css/screen.css
  3. +5 −0 admin/scss/_style.scss
@@ -105,7 +105,7 @@ public function getEditForm($id = null, $fields = null) {
new LiteralField(
'MemberImportFormIframe',
sprintf(
- '<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="250px" border="0">'
+ '<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="250px" frameBorder="0">'
. '</iframe>',
$this->Link('memberimport')
)
@@ -117,7 +117,7 @@ public function getEditForm($id = null, $fields = null) {
new LiteralField(
'GroupImportFormIframe',
sprintf(
- '<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="250px" border="0">'
+ '<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="250px" frameBorder="0">'
. '</iframe>',
$this->Link('groupimport')
)
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1573,6 +1573,11 @@ form.small {
/**
* Import forms
*/
+
+body.SecurityAdmin {
+ background-color: $tab-panel-texture-color; //adds background to import members/groups iframe
+}
+
form.import-form {
ul {
list-style: disc;

0 comments on commit a93f884

Please sign in to comment.