Fixes #23270: Use consistent fonts in Rudder interface - plugins

Normation · Aug 11, 2023 · 1d918a7 · 1d918a7
1 parent 718256c
commit 1d918a7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/api-authorizations/src/main/resources/toserve/apiauthorizations/media.css b/api-authorizations/src/main/resources/toserve/apiauthorizations/media.css
@@ -133,7 +133,7 @@
   transition-duration:.2s;
   color: #999;
   display:inline-block;
-  font-family:monospace;
+  font-family:var(--font-mono);
   margin-right:2px;
   font-size: 0.9em
 }

diff --git a/auth-backends/src/main/resources/toserve/authbackends/auth-backends.css b/auth-backends/src/main/resources/toserve/authbackends/auth-backends.css
@@ -41,7 +41,7 @@
 /* CONTAINER */
 #plugin-main .inner-portlet{
   padding     : 0 15px;
-  font-family : 'Source Sans Pro','Helvetica Neue',Helvetica,Arial,sans-serif;
+  font-family : var(--font-sans);
   font-weight : 400;
   font-size   : 14px;
 }

diff --git a/branding/src/main/resources/toserve/branding/media.css b/branding/src/main/resources/toserve/branding/media.css
@@ -21,7 +21,7 @@ label.form-control,label.input-group-addon{
 label.form-control > i {
   font-weight: normal;
   opacity: .8;
-  font-family: monospace;
+  font-family: var(--font-mono);
   font-size: .9em;
   margin-left: 2px;
   font-style: normal;

diff --git a/change-validation/src/main/resources/toserve/changevalidation/change-validation.css b/change-validation/src/main/resources/toserve/changevalidation/change-validation.css
@@ -200,7 +200,7 @@ ul.clipboard-list > li:last-child{
 
 #plugin-main .inner-portlet {
   padding: 5px 15px 40px 15px;
-  font-family: 'Source Sans Pro','Helvetica Neue',Helvetica,Arial,sans-serif;
+  font-family: var(--font-sans);
   font-weight: 400;
   font-size: 14px;
 }
@@ -685,7 +685,7 @@ body.sidebar-mini.sidebar-collapse #supervised-targets-app .toolbar {
 }
 
 .empty-box-msg {
-  font-family : 'PT Sans', sans-serif;
+  font-family : var(--font-sans);
   font-size   : 20px;
   margin-top: 16px;
 }
diff --git a/openscap/src/main/resources/template/OpenScapPoliciesManagement.html b/openscap/src/main/resources/template/OpenScapPoliciesManagement.html
@@ -1,9 +1,11 @@
 <!doctype html>
 <html>
+
 <head>
   <meta charset="utf8" />
   <!-- everything here will be ignored and replaced by common-layout -->
 </head>
+
 <body data-lift-content-id="plugin-main">
   <div id="plugin-main" data-lift="surround?with=common-layout;at=content">
     <head_merge>
@@ -22,13 +24,16 @@ <h2>OpenSCAP Policies</h2>
     <h3>API endpoint and format</h3>
 
     <p>The API has one endpoint:
-      <ul>
-        <li><span style="font-family: monospace;">GET /latest/openscap/report/{nodeId}</span></p></li>
-       <!-- <li><span style="font-family: monospace;">GET /latest/openscap/sanitized/{nodeId}</span></p></li> -->
-      </ul>
-    <p>So for example, with curl: <span style="font-family: monospace;">curl -k -H "X-API-Token: 5YJnb4EenqDHzwx0U0eTPWWhgjTJ8mkk" -X GET 'https://your-server/rudder/api/latest/openscap/report/e2ba6527-936d-48b7-b2e8-73167ebdd783'</span></p>
+    <ul>
+      <li><span style="font-family: var(--font-mono);">GET /latest/openscap/report/{nodeId}</span></p>
+      </li>
+      <!-- <li><span style="font-family: monospace;">GET /latest/openscap/sanitized/{nodeId}</span></p></li> -->
+    </ul>
+    <p>So for example, with curl: <span style="font-family: var(--font-mono);">curl -k -H "X-API-Token:
+        5YJnb4EenqDHzwx0U0eTPWWhgjTJ8mkk" -X GET
+        'https://your-server/rudder/api/latest/openscap/report/e2ba6527-936d-48b7-b2e8-73167ebdd783'</span></p>
     <p>It returns, if it exists, the OpenSCAP report generated for node e2ba6527-936d-48b7-b2e8-73167ebdd783</p>
   </div>
 </body>
-</html>
 
+</html>
diff --git a/user-management/src/main/resources/toserve/usermanagement/user-management.css b/user-management/src/main/resources/toserve/usermanagement/user-management.css
@@ -39,7 +39,7 @@
 
 #plugin-main .inner-portlet {
   padding     : 0 15px;
-  font-family : 'Source Sans Pro','Helvetica Neue',Helvetica,Arial,sans-serif;
+  font-family : var(--font-sans);
   font-weight : 400;
   font-size   : 14px;
 }