diff --git a/java/code/webapp/WEB-INF/nav/setup_wizard.xml b/java/code/webapp/WEB-INF/nav/setup_wizard.xml index aa2d86aa140d..ab7b27056046 100644 --- a/java/code/webapp/WEB-INF/nav/setup_wizard.xml +++ b/java/code/webapp/WEB-INF/nav/setup_wizard.xml @@ -1,7 +1,7 @@ - /rhn/admin/setup/ProxySettings.do + /rhn/manager/admin/setup/proxy /rhn/admin/setup/MirrorCredentials.do diff --git a/java/spacewalk-java.changes.eth.font b/java/spacewalk-java.changes.eth.font new file mode 100644 index 000000000000..6ebb8249c360 --- /dev/null +++ b/java/spacewalk-java.changes.eth.font @@ -0,0 +1 @@ +- Branding updates, integrate the new SUSE font diff --git a/web/html/src/branding/css/base/components/buttons.suma.scss b/web/html/src/branding/css/base/components/buttons.suma.scss index fa4e72a877b7..986fb5197986 100644 --- a/web/html/src/branding/css/base/components/buttons.suma.scss +++ b/web/html/src/branding/css/base/components/buttons.suma.scss @@ -3,7 +3,7 @@ .btn-primary, .btn-danger { color: inherit; - font-weight: bold; + font-weight: 600; padding: 8px 16px; position: relative; border-style: solid; @@ -181,7 +181,7 @@ th { a { border: none; padding: 0; - font-weight: bold !important; + font-weight: 600 !important; color: $eos-bc-gray-1000 !important; } } diff --git a/web/html/src/branding/css/base/components/tables.scss b/web/html/src/branding/css/base/components/tables.scss index 28d53618aeda..54ad2ad89d4a 100644 --- a/web/html/src/branding/css/base/components/tables.scss +++ b/web/html/src/branding/css/base/components/tables.scss @@ -22,7 +22,7 @@ thead tr { background: transparent !important; - color: $eos-bc-gray-700 !important; + color: $eos-bc-gray-900 !important; .btn-link { padding: 0 !important; @@ -53,6 +53,6 @@ tbody tr td, display: inline-block; width: fit-content; border: none; - color: $eos-bc-gray-700; + color: $eos-bc-gray-900; background-color: $eos-bc-gray-100; } diff --git a/web/html/src/branding/css/base/components/text.scss b/web/html/src/branding/css/base/components/text.scss index fecf0a1e345d..42465d45053e 100644 --- a/web/html/src/branding/css/base/components/text.scss +++ b/web/html/src/branding/css/base/components/text.scss @@ -47,3 +47,8 @@ p { ul { padding-left: 0; } + +b, +strong { + font-weight: 600; +} diff --git a/web/html/src/branding/css/base/components/titles.suma.scss b/web/html/src/branding/css/base/components/titles.suma.scss index 846e4ce87870..6d9ac091e699 100644 --- a/web/html/src/branding/css/base/components/titles.suma.scss +++ b/web/html/src/branding/css/base/components/titles.suma.scss @@ -5,7 +5,7 @@ h4, h5, h6, .subheadline { - font-family: "Poppins", sans-serif; + font-family: $suse; a { color: inherit; diff --git a/web/html/src/branding/css/base/fonts.scss b/web/html/src/branding/css/base/fonts.scss index 738413870fd2..662d1c18d8bc 100644 --- a/web/html/src/branding/css/base/fonts.scss +++ b/web/html/src/branding/css/base/fonts.scss @@ -4,51 +4,6 @@ font-weight: 300; src: local("Lato"), url("~branding/fonts/Lato/Lato-Regular.ttf") format("truetype"); } -@font-face { - font-family: "Lato Bold"; - font-style: normal; - font-weight: 300; - src: local("Lato Bold"), local("LatoBold"), - url("~branding/fonts/Lato/Lato-Bold.ttf") format("truetype"); -} - -@font-face { - font-family: "WorkSans"; - font-style: normal; - font-weight: 300; - src: local("WorkSans"), url("~branding/fonts/WorkSans/static/WorkSans-Regular.ttf") format("truetype"); -} -@font-face { - font-family: "WorkSans Bold"; - font-style: normal; - font-weight: 300; - src: local("WorkSans Bold"), local("WorkSansBold"), - url("~branding/fonts/WorkSans/static/WorkSans-Bold.ttf") format("truetype"); -} - -@font-face { - font-family: "Poppins"; - font-style: normal; - font-weight: 300; - src: url("~branding/fonts/Poppins/poppins-v15-latin-300.eot"); /* IE9 Compat Modes */ - src: local(""), url("~branding/fonts/Poppins/poppins-v15-latin-300.eot?#iefix") format("embedded-opentype"), - /* IE6-IE8 */ url("~branding/fonts/Poppins/poppins-v15-latin-300.woff2") format("woff2"), - /* Super Modern Browsers */ url("~branding/fonts/Poppins/poppins-v15-latin-300.woff") format("woff"), - /* Modern Browsers */ url("~branding/fonts/Poppins/poppins-v15-latin-300.ttf") format("truetype"), - /* Safari, Android, iOS */ url("~branding/fonts/Poppins/poppins-v15-latin-300.svg#Poppins") format("svg"); /* Legacy iOS */ -} - -@font-face { - font-family: "Poppins"; - font-style: normal; - font-weight: 500; - src: url("~branding/fonts/Poppins/poppins-v15-latin-500.eot"); /* IE9 Compat Modes */ - src: local(""), url("~branding/fonts/Poppins/poppins-v15-latin-500.eot?#iefix") format("embedded-opentype"), - /* IE6-IE8 */ url("~branding/fonts/Poppins/poppins-v15-latin-500.woff2") format("woff2"), - /* Super Modern Browsers */ url("~branding/fonts/Poppins/poppins-v15-latin-500.woff") format("woff"), - /* Modern Browsers */ url("~branding/fonts/Poppins/poppins-v15-latin-500.ttf") format("truetype"), - /* Safari, Android, iOS */ url("~branding/fonts/Poppins/poppins-v15-latin-500.svg#Poppins") format("svg"); /* Legacy iOS */ -} @font-face { font-family: "Roboto Light"; @@ -63,3 +18,9 @@ font-weight: 300; src: local("Roboto Bold"), local("RobotoBold"), url("~branding/fonts/Roboto/Roboto-Bold.ttf") format("truetype"); } + +@font-face { + font-family: "SUSE"; + font-weight: 100 800; + src: local("SUSE"), url("~branding/fonts/SUSE/SUSE-VariableFont_wght.ttf") format("truetype"); +} diff --git a/web/html/src/branding/css/base/forms.scss b/web/html/src/branding/css/base/forms.scss index c3111792fa1e..61f0e20f4b52 100644 --- a/web/html/src/branding/css/base/forms.scss +++ b/web/html/src/branding/css/base/forms.scss @@ -5,8 +5,7 @@ } label { - // TODO: Make this `inherit` after the Bootstrap upgrade is complete? - font-weight: 700; + font-weight: inherit; margin-bottom: 0; max-width: 100%; } diff --git a/web/html/src/branding/css/base/tables.scss b/web/html/src/branding/css/base/tables.scss index 50a443fd9bcb..6871de41714a 100644 --- a/web/html/src/branding/css/base/tables.scss +++ b/web/html/src/branding/css/base/tables.scss @@ -23,6 +23,10 @@ td { overflow: hidden; } +th { + font-weight: 600; +} + .table-framed td, .table-framed th { border: 2px solid $gray-lighter; diff --git a/web/html/src/branding/css/base/variables.scss b/web/html/src/branding/css/base/variables.scss index 33947802abf7..ebbf1c8e5c59 100644 --- a/web/html/src/branding/css/base/variables.scss +++ b/web/html/src/branding/css/base/variables.scss @@ -145,13 +145,8 @@ $border-radius-lg: 0; /* Lato variable: font variable to be applied in different text elements */ $lato: "Lato", arial, helvetica, sans-serif; -$lato-bold: "Lato Bold", arial, helvetica, sans-serif; - -/* WorkSans variable: font variable to be applied in different text elements */ -$worksans: "WorkSans", arial, helvetica, sans-serif; -$worksans-bold: "WorkSans Bold", arial, helvetica, sans-serif; - $helvetica: "Helvetica Neue", Helvetica, Arial, sans-serif; +$suse: "SUSE", Helvetica, Arial, sans-serif; /* Manually map Bootstrap's fonts since our setup is a bit unorthodox */ $icon-font-path: "../../bootstrap/fonts/"; diff --git a/web/html/src/branding/css/susemanager-light-variables.scss b/web/html/src/branding/css/susemanager-light-variables.scss index 79f173449512..02995d7e3ec9 100644 --- a/web/html/src/branding/css/susemanager-light-variables.scss +++ b/web/html/src/branding/css/susemanager-light-variables.scss @@ -1,5 +1,5 @@ $body-color: $eos-bc-gray-1000; -$body-font: $lato; +$body-font: $suse; $link-color: $eos-bc-blue-500; $content-area-padding: 0 4em 4em; diff --git a/web/html/src/branding/fonts/SUSE/OFL.txt b/web/html/src/branding/fonts/SUSE/OFL.txt new file mode 100644 index 000000000000..cb41110d4542 --- /dev/null +++ b/web/html/src/branding/fonts/SUSE/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2024 The SUSE Project Authors (https://github.com/SUSE/suse-font) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/web/html/src/branding/fonts/SUSE/README.txt b/web/html/src/branding/fonts/SUSE/README.txt new file mode 100644 index 000000000000..25a23b1833dd --- /dev/null +++ b/web/html/src/branding/fonts/SUSE/README.txt @@ -0,0 +1,70 @@ +SUSE Variable Font +================== + +This download contains SUSE as both a variable font and static fonts. + +SUSE is a variable font with this axis: + wght + +This means all the styles are contained in a single file: + SUSE-VariableFont_wght.ttf + +If your app fully supports variable fonts, you can now pick intermediate styles +that aren’t available as static fonts. Not all apps support variable fonts, and +in those cases you can use the static font files for SUSE: + static/SUSE-Thin.ttf + static/SUSE-ExtraLight.ttf + static/SUSE-Light.ttf + static/SUSE-Regular.ttf + static/SUSE-Medium.ttf + static/SUSE-SemiBold.ttf + static/SUSE-Bold.ttf + static/SUSE-ExtraBold.ttf + +Get started +----------- + +1. Install the font files you want to use + +2. Use your app's font picker to view the font family and all the +available styles + +Learn more about variable fonts +------------------------------- + + https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts + https://variablefonts.typenetwork.com + https://medium.com/variable-fonts + +In desktop apps + + https://theblog.adobe.com/can-variable-fonts-illustrator-cc + https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts + +Online + + https://developers.google.com/fonts/docs/getting_started + https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide + https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts + +Installing fonts + + MacOS: https://support.apple.com/en-us/HT201749 + Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux + Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows + +Android Apps + + https://developers.google.com/fonts/docs/android + https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts + +License +------- +Please read the full license text (OFL.txt) to understand the permissions, +restrictions and requirements for usage, redistribution, and modification. + +You can use them in your products & projects – print or digital, +commercial or otherwise. + +This isn't legal advice, please consider consulting a lawyer and see the full +license for all details. diff --git a/web/html/src/branding/fonts/SUSE/SUSE-VariableFont_wght.ttf b/web/html/src/branding/fonts/SUSE/SUSE-VariableFont_wght.ttf new file mode 100644 index 000000000000..f9b43eeba94b Binary files /dev/null and b/web/html/src/branding/fonts/SUSE/SUSE-VariableFont_wght.ttf differ diff --git a/web/spacewalk-web.changes.eth.font b/web/spacewalk-web.changes.eth.font new file mode 100644 index 000000000000..6ebb8249c360 --- /dev/null +++ b/web/spacewalk-web.changes.eth.font @@ -0,0 +1 @@ +- Branding updates, integrate the new SUSE font