[Rt-commit] rt branch, 5.0/admin-rt-maintenance-callback, updated. rt-5.0.0-4-ged3907e42f

[Aaron Trevena]

The branch, 5.0/admin-rt-maintenance-callback has been updated
       via  ed3907e42f4dfeadc9add9edaee641ce3811ea13 (commit)
       via  27d25acf9db06723028f80eee20f2ed551820779 (commit)
      from  12c37799bf572f0396707fa8e4cb6427d2cb672d (commit)

Summary of changes:
 share/html/Admin/Elements/Portal          | 2 +-
 share/html/Admin/index.html               | 4 ++--
 share/static/css/elevator-light/admin.css | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 27d25acf9db06723028f80eee20f2ed551820779
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Wed Jul 29 21:28:59 2020 +0100

    Fix styling for iframes in Admin page
    
    The iframe is itself a different "document" in the DOM, so you can't target it with elements in the parent dom and it's own dom,
    also the class in admin.css wasn't matching the iframe or it's parents, as the class was used in the iframe source document
    rather than the page containing the iframe

diff --git a/share/static/css/elevator-light/admin.css b/share/static/css/elevator-light/admin.css
index b2462ab396..e19105a6c5 100644
--- a/share/static/css/elevator-light/admin.css
+++ b/share/static/css/elevator-light/admin.css
@@ -27,8 +27,8 @@ ul.list-menu ul li {
  margin-right: 0.5em;
 }
 
-#rt-portal .titlebox iframe {
-    height: 100%;
+iframe.rt-portlet {
+    height: 200px;
     width: 100%;
     border: 0;
 }

commit ed3907e42f4dfeadc9add9edaee641ce3811ea13
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Wed Jul 29 21:38:36 2020 +0100

    Fix styling of iframes in admin page

diff --git a/share/html/Admin/Elements/Portal b/share/html/Admin/Elements/Portal
index 3b56e0412a..40289214b1 100644
--- a/share/html/Admin/Elements/Portal
+++ b/share/html/Admin/Elements/Portal
@@ -46,5 +46,5 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <&| /Widgets/TitleBox, title => loc('RT Portal') &>
-<iframe src="https://bestpractical.com/rt/integration/news?utm_source=rt&utm_medium=iframe&utm_campaign=<%$RT::VERSION%>"></iframe>
+<iframe src="https://bestpractical.com/rt/integration/news?utm_source=rt&utm_medium=iframe&utm_campaign=<%$RT::VERSION%>" class="rt-portlet"></iframe>
 </&>
diff --git a/share/html/Admin/index.html b/share/html/Admin/index.html
index 71b688dfdd..1f3208016a 100644
--- a/share/html/Admin/index.html
+++ b/share/html/Admin/index.html
@@ -48,10 +48,10 @@
 <& /Admin/Elements/Header, Title => loc('RT Administration') &>
   <& /Elements/Tabs &>
 <div class="row">
-<div class="boxcontainer col-md-8">
+<div class="boxcontainer col-md-5">
   <& /Elements/ListMenu, menu => Menu()->child('admin')  &>
 </div>
-<div class="boxcontainer col-md-4">
+<div class="boxcontainer col-md-7">
 % if (RT->Config->Get('ShowRTPortal')) {
 <& /Admin/Elements/Portal &>
 % }

-----------------------------------------------------------------------