yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix button loader and close button modal

Browse Source
This commit is contained in:
cyril lopez 2017-09-21 17:27:48 +02:00
parent ceb2f9fced
commit 62d8213897
5 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/strapi-plugin-content-type-builder/admin/src/components/Button/styles.scss
View File

@ -117,7 +117,8 @@
}
.saving {
margin-top: -2rem;
margin-top: -2.35rem;
padding-left: 4px;
line-height: 3.8rem;
font-size: 4rem;
}

12
packages/strapi-plugin-content-type-builder/admin/src/components/PopUpForm/styles.scss
View File

@ -88,6 +88,7 @@
position: relative;
> button {
z-index: 999;
margin-right: -1.5rem;
color: #C3C5C8;
opacity: 1;
@ -98,6 +99,17 @@
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;
}
}
}

11
packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/styles.scss
View File

@ -108,6 +108,17 @@
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;
}
}
}

13
packages/strapi-plugin-content-type-builder/admin/src/components/PopUpWarning/styles.scss
View File

@ -14,7 +14,7 @@
}
> button {
margin-top: -1.6rem;
margin-top: -2rem;
margin-right: 0!important;
z-index: 999;
color: #C3C5C8;
@ -26,6 +26,17 @@
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;
}
}
}

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

@ -249,7 +249,7 @@ export class ModelPage extends React.Component { // eslint-disable-line react/pr
render() {
// Url to redirects the user if he modifies the temporary content type name
const redirectRoute = replace(this.props.match.path, '/:modelName', '');
const addButtons = get(storeData.getContentType(), 'name') === this.props.match.params.modelName && size(get(storeData.getContentType(), 'attributes')) > 0 || this.props.modelPage.showButtons;
const addButtons = get(storeData.getContentType(), 'name') === this.props.match.params.modelName && size(get(storeData.getContentType(), 'attributes')) > 0 || !this.props.modelPage.showButtons;
const contentHeaderDescription = this.props.modelPage.model.description || 'content-type-builder.modelPage.contentHeader.emptyDescription.description';
const content = size(this.props.modelPage.model.attributes) === 0 ?
@ -282,7 +282,7 @@ export class ModelPage extends React.Component { // eslint-disable-line react/pr
editPath={`${redirectRoute}/${this.props.match.params.modelName}#edit${this.props.match.params.modelName}::contentType::baseSettings`}
addButtons={addButtons}
handleSubmit={this.props.submit}
isLoading={this.props.modelPage.showButtonLoader}
isLoading={!this.props.modelPage.showButtonLoader}
buttonsContent={this.contentHeaderButtons}
/>