From c783e83af72a9c4ae654b6f72ae319f8da482f37 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Jan 21 2020 16:16:12 +0000 Subject: debranding and ipaplatform fixes --- diff --git a/SOURCES/9001-Update-ipa.css.patch b/SOURCES/9001-Update-ipa.css.patch new file mode 100644 index 0000000..8bd3498 --- /dev/null +++ b/SOURCES/9001-Update-ipa.css.patch @@ -0,0 +1,31 @@ +From a82e5eb637463755642f88fe94badff85d6e50e5 Mon Sep 17 00:00:00 2001 +From: Alain Reguera Delgado +Date: Sat, 23 Nov 2019 18:42:41 -0300 +Subject: [PATCH 9001/9003] Update ipa.css + +- Previously, the CentOS logos doesn't look the same width than CentOS + logos in cockpit ui. So, when you change between them, a visual + difference affects calls the attention (are we using two different + branding?). In order to make these visual transition from one app to + another consistent, changed the logo width to look the same both in + cockpit and ipa ui. +--- + install/ui/ipa.css | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/install/ui/ipa.css b/install/ui/ipa.css +index 2921f43..e56caeb 100644 +--- a/install/ui/ipa.css ++++ b/install/ui/ipa.css +@@ -559,3 +559,8 @@ table.scrollable tbody { + font-weight: bold; + font-size: 1.1em; + } ++ ++/* --- CentOS Logo on the top-right corner --- */ ++#badge img { ++ width: 225px; ++} +-- +2.23.0 + diff --git a/SOURCES/9002-Update-login.less.patch b/SOURCES/9002-Update-login.less.patch new file mode 100644 index 0000000..3c8c3fd --- /dev/null +++ b/SOURCES/9002-Update-login.less.patch @@ -0,0 +1,39 @@ +From 25aecc3b5de468ac3c9d1cf80681f2b6625eb50b Mon Sep 17 00:00:00 2001 +From: Alain Reguera Delgado +Date: Sat, 23 Nov 2019 18:46:38 -0300 +Subject: [PATCH 9002/9003] Update login.less + +--- + install/ui/less/login.less | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/install/ui/less/login.less b/install/ui/less/login.less +index 8996560..4c39bec 100644 +--- a/install/ui/less/login.less ++++ b/install/ui/less/login.less +@@ -26,7 +26,7 @@ + + .login-pf-body { + height: 100%; +- background: @login-bg-color url("@{img-path}/@{img-bg-login}") repeat-x 50% 0; ++ background: @login-bg-color url("@{img-path}/@{img-bg-login}") no-repeat 100% 0; + background-size: auto; + color: #fff; + +@@ -50,10 +50,10 @@ + // 768px = @screen-sm-min) + @media (min-width: 768px) { + .login-pf-body { +- background-size: 100% auto; ++ background-size: auto; + } + } + + @media (max-height: 300px) { + .reset-login-pf-height; +-} +\ No newline at end of file ++} +-- +2.23.0 + diff --git a/SOURCES/9003-Update-variables.less.patch b/SOURCES/9003-Update-variables.less.patch new file mode 100644 index 0000000..795cd01 --- /dev/null +++ b/SOURCES/9003-Update-variables.less.patch @@ -0,0 +1,25 @@ +From 8e4746d4b697302b9573dd6f8b2e28f12ca6669b Mon Sep 17 00:00:00 2001 +From: Alain Reguera Delgado +Date: Sat, 23 Nov 2019 18:46:47 -0300 +Subject: [PATCH 9003/9003] Update variables.less + +--- + install/ui/less/variables.less | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/install/ui/less/variables.less b/install/ui/less/variables.less +index 5a7a3ea..ca63d0c 100644 +--- a/install/ui/less/variables.less ++++ b/install/ui/less/variables.less +@@ -1,5 +1,5 @@ + // FreeIPA Less Variables + + @img-path: '../images'; +-@img-bg-login: 'login-screen-background.jpg'; +-@login-bg-color: #25292d; +\ No newline at end of file ++@img-bg-login: 'login-screen-background.png'; ++@login-bg-color: #101010; +-- +2.23.0 + diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index 257a839..93466ef 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -168,6 +168,13 @@ Patch1001: 1001-Change-branding-to-IPA-and-Identity-Management.patch Patch1002: 1002-4.8.0-Remove-csrgen.patch # RHEL spec file only: END +# CentOS spec file only: START +Source9001: system-logo-icon.png +Patch9001: 9001-Update-ipa.css.patch +Patch9002: 9002-Update-login.less.patch +Patch9003: 9003-Update-variables.less.patch +# CentOS spec file only: END + # For the timestamp trick in patch application BuildRequires: diffstat @@ -794,7 +801,8 @@ export PYTHON=%{__python3} %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ - %{linter_options} + %{linter_options} \ + --with-ipaplatform=rhel # run build in default dir # -Onone is workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1398405