diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml index 68049c6c91..a8cb03c00f 100644 --- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml +++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml @@ -16,7 +16,7 @@ - +
- +

Welcome to your Umbraco installation

You're seeing this wonderful page because your website doesn't contain any published content yet.

diff --git a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs index e209e45cc4..f08ab2abe5 100644 --- a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs @@ -152,8 +152,9 @@ public class ContentSettings internal const string StaticMacroErrors = "Inline"; internal const string StaticDisallowedUploadFiles = "ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,xamlx"; internal const bool StaticShowDeprecatedPropertyEditors = false; - internal const string StaticLoginBackgroundImage = "assets/img/login.svg"; - internal const string StaticLoginLogoImage = "assets/img/application/umbraco_logo_white.svg"; + internal const string StaticLoginBackgroundImage = "assets/img/login.jpg"; + internal const string StaticLoginLogoImage = "assets/img/application/umbraco_logo_blue.svg"; + internal const string StaticLoginLogoImageAlternative = "assets/img/application/umbraco_logo_blue.svg"; internal const bool StaticHideBackOfficeLogo = false; internal const bool StaticDisableDeleteWhenReferenced = false; internal const bool StaticDisableUnpublishWhenReferenced = false; @@ -219,11 +220,21 @@ public class ContentSettings public string LoginBackgroundImage { get; set; } = StaticLoginBackgroundImage; /// - /// Gets or sets a value for the path to the login screen logo image. + /// Gets or sets a value for the path to the login screen logo image + /// shown on top of the background image set in . /// + /// The alternative version of this logo can be found at . [DefaultValue(StaticLoginLogoImage)] public string LoginLogoImage { get; set; } = StaticLoginLogoImage; + /// + /// Gets or sets a value for the path to the login screen logo image when shown on top + /// of a light background (e.g. in mobile resolutions). + /// + /// This is the alternative version to the regular logo found at . + [DefaultValue(StaticLoginLogoImageAlternative)] + public string LoginLogoImageAlternative { get; set; } = StaticLoginLogoImageAlternative; + /// /// Gets or sets a value indicating whether to hide the backoffice umbraco logo or not. /// diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/bs.xml b/src/Umbraco.Core/EmbeddedResources/Lang/bs.xml index d7093a2ba5..3a715d6732 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/bs.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/bs.xml @@ -856,7 +856,7 @@ Korisničko ime Vrijednost Pogled - Dobrodošli... + Dobrodošli Širina Da Mapa diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml b/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml index 347f963e70..7332cd9300 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml @@ -714,7 +714,7 @@ Uživatelské jméno Hodnota Pohled - Vítejte... + Vítejte Šířka Ano Složka diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml b/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml index 86520b6d03..f387323d65 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml @@ -596,7 +596,7 @@ Ni ellir ailadeiladu'r mynegai hwn oherwydd nad yw wedi'i aseinio IIndexPopulator - + Cynnwys yn y mynegai Ni ddarganfuwyd unrhyw ganlyniadau Dangos %0% - %1% o %2% canlyniad(au) - Tudalen %3% o %4% @@ -822,7 +822,7 @@ Enw defnyddiwr Gwerth Gwedd - Croeso... + Croeso Lled Ie Ffolder diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml index 3e01c0de9b..b72447aca7 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml @@ -849,7 +849,7 @@ Brugernavn Værdi Vis - Velkommen... + Velkommen Bredde Ja Mappe diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/de.xml b/src/Umbraco.Core/EmbeddedResources/Lang/de.xml index 1dce3c2997..a500b0f385 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/de.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/de.xml @@ -892,7 +892,7 @@ Validieren Wert Ansicht - Willkommen ... + Willkommen Breite Ja Ordner diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml index 3c7bb7b5ca..c1aabf6f51 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml @@ -869,7 +869,7 @@ Username Value View - Welcome... + Welcome Width Yes Folder diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index ed1b923d66..6b9c17eeb7 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -899,7 +899,7 @@ Validate Value View - Welcome... + Welcome Width Yes Folder diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/es.xml b/src/Umbraco.Core/EmbeddedResources/Lang/es.xml index 25f183433a..54eac7cbf7 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/es.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/es.xml @@ -556,7 +556,7 @@ Nombre de usuario Valor Ver - Bienvenido... + Bienvenido Ancho Si Carpeta diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml index a753a054fe..041572eea2 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml @@ -727,7 +727,7 @@ Nom d'utilisateur Valeur Voir - Bienvenue... + Bienvenue Largeur Oui Dossier diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/he.xml b/src/Umbraco.Core/EmbeddedResources/Lang/he.xml index f0427bbae1..615020ef3a 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/he.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/he.xml @@ -328,7 +328,7 @@ שם משתמש ערך צפיה - ברוכים הבאים... + ברוכים הבאים רוחב כן Reorder diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/hr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/hr.xml index 51847f3585..7f4b41e199 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/hr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/hr.xml @@ -846,7 +846,7 @@ Korisničko ime Vrijednost Pogled - Dobrodošli... + Dobrodošli Širina Da Mapa diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/it.xml b/src/Umbraco.Core/EmbeddedResources/Lang/it.xml index 7c57a290fe..874f497491 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/it.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/it.xml @@ -863,7 +863,7 @@ Valore Vedi - Benvenuto... + Benvenuto Larghezza Si Cartella diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml index 9a94e7d924..f78576381e 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml @@ -417,7 +417,7 @@ ユーザー名 値 ビュー - ようこそ... + ようこそ 幅 はい フォルダー diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml index 4aa0d4ad89..c2034dcaee 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml @@ -328,7 +328,7 @@ 사용자 값 보기 - 환영합니다... + 환영합니다 너비 예 Reorder diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml b/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml index c2784b3a9c..0191b85b17 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml @@ -382,7 +382,7 @@ Brukernavn Verdi Visning - Velkommen... + Velkommen Bredde Ja Mappe diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml b/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml index 600a1724c1..9a32dfd999 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml @@ -823,7 +823,7 @@ Gebruikersnaam Waarde Bekijk - Welkom... + Welkom Breedte Ja Map diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml b/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml index 53aa716792..2f13780d04 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml @@ -523,7 +523,7 @@ Nazwa użytkownika Wartość Widok - Witaj... + Witaj Szerokość Tak Folder diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml b/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml index 29ae77a2d8..40a5a8a59b 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml @@ -326,7 +326,7 @@ Usuário Valor Ver - Bem Vindo(a)... + Bem Vindo(a) Largura Sim Reorder diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml index b6d8a4a6b8..6ca52d46df 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml @@ -574,7 +574,7 @@ Имя пользователя Значение Просмотр - Добро пожаловать... + Добро пожаловать Ширина Да Пересортировать diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml index 966089415a..e81175f5e4 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml @@ -114,7 +114,7 @@ %1% mer.]]> - %1% för många.]]> + %1% för många.]]> %0%]]> @@ -223,7 +223,7 @@ Publicerad (osparade ändringar) Inga undernoder har lagts till Inga ändringar har gjorts - Ej skapad + Ej skapad Ja, ta bort @@ -543,7 +543,7 @@ Användare Användarnamn Värde - Välkommen... + Välkommen Bredd Titta på Ja diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml index 1e1504f44a..84f1768168 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml @@ -739,7 +739,7 @@ Kullanıcı adı Değer Görüntüle - Hoş geldiniz ... + Hoş geldiniz Genişlik Evet Klasör diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ua.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ua.xml index 599bd77426..aaa29e698a 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ua.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ua.xml @@ -574,7 +574,7 @@ Ім'я користувача Значення Перегляд - Ласкаво просимо... + Ласкаво просимо Ширина Так Пересортувати diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs index cc517ba178..c3ab60f059 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs @@ -269,6 +269,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers "imageFileTypes", "loginBackgroundImage", "loginLogoImage", + "loginLogoImageAlternative", "canSendRequiredEmail", "usernameIsEmail", "hideBackofficeLogo", @@ -619,6 +620,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers {"allowPasswordReset", _securitySettings.AllowPasswordReset}, {"loginBackgroundImage", _contentSettings.LoginBackgroundImage}, {"loginLogoImage", _contentSettings.LoginLogoImage }, + {"loginLogoImageAlternative", _contentSettings.LoginLogoImageAlternative }, {"hideBackofficeLogo", _contentSettings.HideBackOfficeLogo }, {"disableDeleteWhenReferenced", _contentSettings.DisableDeleteWhenReferenced }, {"disableUnpublishWhenReferenced", _contentSettings.DisableUnpublishWhenReferenced }, diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs index 8117007986..32261eefef 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs @@ -7,7 +7,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security; /// public class BackOfficeExternalLoginProviderOptions { - private string _buttonStyle = "btn-openid"; + private string _buttonStyle = string.Empty; public BackOfficeExternalLoginProviderOptions( string buttonStyle, @@ -30,8 +30,11 @@ public class BackOfficeExternalLoginProviderOptions } /// - /// Gets or sets the icon to use for the login button. + /// Gets or sets the style of the login button. /// + /// + /// The default look is an outlined button, which has been optimized for the login screen. + /// [Obsolete("This is no longer used and will be removed in V15. Please set the ButtonLook and ButtonColor properties instead.")] public string ButtonStyle { @@ -71,12 +74,18 @@ public class BackOfficeExternalLoginProviderOptions /// Gets or sets the look to use for the login button. /// See the UUI documentation for more details: https://uui.umbraco.com/?path=/story/uui-button--looks-and-colors. /// + /// + /// The default value is , which has been optimized for the login screen. + /// public UuiButtonLook ButtonLook { get; set; } = UuiButtonLook.Outline; /// /// Gets or sets the color to use for the login button. /// See the UUI documentation for more details: https://uui.umbraco.com/?path=/story/uui-button--looks-and-colors. /// + /// + /// The default value is , which has been optimized for the login screen. + /// public UuiButtonColor ButtonColor { get; set; } = UuiButtonColor.Default; /// diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png index 2ddef4b53b..f134fd3006 100644 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png and b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.svg new file mode 100644 index 0000000000..54cab15d6a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@2x.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@2x.png deleted file mode 100644 index c57755d62c..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@2x.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@3x.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@3x.png deleted file mode 100644 index 7ed68fb3fc..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@3x.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_black.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_black.png deleted file mode 100644 index d3c6dc56c2..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_black.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.png deleted file mode 100644 index 72b2fe470a..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.svg new file mode 100644 index 0000000000..309899db48 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg new file mode 100644 index 0000000000..578bf592f6 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg index ce15dd3092..3fc811eaba 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg @@ -1,41 +1,39 @@ + + viewBox="0 0 1025.1 908.1" style="enable-background:new 0 0 1025.1 908.1;" xml:space="preserve"> - - - - - - - - - - + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_white.svg new file mode 100644 index 0000000000..7193f3ed0b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_white.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg index c0bdbdd40c..01f7260cd3 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg @@ -1,41 +1,51 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logomark_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logomark_white.svg deleted file mode 100644 index 08c2264337..0000000000 --- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logomark_white.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg b/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg index 06204510d0..3adc277159 100644 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg and b/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/login.svg b/src/Umbraco.Web.UI.Client/src/assets/img/login.svg deleted file mode 100644 index 37499a996c..0000000000 --- a/src/Umbraco.Web.UI.Client/src/assets/img/login.svg +++ /dev/null @@ -1,996 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/logo.png b/src/Umbraco.Web.UI.Client/src/assets/img/logo.png deleted file mode 100644 index ec59683c50..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/logo.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js index 71171c2a73..49a7346c76 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js @@ -12,9 +12,7 @@ scope.authenticated = null; scope.user = null; scope.avatar = [ - { value: "assets/img/application/logo.png" }, - { value: "assets/img/application/logo@2x.png" }, - { value: "assets/img/application/logo@3x.png" } + { value: "assets/img/application/logo.svg" } ]; scope.hideBackofficeLogo = Umbraco.Sys.ServerVariables.umbracoSettings.hideBackofficeLogo; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js index e2c6d87e19..836011c4f6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js @@ -20,6 +20,7 @@ vm.backgroundImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginBackgroundImage; vm.logoImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginLogoImage; + vm.logoImageAlternative = Umbraco.Sys.ServerVariables.umbracoSettings.loginLogoImageAlternative; vm.allowPasswordReset = Umbraco.Sys.ServerVariables.umbracoSettings.canSendRequiredEmail && Umbraco.Sys.ServerVariables.umbracoSettings.allowPasswordReset; vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js index 9ad475ad85..5e97a281f9 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js @@ -30,9 +30,7 @@ Use this directive to render an avatar. var vm = this; vm.avatar = [ - { value: "assets/logo.png" }, - { value: "assets/logo@2x.png" }, - { value: "assets/logo@3x.png" } + { value: "assets/img/application/logo.svg" } ]; } @@ -55,7 +53,7 @@ Use this directive to render an avatar. function AvatarDirective(localizationService) { function link(scope, element, attrs, ctrl) { - + var eventBindings = []; scope.initials = ""; scope.avatarAlt = ""; diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/nonodes.less b/src/Umbraco.Web.UI.Client/src/less/pages/nonodes.less index 1bf9aab829..89fbd269c0 100644 --- a/src/Umbraco.Web.UI.Client/src/less/pages/nonodes.less +++ b/src/Umbraco.Web.UI.Client/src/less/pages/nonodes.less @@ -296,10 +296,6 @@ section article>div { } section .logo { - background-image: url(../img/logo.png); - background-repeat: no-repeat; - width: 91px; - height: 91px; margin: 0 auto; } diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html index fae3543429..29294a08c4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html @@ -41,7 +41,7 @@ ng-focus="keepLogoModal()" ng-blur="hideLogoModal()" ng-if="logoModal.show"> - Umbraco — The Friendly CMS @@ -122,7 +122,6 @@ color="secondary" name="{{user.name}}" img-src="{{avatar[0].value}}" - img-srcset="{{avatar[1].value}} 2x, {{avatar[2].value}} 3x" > diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html index 242b4eab9c..952a40fa5c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html @@ -1,8 +1,9 @@