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

Task 692. Usernames' and providers' styles in header have been fixed … #706

Merged
merged 18 commits into from
Dec 10, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1298650
Task 692. Usernames' and providers' styles in header have been fixed …
gmakeev Dec 3, 2021
e2d5d4c
Usernames' and providers' font styles in header have been fixed.
gmakeev Dec 3, 2021
74233b4
Merge branch 'develop' into Fix-fonts-in-header/#692/Makeev
gmakeev Dec 3, 2021
5a27d3c
Merge branch 'develop' of https://github.com/ita-social-projects/OoS-…
gmakeev Dec 3, 2021
56cfdd2
Merge branch 'develop' into Fix-fonts-in-header/#692/Makeev
gmakeev Dec 3, 2021
ffcc17f
Merge branch 'develop' of https://github.com/ita-social-projects/OoS-…
gmakeev Dec 3, 2021
ec138cb
Merge branch 'develop' of https://github.com/ita-social-projects/OoS-…
gmakeev Dec 7, 2021
2fd6f84
The method of obtaining the name of the parent and teacher has been o…
gmakeev Dec 7, 2021
6adb40d
Merge branch 'develop' into Fix-fonts-in-header/#692/Makeev
gmakeev Dec 7, 2021
9907663
Merge branch 'Fix-fonts-in-header/#692/Makeev' of https://github.com/…
gmakeev Dec 7, 2021
4be3ab1
The method of obtaining the name of the parent and teacher has been o…
gmakeev Dec 7, 2021
19d00a0
Code that was commented out has been removed from header.component.ts…
gmakeev Dec 7, 2021
9266a4c
Merge branch 'develop' into Fix-fonts-in-header/#692/Makeev
gmakeev Dec 7, 2021
5b35f66
Merge branch 'develop' into Fix-fonts-in-header/#692/Makeev
gmakeev Dec 7, 2021
c6c1ad0
Merge branch 'develop' into Fix-fonts-in-header/#692/Makeev
gmakeev Dec 7, 2021
cc044c3
Merge branch 'develop' into Fix-fonts-in-header/#692/Makeev
gmakeev Dec 8, 2021
d9fdf1c
Merge branch 'develop' into Fix-fonts-in-header/#692/Makeev
gmakeev Dec 9, 2021
ecafcab
Merge branch 'develop' into Fix-fonts-in-header/#692/Makeev
gmakeev Dec 10, 2021
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
6 changes: 3 additions & 3 deletions src/app/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ <h2 class="header_descr">
</button>

<div class="header_username" [matMenuTriggerFor]="log">
<ng-container>{{(user$ | async).firstName}} {{(user$ | async).lastName}}</ng-container>
<ng-container>{{(user$ | async).lastName}} {{(user$ | async).firstName | slice:0:1}}.{{(user$ | async).middleName | slice:0:1}}.</ng-container>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please generate user name in ts

</div>
<button mat-icon-button [matMenuTriggerFor]="log">
<mat-icon>arrow_drop_down</mat-icon>
Expand All @@ -91,7 +91,7 @@ <h2 class="header_descr">

<mat-menu #log="matMenu" class="header_menu">
<button mat-menu-item class="header_menu_account-button">
<ng-container>{{(user$ | async).firstName}} {{(user$ | async).lastName}}</ng-container>
<ng-container>{{(user$ | async).lastName}} {{(user$ | async).firstName | slice:0:1}}.{{(user$ | async).middleName | slice:0:1}}.</ng-container>
<button mat-raised-button class="header_menu_account-button_account-circle" matBadge="2"
matBadgePosition="before" matBadgeColor="accent">
<i>
Expand All @@ -117,4 +117,4 @@ <h2 class="header_descr">
class="progress-bar">
<mat-progress-bar mode="indeterminate">
</mat-progress-bar>
</div>
</div>
106 changes: 66 additions & 40 deletions src/app/header/header.component.scss
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
.authorization {
display: flex;
margin: 1%;
width: 100%;
}

.material-icon {
line-height: none;
}

