Skip to content
This repository has been archived by the owner on Feb 5, 2023. It is now read-only.

change style for table__active and table__archived in manage-users an… #152

Merged
merged 5 commits into from
Jul 26, 2021
Merged

change style for table__active and table__archived in manage-users an… #152

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4019f7a
change style for table__active and table__archived in manage-users an…
AnastassiaVarabei Jul 25, 2021
30bf1c1
Merge branch 'develop' into improvement/style-status-value
AnastassiaVarabei Jul 26, 2021
08ff90f
added classes
AnastassiaVarabei Jul 26, 2021
d6a2464
changed style for wrapper in content-container.components.scss
AnastassiaVarabei Jul 26, 2021
3d75670
changed name classes &__status {
AnastassiaVarabei Jul 26, 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
4 changes: 2 additions & 2 deletions src/app/modules/admin/components/department-card/department-card.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ <h3 doText underlined underlinedSize="sm">
</td>
<td>
<ng-container *ngIf="userInfo?.isActive; else archived">
<p>Активен</p>
<p class="table__status table__status__active text_color_white small_text">Активен</p>
</ng-container>
<ng-template #archived>
<p class="table__archived" doText color="light_1">В архиве</p>
<p class="table__status table__status__archived text_color_gray1 small_text">В архиве</p>
</ng-template>
</td>
</tr>
Expand Down
18 changes: 15 additions & 3 deletions src/app/modules/admin/components/department-card/department-card.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,21 @@
}
}

&__archived {
background-color: #eb5757;
border-radius: 5%;
&__status {
width: 67px;
height: 24px;

text-align: center;

border-radius: 10px;

&__active {
background-color: #00e676;
}

&__archived {
background-color: #f5f5f5;
}
}

&__image {
Expand Down
4 changes: 2 additions & 2 deletions src/app/modules/admin/components/manage-users/manage-users.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ <h3 doText underlined underlinedSize="sm">Сотрудники</h3>
<td class="table__cell">{{ userInfo?.rate }}</td>
<td class="table__cell">
<ng-container *ngIf="userInfo?.isActive; else archived">
<p>Активен</p>
<p class="table__status table__status__active text_color_white small_text">Активен</p>
</ng-container>
<ng-template #archived>
<p class="table__archived" doText color="light_1">В архиве</p>
<p class="table__status table__status__archived text_color_gray1 small_text" >В архиве</p>
</ng-template>
</td>
<td class="table__delete-button">
Expand Down
18 changes: 15 additions & 3 deletions src/app/modules/admin/components/manage-users/manage-users.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,21 @@
}
}

&__archived {
background-color: #eb5757;
border-radius: 5%;
&__status {
width: 67px;
height: 24px;

text-align: center;

border-radius: 10px;

&__active {
background-color: #00e676;
}

&__archived {
background-color: #f5f5f5;
}
}

&__image {
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/component/content-container/content-container.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.wrapper {
z-index: 1;

padding: 48px;
padding: 100px;

width: 100%;
height: 100%;
Expand Down
4 changes: 4 additions & 0 deletions src/stylesheets/base/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@
&_gray {
color: $gray;
}

&_gray1 {
color: $gray1;
}
}

.text_white {
Expand Down