SQuiz/frontAnswerer
3
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'staging'

Browse Source 
немного правок по стартовой

See merge request frontend/squzanswerer!134
This commit is contained in:
Nastya 2024-05-03 12:48:11 +00:00
commit 299f402ff0
3 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
lib/components/ViewPublicationPage/StartPageViewPublication/StartPageDesktop.tsx
View File

@ -96,75 +96,79 @@ const ExpandedLayout = ({
quizHeaderBlock,
quizMainBlock,
backgroundBlock,
}: LayoutProps) => (
<>
<Box
sx={{
height: "100%",
width: alignType === "center"? "100%": "42%",
display: "flex",
padding:
alignType === "center"
? "30px 35px"
: alignType === "left"
? "25px 0 31px 35px"
: "25px 35px 31px 0",
margin:
alignType === "center"
? "0 auto"
: alignType === "left"
? "0"
: "0 0 0 auto",
scrollbarWidth: "none",
"&::-webkit-scrollbar": {
width: 0,
},
overflowY: "auto",
}}
>
}: LayoutProps) => {
const size = useRootContainerSize();
const isTablet = size >= 700 && size < 1100;
return (
<>
<Box
sx={{
minHeight: "calc(100% - 32px)",
position: "relative",
width: "100%",
height: "100%",
width: alignType === "center" ? "100%" : isTablet ? "46%" : "42%",
display: "flex",
padding:
alignType === "center"
? "0"
? isTablet ? "30px 40px" : "30px 35px"
: alignType === "left"
? "0 40px 0 0"
: "0 0 0 40px",
display: "flex",
flexDirection: "column",
justifyContent: "space-between",
alignItems: alignType === "center" ? "center" : "start",
borderRight: alignType === "left" ? "1px solid #9A9AAF80" : null,
borderLeft: alignType === "right" ? "1px solid #9A9AAF80" : null,
? isTablet ? "25px 0 31px 40px" : "25px 0 31px 35px"
: isTablet ? "25px 40px 31px 0" : "25px 35px 31px 0",
margin:
alignType === "center"
? "0 auto"
: alignType === "left"
? "0"
: "0 0 0 auto",
scrollbarWidth: "none",
"&::-webkit-scrollbar": {
width: 0,
},
overflowY: "auto",
}}
>
{alignType !== "center" && quizHeaderBlock}
{quizMainBlock}
<Box
sx={{
minHeight: "calc(100% - 32px)",
position: "relative",
width: "100%",
padding:
alignType === "center"
? "0"
: alignType === "left"
? "0 40px 0 0"
: "0 0 0 40px",
display: "flex",
flexDirection: "column",
justifyContent: "space-between",
alignItems: alignType === "center" ? "center" : "start",
borderRight: alignType === "left" ? "1px solid #9A9AAF80" : null,
borderLeft: alignType === "right" ? "1px solid #9A9AAF80" : null,
scrollbarWidth: "none",
"&::-webkit-scrollbar": {
width: 0,
},
}}
>
{alignType !== "center" && quizHeaderBlock}
{quizMainBlock}
</Box>
</Box>
</Box>
<Box
sx={{
position: "absolute",
zIndex: -1,
left: 0,
top: 0,
height: "100%",
width: "100%",
overflow: "hidden",
}}
>
{backgroundBlock}
</Box>
</>
);
<Box
sx={{
position: "absolute",
zIndex: -1,
left: 0,
top: 0,
height: "100%",
width: "100%",
overflow: "hidden",
}}
>
{backgroundBlock}
</Box>
</>
);
}
const CenteredLayout = ({
quizHeaderBlock,
@ -177,7 +181,7 @@ const CenteredLayout = ({
<Box
sx={{
overflow: "auto",
padding: "25px 25px 25px",
padding: isTablet ? "25px 40px 25px" : "25px 25px 25px",
display: "flex",
flexDirection: "column",
alignItems: "center",

4
lib/components/ViewPublicationPage/StartPageViewPublication/StartPageMobile.tsx
View File

@ -135,7 +135,7 @@ const ExpandedMobileLayout = ({
>
<Box
sx={{
padding: "16px",
padding: "20px",
height: "80%",
display: "flex",
flexGrow: 1,
@ -200,7 +200,7 @@ const CenteredMobileLayout = ({
flexDirection: "column",
justifyContent: "space-between",
alignItems: "flex-start",
padding: "10px 25px 25px",
padding: "20px",
height: "100%",
overflowY: "auto",
overflowX: "hidden",

4
lib/components/ViewPublicationPage/StartPageViewPublication/index.tsx
View File

@ -95,7 +95,8 @@ export const StartPageViewPublication = () => {
alignItems: "center",
flexWrap: settings.cfg.startpageType === "expanded" && settings.cfg.startpage.position === "center"? "nowrap" : "wrap",
gap: isMobile? "20px" : "30px",
mb: settings.cfg.startpageType === "centered" ? "25px" : "7px",
mb: settings.cfg.startpageType === "centered" ? isMobile? "20px" : "25px" : "7px",
justifyContent: settings.cfg.startpageType === "expanded" && settings.cfg.startpage.position === "center" && isMobile? "center" : undefined
}}
>
{settings.cfg.startpage.logo &&
@ -136,6 +137,7 @@ export const StartPageViewPublication = () => {
alignItems: "center",
gap: "7px",
textDecoration: "none",
marginLeft: settings.cfg.startpageType === "expanded" && settings.cfg.startpage.position === "center" && !isTablet &&!isMobile ? "50px" : undefined
}}
>
<NameplateLogo