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

Merge pull request #14195 from WalkingPizza/fix/settings-button-sizes

Browse Source 
Make all settings header primary actions small
This commit is contained in:
Julie Plantey 2022-08-29 16:51:46 +02:00 committed by GitHub
commit 9496693a31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 187 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js
View File

@ -195,7 +195,7 @@ const ListSettingsView = ({ layout, slug }) => {
} }
primaryAction={ primaryAction={
<Button <Button
size="L" size="S"
startIcon={<Check />} startIcon={<Check />}
disabled={isEqual(modifiedData, initialData)} disabled={isEqual(modifiedData, initialData)}
type="submit" type="submit"

12
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap
View File

@ -35,8 +35,8 @@ exports[`ADMIN | CM | LV | Configure the view renders and matches the snapshot 1
.c19 { .c19 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
font-size: 0.875rem; font-size: 0.75rem;
line-height: 1.43; line-height: 1.33;
} }
.c16 { .c16 {
@ -110,7 +110,7 @@ exports[`ADMIN | CM | LV | Configure the view renders and matches the snapshot 1
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
padding: 10px 16px; padding: 8px 16px;
background: #4945ff; background: #4945ff;
border: 1px solid #4945ff; border: 1px solid #4945ff;
} }
@ -1903,8 +1903,8 @@ exports[`ADMIN | CM | LV | Configure the view should add field 1`] = `
.c19 { .c19 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
font-size: 0.875rem; font-size: 0.75rem;
line-height: 1.43; line-height: 1.33;
} }
.c16 { .c16 {
@ -1978,7 +1978,7 @@ exports[`ADMIN | CM | LV | Configure the view should add field 1`] = `
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
padding: 10px 16px; padding: 8px 16px;
background: #4945ff; background: #4945ff;
border: 1px solid #4945ff; border: 1px solid #4945ff;
} }

2
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/index.js
View File

