diff --git a/src/app.config.json b/src/app.config.json index 5e5ec7c31..16e7b51ad 100644 --- a/src/app.config.json +++ b/src/app.config.json @@ -3,8 +3,8 @@ "providers": "ECM", "authType" : "BASIC", "application": { - "name": "Alfresco Example Content Application", - "logo": "assets/images/alfresco-logo-white.svg", + "name": "Alfresco", + "logo": "assets/images/alfresco-logo-flower.svg", "copyright": "© 2017 - 2018 Alfresco Software, Inc. All rights reserved." }, diff --git a/src/app/components/current-user/current-user.component.theme.scss b/src/app/components/current-user/current-user.component.theme.scss index 449fad6f7..58eb01df9 100644 --- a/src/app/components/current-user/current-user.component.theme.scss +++ b/src/app/components/current-user/current-user.component.theme.scss @@ -1,6 +1,6 @@ @mixin aca-current-user-theme($theme) { $background: map-get($theme, background); - $am-avatar-size: 40px; + $am-avatar-size: 35px; .aca-current-user { font-weight: lighter; @@ -15,7 +15,7 @@ width: $am-avatar-size; height: $am-avatar-size; line-height: $am-avatar-size; - font-size: 1.2em; + font-size: 1em; text-align: center; color: inherit; border-radius: 100%; @@ -29,10 +29,10 @@ overflow: hidden; text-overflow: ellipsis; display:inline-block; - height: 20px; + height: 18px; font-size: 14px; line-height: 1.43; - letter-spacing: -0.2px; + letter-spacing: -0.3px; } @media screen and ($mat-small) { diff --git a/src/app/components/layout/layout.component.html b/src/app/components/layout/layout.component.html index 89f09a7fc..e9864a81c 100644 --- a/src/app/components/layout/layout.component.html +++ b/src/app/components/layout/layout.component.html @@ -17,7 +17,9 @@ diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html index e5a80250b..2d043c35c 100644 --- a/src/app/components/login/login.component.html +++ b/src/app/components/login/login.component.html @@ -2,6 +2,7 @@ [copyrightText]="'application.copyright' | adfAppConfig" providers="ECM" successRoute="/personal-files" + [logoImageUrl]="'./assets/images/alfresco-logo.svg'" [showRememberMe]="false" [showLoginActions]="false"> diff --git a/src/app/components/search/search-input-control/search-input-control.component.scss b/src/app/components/search/search-input-control/search-input-control.component.scss index cb1dd538d..3dc6f9feb 100644 --- a/src/app/components/search/search-input-control/search-input-control.component.scss +++ b/src/app/components/search/search-input-control/search-input-control.component.scss @@ -2,7 +2,7 @@ width: 1em; .mat-icon { - font-size: 110%; + font-size: 100%; cursor: pointer; } } diff --git a/src/app/components/search/search-input/search-input.component.theme.scss b/src/app/components/search/search-input/search-input.component.theme.scss index 8be93e791..994ed7d5f 100644 --- a/src/app/components/search/search-input/search-input.component.theme.scss +++ b/src/app/components/search/search-input/search-input.component.theme.scss @@ -15,14 +15,22 @@ .mat-form-field-underline { background-color: mat-color($background, card); } + + .adf-input-form-field-divider { + font-size: 14px; + } } - .adf-search-button { + .adf-search-button.mat-icon-button { left: -15px; margin-left: 15px; align-items: flex-start; font: 400 11px system-ui; color: mat-color($background, card); + + .mat-icon { + font-size: 24px; + } } } } diff --git a/src/app/ui/overrides/adf-layout-header.theme.scss b/src/app/ui/overrides/adf-layout-header.theme.scss index 4d13d5551..f408335c4 100644 --- a/src/app/ui/overrides/adf-layout-header.theme.scss +++ b/src/app/ui/overrides/adf-layout-header.theme.scss @@ -3,10 +3,23 @@ .adf-layout-header { .mat-toolbar-single-row { + color: #ffffff !important; + .adf-app-logo { - width: 100px; - height: 50px; - margin-left: 40px; + margin-left: 6px; + vertical-align: middle; + margin-top: -3px; + } + .adf-app-title { + letter-spacing: -0.3px; + } + .mat-icon-button { + margin-right: 0; + + .mat-icon { + font-size: 29px; + padding: 0 5px 0 0; + } } } diff --git a/src/assets/images/alfresco-logo-flower.svg b/src/assets/images/alfresco-logo-flower.svg new file mode 100644 index 000000000..272ef392e --- /dev/null +++ b/src/assets/images/alfresco-logo-flower.svg @@ -0,0 +1,147 @@ + + + +image/svg+xml + diff --git a/src/assets/images/alfresco-logo.svg b/src/assets/images/alfresco-logo.svg new file mode 100644 index 000000000..d0ad8d8b3 --- /dev/null +++ b/src/assets/images/alfresco-logo.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +