-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fix: fix Login page * fix: fix Password input * fix: fix Input * fix: validate inputs after user leaves the input * fix: fix NewPassword page * UMAK-201: Длинный пароль перекрывает иконку глаза на странице Регистрации/Входа https://lapkipomoshi.atlassian.net/browse/UMAK-201 * UMAK-204: Кнопка Зарегистрироваться становится активна, если в поле Пароль введены только числа, на странице Регистрации https://lapkipomoshi.atlassian.net/browse/UMAK-204 * UMAK-203: Не появляется ошибка если ввести значение без букв в поле Имя на странице Регистрации https://lapkipomoshi.atlassian.net/browse/UMAK-203 * UMAK-203: fix regex * UMAK-195: Добавить крестик на popup https://lapkipomoshi.atlassian.net/jira/software/projects/UMAK/boards/1/backlog?selectedIssue=UMAK-195 * UMAK-194: Закрытие popup по клику вне области popup https://lapkipomoshi.atlassian.net/jira/software/projects/UMAK/boards/1/backlog?selectedIssue=UMAK-194 * fix: fix update user info * fix * fix: off camelcase rule * fix: fix after PR * fix: fix after review * fix: change user profile depend on status * fix: fix after review * fix: fix InfoToolTip * feat: add emailConfirmationTemplate * fix: fix font * refactor(App): setting the ProtectedRoute component * feat: add PrivacyPolicyPage (#132) feat: add PrivacyPolicyPage * feat: add displaying SheltersList according to the shelter warning color (#127) * refactor: change styles according to the layout, add adaptability * fix: react router paths and hierarchy * feat: add a table to PrivacyPolicyPage (#137) * feat: add a table to PrivacyPolicyPage * fix: close InfoTooltip after 15 seconds * fix: fix standard font's weight * fix * feat: add template for email confirmation * feat: add template for success registration * fix styles * feat: add template for reset password * feat: add template for change email * fix text * feat: add template for change password * fix styles * fix profile popup * fix: change validation on onChange * fix: change autocomplete background-color * feat(App): add app with the site data * fix after review * fix after W3C validation * feat: add scroll to slider (#143) * refactor: add closure to function * feat: add new filter to shelters list page (#144) * Update conflicts App.jsx * feat: add terms page (#142) * feat: add links (#146) --------- Co-authored-by: Vlada Melnikova <wannhorn@gmail.com> Co-authored-by: Tatiana Ponomareva <tatiana.developerr@gmail.com>
- Loading branch information
1 parent
008b616
commit f09a2ca
Showing
103 changed files
with
3,165 additions
and
469 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
@import url('./styles/cards-slider.scss'); | ||
@import url('./styles/__buttons/cards-slider__buttons.scss'); | ||
@import url('./styles/__button/cards-slider__button.scss'); | ||
@import url('./styles/__button/_next/cards-slider__button_next.scss'); |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
src/components/CardsSlider/styles/__buttons/cards-slider__buttons.css
This file was deleted.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
src/components/CardsSlider/styles/__buttons/cards-slider__buttons.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
.cards-slider__buttons { | ||
margin-bottom: 40px; | ||
|
||
&_hidden { | ||
display: none; | ||
} | ||
|
||
@media (min-width: 768px) { | ||
margin-bottom: 80px; | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
.cards-slider { | ||
margin: 0; | ||
display: flex; | ||
white-space: nowrap; | ||
overflow-y: hidden; | ||
width: 100%; | ||
padding: 0 16px; | ||
box-sizing: border-box; | ||
list-style-type: none; | ||
column-gap: 38px; | ||
overflow: hidden; | ||
|
||
@media (min-width: 768px) { | ||
padding: 20px 0 44px 44px; | ||
} | ||
|
||
@media (min-width: 1440px) { | ||
padding-left: 132px; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
src/components/DetailsCard/styles/__summary/details-card__summary.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,9 @@ | ||
.details-card__summary { | ||
display: flex; | ||
width: 100%; | ||
padding: 24px 28px 20px 40px; | ||
justify-content: space-between; | ||
align-items: center; | ||
background-color: var(--color-background-additional); | ||
cursor: pointer; | ||
box-sizing: border-box; | ||
} | ||
|
||
.details-card__summary_style_shelter-pets { | ||
margin-left: 132px; | ||
border-radius: 20px; | ||
transition-duration: .5s; | ||
} | ||
|
||
.shelter-pets__summary_style_shelter-pets:hover { | ||
opacity: .77; | ||
} |
12 changes: 0 additions & 12 deletions
12
src/components/DetailsCard/styles/__title/details-card__title.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,4 @@ | ||
.details-card__title { | ||
width: 890px; | ||
margin: 0; | ||
padding: 0; | ||
font-size: 24px; | ||
line-height: 29px; | ||
} | ||
|
||
.details-card__title_style_faq { | ||
font-weight: 500; | ||
font-family: var(--font-family-title); | ||
} | ||
|
||
.details-card__title_style_shelter-pets { | ||
font-weight: 400; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
.arrow { | ||
width: 37px; | ||
height: 22px; | ||
transition: transform .7s; | ||
.caret { | ||
width: 24px; | ||
height: 24px; | ||
transition: transform 0.7s; | ||
} | ||
|
||
.arrow path { | ||
transition-duration: .3s; | ||
.caret path { | ||
transition-duration: 0.3s; | ||
fill: var(--color-text-base); | ||
} | ||
|
||
.details-card:hover .arrow path { | ||
.details-card:hover .caret path { | ||
fill: var(--color-accent-hover); | ||
} | ||
|
||
.details-card__summary:focus .arrow path { | ||
.details-card__summary:focus .caret path { | ||
fill: var(--color-accent-pressed); | ||
} | ||
|
||
.details-card[open] .arrow { | ||
.details-card[open] .caret { | ||
transform: rotate(180deg); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.