yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-09 22:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

feedback review: spacing and translation

Browse Source
This commit is contained in:
ronronscelestes 2022-03-31 11:40:53 +02:00
parent 6c516f194f
commit 7168f929b3
4 changed files with 149 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/Form/index.js
View File

@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
import { Grid, GridItem } from '@strapi/design-system/Grid'; import { Grid, GridItem } from '@strapi/design-system/Grid';
import { Box } from '@strapi/design-system/Box'; import { Box } from '@strapi/design-system/Box';
import { Stack } from '@strapi/design-system/Stack';
import { Typography } from '@strapi/design-system/Typography'; import { Typography } from '@strapi/design-system/Typography';
import LogoInput from '../LogoInput'; import LogoInput from '../LogoInput';
import { useConfigurations } from '../../../../../../hooks'; import { useConfigurations } from '../../../../../../hooks';
@ -37,19 +36,17 @@ const Form = () => {
paddingRight={6} paddingRight={6}
paddingLeft={6} paddingLeft={6}
> >
<Stack spacing={5}> <Typography variant="delta" as="h3">
<Typography variant="delta" as="h3"> {formatMessage({
{formatMessage({ id: 'Settings.application.customization',
id: 'Settings.application.customization', defaultMessage: 'Customization',
defaultMessage: 'Customization', })}
})} </Typography>
</Typography> <Grid paddingTop={5}>
<Grid> <GridItem col={6} s={12}>
<GridItem col={6} s={12}> <LogoInput customLogo={customMenuLogo} defaultLogo={menu.default} />
<LogoInput customLogo={customMenuLogo} defaultLogo={menu.default} /> </GridItem>
</GridItem> </Grid>
</Grid>
</Stack>
</Box> </Box>
); );
}; };

7
packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/index.js
View File

@ -35,7 +35,12 @@ const LogoInput = ({ customLogo, defaultLogo }) => {
</CarouselActions> </CarouselActions>
} }
> >
<CarouselSlide label="logo slide"> <CarouselSlide
label={formatMessage({
id: 'Settings.application.customization.carousel-slide.label',
defaultMessage: 'Logo slide',
})}
>
<Box <Box
maxHeight="40%" maxHeight="40%"
maxWidth="40%" maxWidth="40%"

263
packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js
View File