.pointer{
cursor:pointer;
.pointer {
cursor: pointer;
}

.notification{
.notification {
height: 35px;
line-height: 35px;
font-weight: bold;
}

.circle-notification{
.circle-notification {
font-size: 10px;
color:#F5BC4A;
color: #F5BC4A;
}

.btn-notification{
.btn-notification {
font-weight: bold;
color: #3849F9;
}
Expand Down Expand Up @@ -59,7 +60,7 @@
cursor: pointer;
}

&_secondary{
&_secondary {
background: #3849F9;
max-height: 83px;
box-shadow: 0px 7px 19px rgba(0, 0, 0, 0.11);
Expand All @@ -71,15 +72,17 @@
align-items: center;
}

&_top, &_btns {
&_top,
&_btns {
display: flex;
justify-content: space-between;
align-items: center;
}

&_logo-wrapper {
position: relative;
.logo{

.logo {
position: absolute;
transform: translate(0, -41%);

Expand All @@ -96,12 +99,14 @@
border-radius: 20px;
border-color: white;
color: white;

&.mat-stroked-button {
font-size: 0.7rem;
}
}

&_lang, &_menu {
&_lang,
&_menu {
background: none;
color: white;
font-size: 0.7rem !important;
Expand All @@ -120,11 +125,13 @@
}

&_username {
font-size: 0.7rem;
display: flex;
align-items: center;
font-family: Innerspace, sans-serif;
font-style: normal;
font-weight: bold;
white-space: nowrap;
line-height: 40px;
text-transform: uppercase;
font-size: 0.8125rem;
line-height: 15px;
cursor: pointer;

&:hover {
Expand Down Expand Up @@ -153,7 +160,8 @@
}
}

&-button-mobile, &_account-button {
&-button-mobile,
&_account-button {
display: none;
}
}
Expand Down Expand Up @@ -187,22 +195,22 @@
}
}

::ng-deep .mat-menu-content{
::ng-deep .mat-menu-content {
font-weight: bold;
font-size: x-small;
margin: 0.5rem !important;
}

::ng-deep .mat-menu-panel{
::ng-deep .mat-menu-panel {
border-radius: 15px !important;
}

.icon-account {
color:white;
color: white;
}

::ng-deep .lang-option .mat-select-value {
color:white !important;
color: white !important;
padding-right: 25px;
overflow: visible;
}
Expand All @@ -211,11 +219,11 @@
display: none;
}

::ng-deep .lang-option-text .mat-option-text{
::ng-deep .lang-option-text .mat-option-text {
width: 0;
}

.lang-option-text{
.lang-option-text {
padding: 0;
font-size: 0.7rem;
font-weight: bold;
Expand All @@ -228,28 +236,33 @@
width: auto !important;
}

::ng-deep .mat-menu-item{
::ng-deep .mat-menu-item {
padding: 0px !important;
}
.progress-bar{
position: absolute;

.progress-bar {
position: absolute;
width: 100vw;
z-index: 999;
}
}

@media (max-width: 1024px) {
.header {
&_search {
width: 100%;
}
&_title{

&_title {
text-align: center;
}
}
}

@media (max-width: 375px) {
.header {
&_top, &_btns {

&_top,
&_btns {
display: flex;
justify-content: space-between;
align-items: center;
Expand All @@ -270,7 +283,7 @@
}


@media(max-width: 750px){
@media(max-width: 750px) {
.authorization {
flex-direction: row-reverse;

Expand Down Expand Up @@ -325,12 +338,15 @@
&_lang {
display: none;
}
&_about{
display: none;;

&_about {
display: none;
;
}

&_support{
display: none;;
&_support {
display: none;
;
}

&_menu {
Expand Down Expand Up @@ -376,17 +392,22 @@
.header {
width: 100%;
padding: 0;

&_logo-wrapper {
height: 20px;
.logo{

.logo {
width: 130px;
margin-top: 8px;
}
}
&_top, &_btns {

&_top,
&_btns {
display: flex;
justify-content: space-between;
}

&_top {
display: flex;
flex-direction: row;
Expand All @@ -397,12 +418,14 @@
padding: 40px 0 15px 15px;
background-color: #3849F9;
}

&_btns {
flex-direction: column-reverse;
align-items: flex-end;
gap: 0;
}
&_title{

&_title {
margin-top: 120px;
text-align: center;
}
Expand All @@ -416,27 +439,30 @@
}
}
}

@media (max-width: 750px) {
.header {
padding: 0;
&_title{

&_title {
font-size: 1.5rem;
line-height: 2rem;
text-align: center;
margin-top: 2rem;
}
&_descr{

&_descr {
text-align: center;
font-size: 1rem;
}

.header-full-search-bar-wrap{
.header-full-search-bar-wrap {
width: inherit;
margin: 1rem;
}
}

.mat-button-wrapper{
padding:0.3rem;
.mat-button-wrapper {
padding: 0.3rem;
}
}