Skip to content
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
10 changes: 10 additions & 0 deletions public/uxcore_/assets/uxcat/information-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Box/Box.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
width: 100%;
max-width: 450px;
background-color: #fff;
z-index: 2147483647;
z-index: 45;
border-radius: 8px;
box-shadow:
0px 8px 17px 0px rgba(0, 0, 0, 0.05),
Expand Down
2 changes: 1 addition & 1 deletion src/components/Box/Box.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FC } from 'react';
import { useRouter } from 'next/router';
import cn from 'classnames';

import Button from '@components/Button';

Expand All @@ -8,7 +9,6 @@ import cookieData from '@data/cookies';
import { TRouter } from '@local-types/global';

import styles from './Box.module.scss';
import cn from 'classnames';

interface CookiesBoxProps {
setIsSeen?: () => void;
Expand Down
4 changes: 4 additions & 0 deletions src/components/ToolHeader/ToolHeader.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ $headerHeight: 46px;
--pill-w: 157px;
}

.Links.is-uxcat-ru {
--pill-w: 187px;
}

.Links.is-uxcore .Indicator {
transform: translateX(calc((96px + 8px) * 0));
color: #fff;
Expand Down
6 changes: 5 additions & 1 deletion src/components/ToolHeader/ToolHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,11 @@ const ToolHeader: FC<TToolHeader> = ({
/>
</a>
</Link>
<div className={cn(styles.Links, styles[`is-${activePage}`])}>
<div
className={cn(styles.Links, styles[`is-${activePage}`], {
[styles[`is-${activePage}-ru`]]: locale === 'ru',
})}
>
<span className={styles.Pill} />
{navItems.map(({ label, href, page, icon }, index) => {
return (
Expand Down
1 change: 0 additions & 1 deletion src/data/uxcat/ongoingTest/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const en = {
message:
'You are about to leave the page. Your test will continue until its time runs out',
pickAnswer: 'Choose the answer',
questionLabel: 'Question: ',
};

export default en;
1 change: 0 additions & 1 deletion src/data/uxcat/ongoingTest/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const ru = {
message:
'Вы собираетесь покинуть страницу, тест продолжится до истечения времени.',
pickAnswer: 'Выберите ответ',
questionLabel: 'Вопрос: ',
};

export default ru;
4 changes: 2 additions & 2 deletions src/layouts/CoreViewLayout/CoreViewLayout.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

.description {
width: 218px;
font-size: 12px;
font-size: 14px;
color: #000000a6;
line-height: 1.3;
text-align: center;
Expand All @@ -86,7 +86,7 @@
}

.moto {
font-size: 12px;
font-size: 14px;
color: #9e9e9e;
line-height: 1;
}
Expand Down
95 changes: 58 additions & 37 deletions src/layouts/OngoingLayout/OngoingLayout.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $white: #fafafa;
}

.questionWrapper {
min-height: 348px;
min-height: 223px;
box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.05);
background-color: #ffffff;

Expand All @@ -37,8 +37,9 @@ $white: #fafafa;
.questionTxt {
font-size: 24px;
font-weight: 800;
color: #c4c4c4;
color: #000;
text-align: center;
margin: 18px 0;
}

.fadeInQuestionTxt {
Expand Down Expand Up @@ -126,9 +127,36 @@ $white: #fafafa;
}
}

.answers {
.questionAnswers {
padding-top: 24px;

.iconAndBias {
display: flex;
align-items: flex-start;
gap: 10px;
background: #f0f0f0;
padding: 10px;
border-radius: 4px;
}

.biasTitle {
font-size: 14px;
margin: 0;
padding: 0;
}

.description {
p {
margin: 0;
line-height: 1.6;
font-size: 14px;

span {
background-color: unset !important;
}
}
}

.questionSkeleton {
display: flex;
justify-content: center;
Expand Down Expand Up @@ -254,7 +282,7 @@ $white: #fafafa;
}

.question,
.answers,
.questionAnswers,
.quizQuestion {
width: 900px;
max-width: 100%;
Expand All @@ -264,32 +292,20 @@ $white: #fafafa;
}

.quizQuestion {
padding: 16px 24px;
font-weight: 700;
border: 1px solid #c4c4c4;
border-radius: 4px;
background-color: #ffffff;
width: 851px;
max-width: 100%;
min-height: 85px;
overflow: hidden;
margin-bottom: 10px;
display: flex;
justify-content: center;
align-items: center;
padding-bottom: 40px;
gap: 8px;

.questionLabel {
display: flex;
align-items: center;
gap: 12px;
font-size: 24px;
.quizQuestionTxt {
font-size: 18px;
margin: 0;
font-weight: 700;
line-height: 1.6;
color: #000000d9;
}

.questionTxt {
margin: 0;
padding-left: 44px;
padding-top: 4px;
font-size: 18px;
.questionMark {
padding-bottom: 5px;
}
}

Expand Down Expand Up @@ -329,14 +345,15 @@ $white: #fafafa;

.questionWrapper {
width: unset;
padding: 15px 0 40px 15px;
padding: 15px 0 0 15px;
height: unset;
min-height: 220px;
min-height: 183px;
}

.answers {
.questionAnswers {
.answerWrapper {
-webkit-tap-highlight-color: transparent;

.input {
width: -webkit-fill-available;
}
Expand All @@ -347,7 +364,13 @@ $white: #fafafa;

@media (max-width: 800px) {
.ongoing {
.answers {
.questionAnswers {
.iconAndBias {
flex-direction: column;
align-items: center;
margin: 8px;
}

.answerWrapper {
margin-top: 8px;
}
Expand All @@ -364,19 +387,17 @@ $white: #fafafa;

.questionTxt {
padding-top: unset;
font-size: 16px;
margin: 16px 0 5px 0;
}
}
}

.answers,
.questionAnswers,
.question {
width: unset;
max-width: unset;

.question {
text-align: center;
}

.skeleton {
border: unset;
min-height: 62px;
Expand All @@ -390,9 +411,9 @@ $white: #fafafa;
}

.quizQuestion {
padding: 8px;
min-height: unset;
line-height: 1.4;
flex-direction: column;
padding: unset;

.questionLabel {
padding-bottom: 8px;
Expand Down
Loading