@ -54,12 +54,12 @@ describe('Application page', () => {
padding-top: 4px; padding-top: 4px;
} }
.c35 { .c36 {
max-width: 40%; max-width: 40%;
max-height: 40%; max-height: 40%;
} }
.c38 { .c39 {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
@ -73,21 +73,21 @@ describe('Application page', () => {
outline: none; outline: none;
} }
.c38 svg { .c39 svg {
height: 12px; height: 12px;
width: 12px; width: 12px;
} }
.c38 svg > g, .c39 svg > g,
.c38 svg path { .c39 svg path {
fill: #ffffff; fill: #ffffff;
} }
.c38[aria-disabled='true'] { .c39[aria-disabled='true'] {
pointer-events: none; pointer-events: none;
} }
.c38:after { .c39:after {
-webkit-transition-property: all; -webkit-transition-property: all;
transition-property: all; transition-property: all;
-webkit-transition-duration: 0.2s; -webkit-transition-duration: 0.2s;
@ -102,11 +102,11 @@ describe('Application page', () => {
border: 2px solid transparent; border: 2px solid transparent;
} }
.c38:focus-visible { .c39:focus-visible {
outline: none; outline: none;
} }
.c38:focus-visible:after { .c39:focus-visible:after {
border-radius: 8px; border-radius: 8px;
content: ''; content: '';
position: absolute; position: absolute;
@ -117,7 +117,7 @@ describe('Application page', () => {
border: 2px solid #4945ff; border: 2px solid #4945ff;
} }
.c39 { .c40 {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
@ -134,26 +134,26 @@ describe('Application page', () => {
width: 2rem; width: 2rem;
} }
.c39 svg > g, .c40 svg > g,
.c39 svg path { .c40 svg path {
fill: #8e8ea9; fill: #8e8ea9;
} }
.c39:hover svg > g, .c40:hover svg > g,
.c39:hover svg path { .c40:hover svg path {
fill: #666687; fill: #666687;
} }
.c39:active svg > g, .c40:active svg > g,
.c39:active svg path { .c40:active svg path {
fill: #a5a5ba; fill: #a5a5ba;
} }
.c39[aria-disabled='true'] { .c40[aria-disabled='true'] {
background-color: #eaeaef; background-color: #eaeaef;
} }
.c39[aria-disabled='true'] svg path { .c40[aria-disabled='true'] svg path {
fill: #666687; fill: #666687;
} }
@ -295,6 +295,10 @@ describe('Application page', () => {
padding-top: 4px; padding-top: 4px;
} }
.c24 {
padding-top: 20px;
}
.c15 { .c15 {
display: grid; display: grid;
grid-template-columns: repeat(12,1fr); grid-template-columns: repeat(12,1fr);
@ -376,7 +380,7 @@ describe('Application page', () => {
display: flex; display: flex;
} }
.c27 { .c28 {
background: #f6f6f9; background: #f6f6f9;
padding: 8px; padding: 8px;
border-radius: 4px; border-radius: 4px;
@ -384,40 +388,40 @@ describe('Application page', () => {
border: 1px solid #dcdce4; border: 1px solid #dcdce4;
} }
.c28 { .c29 {
position: relative; position: relative;
} }
.c30 { .c31 {
padding-right: 8px; padding-right: 8px;
padding-left: 8px; padding-left: 8px;
width: 100%; width: 100%;
} }
.c32 { .c33 {
height: 124px; height: 124px;
} }
.c36 { .c37 {
position: absolute; position: absolute;
bottom: 4px; bottom: 4px;
width: 100%; width: 100%;
} }
.c40 { .c41 {
padding-top: 8px; padding-top: 8px;
padding-right: 16px; padding-right: 16px;
padding-left: 16px; padding-left: 16px;
} }
.c25 { .c26 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
font-size: 0.75rem; font-size: 0.75rem;
line-height: 1.33; line-height: 1.33;
} }
.c41 { .c42 {
color: #666687; color: #666687;
display: block; display: block;
white-space: nowrap; white-space: nowrap;
@ -427,13 +431,13 @@ describe('Application page', () => {
line-height: 1.33; line-height: 1.33;
} }
.c42 { .c43 {
color: #666687; color: #666687;
font-size: 0.75rem; font-size: 0.75rem;
line-height: 1.33; line-height: 1.33;
} }
.c26 { .c27 {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
@ -447,7 +451,7 @@ describe('Application page', () => {
align-items: center; align-items: center;
} }
.c33 { .c34 {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
@ -465,17 +469,17 @@ describe('Application page', () => {
align-items: center; align-items: center;
} }
.c29 { .c30 {
display: grid; display: grid;
grid-template-columns: auto 1fr auto; grid-template-columns: auto 1fr auto;
grid-template-areas: 'startAction slides endAction'; grid-template-areas: 'startAction slides endAction';
} }
.c31 { .c32 {
grid-area: slides; grid-area: slides;
} }
.c24 { .c25 {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
@ -485,25 +489,25 @@ describe('Application page', () => {
flex-direction: column; flex-direction: column;
} }
.c24 > * { .c25 > * {
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
} }
.c24 > * + * { .c25 > * + * {
margin-top: 4px; margin-top: 4px;
} }
.c37 > * { .c38 > * {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
} }
.c37 > * + * { .c38 > * + * {
margin-left: 4px; margin-left: 4px;
} }
.c34 { .c35 {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
@ -746,125 +750,120 @@ describe('Application page', () => {
<div <div
class="c11" class="c11"
> >
<div <h3
class="c12" class="c13"
spacing="5" >
Customization
</h3>
<div
class="c24 c15"
> >
<h3
class="c13"
>
Customization
</h3>
<div <div
class="c15" class="c16"
> >
<div <div
class="c16" class=""
> >
<div <div>
class="" <div
> class="c25"
<div> spacing="1"
<div >
class="c24" <label
spacing="1" class="c26"
for="carouselinput-1"
> >
<label
class="c25"
for="carouselinput-1"
>
<div
class="c26"
>
Logo
</div>
</label>
<div <div
class="" class="c27"
id="carouselinput-1"
> >
<div Logo
class="c27" </div>
</label>
<div
class=""
id="carouselinput-1"
>
<div
class="c28"
>
<section
aria-label="Logo"
aria-roledescription="carousel"
class="c29 c30"
> >
<section <div
aria-label="Logo" aria-live="polite"
aria-roledescription="carousel" class="c31 c32"
class="c28 c29" width="100%"
> >
<div <div
aria-live="polite" aria-label="Logo slide"
class="c30 c31" aria-roledescription="slide"
width="100%" class="c33 c34 c35"
height="124px"
role="group"
> >
<div <img
aria-label="logo slide" alt="Logo"
aria-roledescription="slide" class="c36"
class="c32 c33 c34" src="IMAGE_MOCK"
height="124px" />
role="group"
>
<img
alt="Logo"
class="c35"
src="IMAGE_MOCK"
/>
</div>
</div> </div>
<div </div>
class="c36 c33 c37"
spacing="1"
width="100%"
>
<span>
<button
aria-disabled="false"
aria-labelledby="tooltip-1"
class="c38 c39"
tabindex="0"
type="button"
>
<svg
fill="none"
height="1em"
viewBox="0 0 24 24"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M24 13.604a.3.3 0 01-.3.3h-9.795V23.7a.3.3 0 01-.3.3h-3.21a.3.3 0 01-.3-.3v-9.795H.3a.3.3 0 01-.3-.3v-3.21a.3.3 0 01.3-.3h9.795V.3a.3.3 0 01.3-.3h3.21a.3.3 0 01.3.3v9.795H23.7a.3.3 0 01.3.3v3.21z"
fill="#212134"
/>
</svg>
</button>
</span>
</div>
</section>
<div <div
class="c40" class="c37 c34 c38"
spacing="1"
width="100%"
> >
<span> <span>
<div <button
aria-labelledby="tooltip-2" aria-disabled="false"
class="c33" aria-labelledby="tooltip-1"
class="c39 c40"
tabindex="0" tabindex="0"
type="button"
> >
<span <svg
class="c41" fill="none"
height="1em"
viewBox="0 0 24 24"
width="1em"
xmlns="http://www.w3.org/2000/svg"
> >
cat-logo.png <path
</span> d="M24 13.604a.3.3 0 01-.3.3h-9.795V23.7a.3.3 0 01-.3.3h-3.21a.3.3 0 01-.3-.3v-9.795H.3a.3.3 0 01-.3-.3v-3.21a.3.3 0 01.3-.3h9.795V.3a.3.3 0 01.3-.3h3.21a.3.3 0 01.3.3v9.795H23.7a.3.3 0 01.3.3v3.21z"
</div> fill="#212134"
/>
</svg>
</button>
</span> </span>
</div> </div>
</section>
<div
class="c41"
>
<span>
<div
aria-labelledby="tooltip-2"
class="c34"
tabindex="0"
>
<span
class="c42"
>
cat-logo.png
</span>
</div>
</span>
</div> </div>
</div> </div>
<p
class="c42"
id="carouselinput-1-hint"
>
Change the admin panel logo (Max dimension: 750*750, Max file size: TBC)
</p>
</div> </div>
<p
class="c43"
id="carouselinput-1-hint"
>
Change the admin panel logo (Max dimension: 750*750, Max file size: TBC)
</p>
</div> </div>
</div> </div>
</div> </div>

1
packages/core/admin/admin/src/translations/en.json
View File

@ -102,6 +102,7 @@
"Settings.application.customization": "Customization", "Settings.application.customization": "Customization",
"Settings.application.customization.carousel.title": "Logo", "Settings.application.customization.carousel.title": "Logo",
"Settings.application.customization.carousel.change-action": "Change logo", "Settings.application.customization.carousel.change-action": "Change logo",
"Settings.application.customization.carousel-slide.label": "Logo slide",
"Settings.error": "Error", "Settings.error": "Error",
"Settings.global": "Global Settings", "Settings.global": "Global Settings",
"Settings.permissions": "Administration panel", "Settings.permissions": "Administration panel",