From 0dcedc5171e07ef87b77231a185c385094da6de9 Mon Sep 17 00:00:00 2001 From: Nathan de Balthasar Date: Fri, 15 Dec 2023 17:19:30 +0100 Subject: [PATCH] style(homepage-ui): fix padding overriding toolbar --- patches/@strapi+admin+4.12.0.patch | 88 ++++++++++--------- .../1.0.0/full_documentation.json | 2 +- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/patches/@strapi+admin+4.12.0.patch b/patches/@strapi+admin+4.12.0.patch index b547da7..cadc116 100644 --- a/patches/@strapi+admin+4.12.0.patch +++ b/patches/@strapi+admin+4.12.0.patch @@ -155,10 +155,10 @@ index cec300e..1d978f2 100644 diff --git a/node_modules/@strapi/admin/admin/src/pages/HomePage/index.js b/node_modules/@strapi/admin/admin/src/pages/HomePage/index.js -index a22f746..c3060d1 100644 +index a22f746..9a91935 100644 --- a/node_modules/@strapi/admin/admin/src/pages/HomePage/index.js +++ b/node_modules/@strapi/admin/admin/src/pages/HomePage/index.js -@@ -1,107 +1,209 @@ +@@ -1,107 +1,221 @@ -/* - * HomePage - * @@ -171,28 +171,51 @@ index a22f746..c3060d1 100644 -import { Helmet } from 'react-helmet'; -import { FormattedMessage } from 'react-intl'; -import { useHistory } from 'react-router-dom'; --import styled from 'styled-components'; -- ++import { Box, Typography, Flex, Layout, Grid, GridItem, Button } from '@strapi/design-system' ++import { useFetchClient } from '@strapi/helper-plugin' ++import React, { useEffect, useState } from 'react'; + import styled from 'styled-components'; + -import GuidedTourHomepage from '../../components/GuidedTour/Homepage'; -import isGuidedTourCompleted from '../../components/GuidedTour/utils/isGuidedTourCompleted'; -import { useContentTypes } from '../../hooks/useContentTypes'; -import { useEnterprise } from '../../hooks/useEnterprise'; -- ++const vodThumbnailStyle = { ++ width: 300, ++ aspectRatio: '16/9' ++} + -import cornerOrnamentPath from './assets/corner-ornament.svg'; -import ContentBlocks from './ContentBlocks'; -import HomeHeader from './HomeHeader'; -import SocialLinks from './SocialLinks'; -- ++const cardTitleStyle = { ++ textAlign: 'center', ++} + -const LogoContainer = styled(Box)` - position: absolute; - top: 0; - right: 0; -- ++const PageContainer = styled(Box)` ++ @media (max-width: 768px) { ++ padding: 0px; ++ } ++ padding: 10px; ++` + - img { - width: ${150 / 16}rem; -- } --`; -- ++const HomePageContainer = styled(Flex)` ++ @media (max-width: 1200px) { ++ flex-direction: column; ++ align-items: center; /* Centers items horizontally in column flex-direction */ + } ++ justify-content: center; ++ flex-direction: row; ++ align-items: stretch; + `; + -export const HomePageCE = () => { - // Temporary until we develop the menu API - const { collectionTypes, singleTypes, isLoading: isLoadingForModels } = useContentTypes(); @@ -217,26 +240,6 @@ index a22f746..c3060d1 100644 - if (isLoadingForModels) { - return ; - } -+import { Box, Typography, Flex, Layout, Grid, GridItem, Button } from '@strapi/design-system' -+import { useFetchClient } from '@strapi/helper-plugin' -+import React, { useEffect, useState } from 'react'; -+ -+const vodThumbnailStyle = { -+ width: 300, -+ aspectRatio: '16/9' -+} -+ -+const liveThumbnailStyle = { -+ width: 280, -+ height: 280, -+ overflow: 'hidden', -+ borderRadius: '100%', -+} -+ -+const cardTitleStyle = { -+ textAlign: 'center', -+} -+ +const CollectionType = { + Vod: 'vod', + Live: 'live-channel', @@ -289,6 +292,7 @@ index a22f746..c3060d1 100644 + paddingBottom={6} + shadow='tableShadow' + height={500} ++ style={{ position: 'relative', width: 350 }} + > + + Live channel @@ -409,21 +413,13 @@ index a22f746..c3060d1 100644 - - - -+ ++ - -- -- -- -- -- {showGuidedTour ? : } -- -- -- + + + Welcome to your Trackflix CMS 👋 @@ -435,14 +431,22 @@ index a22f746..c3060d1 100644 + +- +- +- {showGuidedTour ? : } +- +- +- +- +- - - -+ ++ + + + -+ -+ ++ ++ ); }; diff --git a/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/src/extensions/documentation/documentation/1.0.0/full_documentation.json index 3e6474d..937ae69 100644 --- a/src/extensions/documentation/documentation/1.0.0/full_documentation.json +++ b/src/extensions/documentation/documentation/1.0.0/full_documentation.json @@ -14,7 +14,7 @@ "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "x-generation-date": "2023-12-11T14:02:54.161Z" + "x-generation-date": "2023-12-15T16:03:52.079Z" }, "x-strapi-config": { "plugins": [