@ -128,7 +128,7 @@ const ApiTokenListView = () => {
<LinkButton <LinkButton
data-testid="create-api-token-button" data-testid="create-api-token-button"
startIcon={<Plus />} startIcon={<Plus />}
size="L" size="S"
onClick={() => trackUsage('willAddTokenFromList')} onClick={() => trackUsage('willAddTokenFromList')}
to="/settings/api-tokens/create" to="/settings/api-tokens/create"
> >

6
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js
View File

@ -422,8 +422,8 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => {
.c10 { .c10 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
font-size: 0.875rem; font-size: 0.75rem;
line-height: 1.43; line-height: 1.33;
} }
.c8 { .c8 {
@ -489,7 +489,7 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => {
} }
.c6 { .c6 {
padding: 10px 16px; padding: 8px 16px;
background: #4945ff; background: #4945ff;
border: 1px solid #4945ff; border: 1px solid #4945ff;
border-radius: 4px; border-radius: 4px;

2
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/index.js
View File

@ -102,7 +102,7 @@ const RoleListPage = () => {
<SettingsPageTitle name="Roles" /> <SettingsPageTitle name="Roles" />
<HeaderLayout <HeaderLayout
primaryAction={ primaryAction={
<Button onClick={handleToggleModalForCreatingRole} startIcon={<Plus />} size="L"> <Button onClick={handleToggleModalForCreatingRole} startIcon={<Plus />} size="S">
{formatMessage({ {formatMessage({
id: 'Settings.roles.list.button.add', id: 'Settings.roles.list.button.add',
defaultMessage: 'Add new role', defaultMessage: 'Add new role',

6
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/tests/index.test.js
View File

@ -64,8 +64,8 @@ describe('<ListPage />', () => {
.c11 { .c11 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
font-size: 0.875rem; font-size: 0.75rem;
line-height: 1.43; line-height: 1.33;
} }
.c8 { .c8 {
@ -139,7 +139,7 @@ describe('<ListPage />', () => {
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
padding: 10px 16px; padding: 8px 16px;
background: #4945ff; background: #4945ff;
border: 1px solid #4945ff; border: 1px solid #4945ff;
} }

2
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/index.js
View File

@ -105,7 +105,7 @@ const ListPage = () => {
data-testid="create-user-button" data-testid="create-user-button"
onClick={handleToggle} onClick={handleToggle}
startIcon={<Envelop />} startIcon={<Envelop />}
size="L" size="S"
> >
{formatMessage({ {formatMessage({
id: 'Settings.permissions.users.create', id: 'Settings.permissions.users.create',

313
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js
View File

File diff suppressed because one or more lines are too long

2
packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js
View File

@ -252,7 +252,7 @@ const ListView = () => {
primaryAction={ primaryAction={
canCreate && canCreate &&
!loadingWebhooks && ( !loadingWebhooks && (
<LinkButton startIcon={<Plus />} variant="default" to={`${pathname}/create`} size="L"> <LinkButton startIcon={<Plus />} variant="default" to={`${pathname}/create`} size="S">
{formatMessage({ {formatMessage({
id: 'Settings.webhooks.list.button.add', id: 'Settings.webhooks.list.button.add',
defaultMessage: 'Create new webhook', defaultMessage: 'Create new webhook',

6
packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/tests/index.test.js
View File

@ -472,8 +472,8 @@ describe('Admin | containers | ListView', () => {
.c13 { .c13 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
font-size: 0.875rem; font-size: 0.75rem;
line-height: 1.43; line-height: 1.33;
} }
.c11 { .c11 {
@ -539,7 +539,7 @@ describe('Admin | containers | ListView', () => {
} }
.c9 { .c9 {
padding: 10px 16px; padding: 8px 16px;
background: #4945ff; background: #4945ff;
border: 1px solid #4945ff; border: 1px solid #4945ff;
border-radius: 4px; border-radius: 4px;

2
packages/core/admin/ee/admin/pages/SettingsPage/pages/Roles/ListPage/index.js
View File

@ -259,7 +259,7 @@ const RoleListPage = () => {
<HeaderLayout <HeaderLayout
primaryAction={ primaryAction={
canCreate ? ( canCreate ? (
<Button onClick={handleNewRoleClick} startIcon={<Plus />} size="L"> <Button onClick={handleNewRoleClick} startIcon={<Plus />} size="S">
{formatMessage({ {formatMessage({
id: 'Settings.roles.list.button.add', id: 'Settings.roles.list.button.add',
defaultMessage: 'Add new role', defaultMessage: 'Add new role',

2
packages/core/upload/admin/src/pages/SettingsPage/index.js
View File

@ -133,7 +133,7 @@ export const SettingsPage = () => {
loading={isSubmiting} loading={isSubmiting}
type="submit" type="submit"
startIcon={<Check />} startIcon={<Check />}
size="L" size="S"
> >
{formatMessage({ {formatMessage({
id: 'global.save', id: 'global.save',

6
packages/core/upload/admin/src/pages/SettingsPage/tests/index.test.js
View File

@ -71,8 +71,8 @@ describe('Upload | SettingsPage', () => {
.c11 { .c11 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
font-size: 0.875rem; font-size: 0.75rem;
line-height: 1.43; line-height: 1.33;
} }
.c8 { .c8 {
@ -146,7 +146,7 @@ describe('Upload | SettingsPage', () => {
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
padding: 10px 16px; padding: 8px 16px;
background: #4945ff; background: #4945ff;
border: 1px solid #4945ff; border: 1px solid #4945ff;
} }

2
packages/plugins/i18n/admin/src/components/LocaleList/index.js
View File

@ -34,7 +34,7 @@ const LocaleList = ({ canUpdateLocale, canDeleteLocale, onToggleCreateModal, isC
<Main tabIndex={-1}> <Main tabIndex={-1}>
<HeaderLayout <HeaderLayout
primaryAction={ primaryAction={
<Button startIcon={<Plus />} onClick={onToggleCreateModal} size="L"> <Button startIcon={<Plus />} onClick={onToggleCreateModal} size="S">
{formatMessage({ id: getTrad('Settings.list.actions.add') })} {formatMessage({ id: getTrad('Settings.list.actions.add') })}
</Button> </Button>
} }

2
packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/index.js
View File

@ -152,7 +152,7 @@ const AdvancedSettingsPage = () => {
type="submit" type="submit"
disabled={!canUpdate} disabled={!canUpdate}
startIcon={<Check />} startIcon={<Check />}
size="L" size="S"
> >
{formatMessage({ id: 'global.save', defaultMessage: 'Save' })} {formatMessage({ id: 'global.save', defaultMessage: 'Save' })}
</Button> </Button>

6
packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/index.test.js
View File

@ -75,8 +75,8 @@ describe('ADMIN | Pages | Settings | Advanced Settings', () => {
.c11 { .c11 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
font-size: 0.875rem; font-size: 0.75rem;
line-height: 1.43; line-height: 1.33;
} }
.c8 { .c8 {
@ -150,7 +150,7 @@ describe('ADMIN | Pages | Settings | Advanced Settings', () => {
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
padding: 10px 16px; padding: 8px 16px;
background: #4945ff; background: #4945ff;
border: 1px solid #4945ff; border: 1px solid #4945ff;
} }

2
packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js
View File

@ -131,7 +131,7 @@ const RoleListPage = () => {
})} })}
primaryAction={ primaryAction={
<CheckPermissions permissions={permissions.createRole}> <CheckPermissions permissions={permissions.createRole}>
<Button onClick={handleNewRoleClick} startIcon={<Plus />} size="L"> <Button onClick={handleNewRoleClick} startIcon={<Plus />} size="S">
{formatMessage({ {formatMessage({
id: getTrad('List.button.roles'), id: getTrad('List.button.roles'),
defaultMessage: 'Add new role', defaultMessage: 'Add new role',

6
packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/index.test.js
View File

@ -64,8 +64,8 @@ describe('Plugin | Users and Permissions | RoleListPage', () => {
.c14 { .c14 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
font-size: 0.875rem; font-size: 0.75rem;
line-height: 1.43; line-height: 1.33;
} }
.c11 { .c11 {
@ -139,7 +139,7 @@ describe('Plugin | Users and Permissions | RoleListPage', () => {
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
padding: 10px 16px; padding: 8px 16px;
background: #4945ff; background: #4945ff;
border: 1px solid #4945ff; border: 1px solid #4945ff;
} }