yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-24 01:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix popups design settings manager

Browse Source
This commit is contained in:
cyril lopez 2017-09-26 14:19:58 +02:00
parent 0885775fe3
commit 0f52c91a97
5 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/index.js
View File

@ -38,7 +38,7 @@ class ContentHeader extends React.Component { // eslint-disable-line react/prefe
}
renderContentHeader = () => {
const description = isEmpty(this.props.description) ? '' : <FormattedMessage id='contentHeader.description' defaultMessage='{description}' values={{ description: this.props.description}} />;
const description = isEmpty(this.props.description) ? '' : <FormattedMessage id={this.props.description} defaultMessage='{description}' values={{ description: this.props.description}} />;
const buttons = this.props.addButtons ? this.renderButtonContainer() : '';
return (
<div className={styles.contentHeader} style={this.props.styles}>
@ -63,7 +63,7 @@ class ContentHeader extends React.Component { // eslint-disable-line react/prefe
<div className={styles.contentHeader} style={this.props.styles}>
<div>
<div className={styles.title}>
<FormattedMessage id='contentHeader.title' defaultMessage='{title}' values={{ title: this.props.name}} />
<FormattedMessage id={this.props.name} />
</div>
<div className={styles.subTitle}>{description}</div>
</div>

2
packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json
View File

@ -1,5 +1,5 @@
{
"contentType.temporaryDisplay": "(Not saved)",
"contentType.temporaryDisplay": "(Non sauvegardé)",
"home.contentTypeBuilder.name": "Content Types",
"home.contentTypeBuilder.description": "Créez, éditer vos modèles.",
"home.emptyContentType.title": "Il n'y a pas de model disponible",

26
packages/strapi-plugin-settings-manager/admin/src/components/List/styles.scss
View File

@ -243,12 +243,12 @@ button {
.modalBody {
padding: 0;
padding-top: 2rem;
padding-top: 2.1rem;
}
.modalFooter {
margin-top: 1.1rem;
margin-top: 1.5rem;
margin-bottom: 1.1rem;
> input {
margin-top: 1.3rem!important;
@ -270,8 +270,28 @@ button {
}
> button {
z-index: 999;
margin-top: -2rem;
margin-right: -1.5rem;
color: #C3C5C8;
opacity: 1;
font-size: 1.8rem;
font-weight: 100;
&:hover, &:focus {
color: #C3C5C8;
opacity: 1;
outline: 0;
}
> span {
color: #0E1622!important;
display: none;
}
&:before {
-webkit-font-smoothing: antialiased;
content: '\F00d';
font-family: 'FontAwesome';
font-weight: 400;
font-size: 1.2rem;
margin-right: 10px;
}
}
}

2
packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/styles.scss
View File

@ -8,7 +8,7 @@
.defaultConnection {
position: absolute;
bottom: -5.4rem;
bottom: -5.5rem;
left: 3rem;
display: flex;
color: #27B710;

41
packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/styles.scss
View File

@ -13,7 +13,29 @@
}
> button {
margin-top: -2rem;
margin-right: 0!important;
z-index: 999;
color: #C3C5C8;
opacity: 1;
font-size: 1.8rem;
font-weight: 100;
&:hover, &:focus {
color: #C3C5C8;
opacity: 1;
outline: 0;
}
> span {
display: none;
}
&:before {
-webkit-font-smoothing: antialiased;
content: '\F00d';
font-family: 'FontAwesome';
font-weight: 400;
font-size: 1.2rem;
margin-right: 10px;
}
}
}
@ -70,21 +92,24 @@
width: 100%;
padding: 0 .5rem;
display: flex;
margin-top: 3.5rem;
margin-top: 3rem;
justify-content: space-between;
}
.modalBody {
text-align: center;
font-size: 1.4rem;
padding-top: 1.8rem;
}
.modalPosition {
top: 18.7rem;
width: 37.5rem;
> div {
padding: 0!important;
border:none;
border-radius: 2px;
width: 37.5rem;
padding-left: 0;
padding-right: 0;
}
}
@ -122,7 +147,7 @@
}
}
.modalPosition {
top: 20.3rem;
width: 37.5rem;
}
// .modalPosition {
// top: 20.3rem;
// width: 37.5rem;
// }