From 0f52c91a97071be5200c3c6b9f55372b06e41afc Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Tue, 26 Sep 2017 14:19:58 +0200 Subject: [PATCH] Fix popups design settings manager --- .../src/components/ContentHeader/index.js | 4 +- .../admin/src/translations/fr.json | 2 +- .../admin/src/components/List/styles.scss | 26 ++++++++++-- .../src/components/PopUpForm/styles.scss | 2 +- .../src/components/PopUpWarning/styles.scss | 41 +++++++++++++++---- 5 files changed, 60 insertions(+), 15 deletions(-) diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/index.js index 6b6ce87002..299c0843a7 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/index.js @@ -38,7 +38,7 @@ class ContentHeader extends React.Component { // eslint-disable-line react/prefe } renderContentHeader = () => { - const description = isEmpty(this.props.description) ? '' : ; + const description = isEmpty(this.props.description) ? '' : ; const buttons = this.props.addButtons ? this.renderButtonContainer() : ''; return (
@@ -63,7 +63,7 @@ class ContentHeader extends React.Component { // eslint-disable-line react/prefe
- +
{description}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json index 5dcc2dcc8b..ede064b242 100755 --- a/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json +++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json @@ -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", diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/List/styles.scss b/packages/strapi-plugin-settings-manager/admin/src/components/List/styles.scss index 8d94ae23c1..6fccc9d261 100755 --- a/packages/strapi-plugin-settings-manager/admin/src/components/List/styles.scss +++ b/packages/strapi-plugin-settings-manager/admin/src/components/List/styles.scss @@ -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; } } } diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/styles.scss b/packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/styles.scss index 59c2c01161..df75153a72 100755 --- a/packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/styles.scss +++ b/packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/styles.scss @@ -8,7 +8,7 @@ .defaultConnection { position: absolute; - bottom: -5.4rem; + bottom: -5.5rem; left: 3rem; display: flex; color: #27B710; diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/styles.scss b/packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/styles.scss index 26baccf89e..f2bf137e98 100644 --- a/packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/styles.scss +++ b/packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/styles.scss @@ -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; +// }