Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update text in sign in / register button and styling in orcid logo text color #2265

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/app/layout/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
></app-language>
</div>
<div *ngIf="!mobileMenuState" class="col no-gutters">
<!-- <app-user-menu></app-user-menu> -->
<app-user-menu></app-user-menu>
</div>

<app-menu-icon
Expand Down Expand Up @@ -125,16 +125,16 @@
signinRegisterButton
"
>
<!-- <button
<button
mat-stroked-button
class="sign-in-button"
(click)="goto('signin')"
>
<ng-container i18n="#upperCase@@header.signin">SIGN IN</ng-container
>/<ng-container i18n="#upperCase@@header.register"
>REGISTER</ng-container
<ng-container i18n="@@header.signin">Sign in</ng-container
>&nbsp;/&nbsp;<ng-container i18n="@@header.register"
>Register</ng-container
>
</button> -->
</button>
</li>
<li
class="col no-gutters"
Expand Down
3 changes: 1 addition & 2 deletions src/app/layout/header/header.component.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
header.container {
max-width: 100%;
padding: 24px 32px;
margin: 0;
margin: auto;

.logo-menu-container {
.logo-container {
Expand Down
2 changes: 1 addition & 1 deletion src/app/layout/header/header.component.scss-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

.container {
.logo-container {
color: map-get($foreground, 'brand-logo-grey') !important;
color: mat.get-color-from-palette($background, placeholder-grey) !important;
}
}
.top-bar {
Expand Down
4 changes: 2 additions & 2 deletions src/app/layout/user-menu/user-menu.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
[attr.aria-label]="labelSigninRegister"
id="menu-signin-button"
>
<ng-container i18n="#upperCase@@public-layout.sign_in">SIGN IN</ng-container
>/<ng-container i18n="#upperCase@@header.register">REGISTER</ng-container>
<ng-container i18n="@@header.signin">Sign in</ng-container
>&nbsp;/&nbsp;<ng-container i18n="@@header.register">Register</ng-container>
</button>
</section>
<mat-menu #menu="matMenu" class="user-menu" id="cy-user-menu">
Expand Down
Loading