This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.2 in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.4.2 by this push: new 73dd876 Issue 50975 - Revise UI branding with new minimized build 73dd876 is described below
commit 73dd876e111aa3f60d1590317907bd8e549b763b Author: Mark Reynolds mreynolds@redhat.com AuthorDate: Tue Mar 24 11:44:10 2020 -0400
Issue 50975 - Revise UI branding with new minimized build
Description: We can no longer use the previous method of text replacement to brand the UI for downstream vs upstream builds. Instead we can use css files to set the branding, and the specfile can do a text replacement on the non-miminized css file.
fixes: https://pagure.io/389-ds-base/issue/50975
Reviewed by: firstyear & mhonek (Thanks!!) --- src/cockpit/389-console/src/css/branding.css | 3 +++ src/cockpit/389-console/src/ds.jsx | 2 +- src/cockpit/389-console/src/index.html | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/cockpit/389-console/src/css/branding.css b/src/cockpit/389-console/src/css/branding.css new file mode 100644 index 0000000..0f6c409 --- /dev/null +++ b/src/cockpit/389-console/src/css/branding.css @@ -0,0 +1,3 @@ +#main-banner::before { + content: "389 Directory Server Management"; +} diff --git a/src/cockpit/389-console/src/ds.jsx b/src/cockpit/389-console/src/ds.jsx index c003d16..f83ce55 100644 --- a/src/cockpit/389-console/src/ds.jsx +++ b/src/cockpit/389-console/src/ds.jsx @@ -35,6 +35,7 @@ import { Button } from "patternfly-react"; import "./css/ds.css"; +import "./css/branding.css";
const staticStates = { noPackage: ( @@ -532,7 +533,6 @@ export class DSInstance extends React.Component { pageLoadingState.state !== "noPackage" ? ( <div className="ds-logo" hidden={pageLoadingState.state === "loading"}> <h2 className="ds-logo-style" id="main-banner"> - 389 Directory Server Management <div className="dropdown ds-server-action"> <select className="btn btn-default dropdown" diff --git a/src/cockpit/389-console/src/index.html b/src/cockpit/389-console/src/index.html index a243e1e..1278844 100644 --- a/src/cockpit/389-console/src/index.html +++ b/src/cockpit/389-console/src/index.html @@ -1,13 +1,14 @@ <!DOCTYPE html> <html lang="en"> <head> - <title>389 Directory Server</title> + <title>Directory Server Management</title> <meta charset="utf-8"> <meta name="description" content=""> <meta name="viewport" content="width=device-width, initial-scale=1"> <script type="text/javascript" src="../base1/cockpit.js"></script> <link rel="stylesheet" href="../base1/patternfly.css"> <link href="css/ds.css" type="text/css" rel="stylesheet"> + <link href="css/branding.css" type="text/css" rel="stylesheet"> </head>
@@ -16,4 +17,3 @@ <script src="index.js"></script> </body> </html> -