Merge pull request sakaiproject#2295 from alejandrogj/SAK-30851

SAK-30851 Misplaced legend on admin site perms
axxter99 · Apr 22, 2016 · 50cb496 · 50cb496
2 parents f6d06cf + 30543bc
commit 50cb496
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/site/admin-perms-tool/src/main/webapp/WEB-INF/jsp/sitePerms.jsp b/site/admin-perms-tool/src/main/webapp/WEB-INF/jsp/sitePerms.jsp
@@ -60,7 +60,7 @@
             <div style="float:left;width:50%;">
               <fieldset>
               <legend><span><spring:message code="siterole.sitetype.title" /></span></legend>
-              <div style="font-style: italic;"><spring:message code="siterole.sitetype.header" /></div>
+              <div class="permsInstruction"><em><spring:message code="siterole.sitetype.header" /></em></div>
               <ul style="margin: 0px;">
                   <c:forEach var="siteType" items="${siteTypes}" varStatus="counter">
                   <li class="checkbox">
@@ -73,7 +73,7 @@
 
               <fieldset>
               <legend><span><spring:message code="siterole.role.title" /></span></legend>
-              <div style="font-style: italic;"><spring:message code="siterole.role.header" /></div>
+              <div class="permsInstruction"><em><spring:message code="siterole.role.header" /></em></div>
               <ul style="margin: 0px;">
                   <c:forEach var="role" items="${roles}" varStatus="counter">
                   <li class="checkbox">
@@ -101,7 +101,7 @@
             <div style="float:right;width:50%;">
               <fieldset>
               <legend><span><spring:message code="siterole.perm.title" /></span></legend>
-              <div style="font-style: italic;"><spring:message code="siterole.perm.header" /></div>
+              <div class="permsInstruction"><em><spring:message code="siterole.perm.header" /></em></div>
               <ul style="margin: 0px;">
                   <c:forEach var="permission" items="${permissions}" varStatus="counter">
                   <li class="checkbox">

diff --git a/site/admin-perms-tool/src/main/webapp/css/AdminSitePerms.css b/site/admin-perms-tool/src/main/webapp/css/AdminSitePerms.css
@@ -31,20 +31,20 @@
     width: 80%;
 }
 .permsControls legend {
-    position: absolute;
-    top: -2px;
-    background: #fff;
-    padding: 6px 18px;
-    border: 2px groove threedface;
     border-top: none;
-    box-shadow: inset 0 -5px 5px rgba(0,0,0,.2);
     text-shadow: 1px 1px 2px rgba(0,0,0,.3);
     font-weight: bold;
+    border: 0;
+    width: auto;
+    padding-bottom: 0.5em;
+}
+
+.permsInstruction {
+    position: relative;
+    top: -1em;
 }
 .permsControls legend span {
     display: block;
-    margin: -16px;
-    background: #fff;
     padding: 0px 6px;
 }
 .permsControls .button label {