yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix design

Browse Source
This commit is contained in:
cyril lopez 2017-08-21 09:28:41 +02:00
parent 23b5288ecc
commit a3c0cbb711
15 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-admin/package.json
View File

@ -14,7 +14,7 @@
"dependencies": {
"fs-extra": "^0.30.0",
"lodash": "^4.17.4",
"strapi-utils": "^3.0.0-alpha.4.8"
"strapi-utils": "file:../strapi-utils"
},
"scripts": {
"test": "cd files/public && npm run test",
@ -44,4 +44,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

4
packages/strapi-generate-admin/package.json
View File

@ -15,7 +15,7 @@
"dependencies": {
"fs-extra": "^0.30.0",
"lodash": "^4.17.4",
"strapi-admin": "^3.0.0-alpha.4.8"
"strapi-admin": "file:../strapi-admin"
},
"author": {
"email": "hi@strapi.io",
@ -41,4 +41,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-api/package.json
View File

@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

4
packages/strapi-generate-new/package.json
View File

@ -16,7 +16,7 @@
"enpeem": "^2.2.0",
"fs-extra": "^4.0.0",
"lodash": "^4.17.4",
"strapi-utils": "^3.0.0-alpha.4.8"
"strapi-utils": "file:../strapi-utils"
},
"scripts": {
"prepublish": "npm prune"
@ -45,4 +45,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-policy/package.json
View File

@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-service/package.json
View File

@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

4
packages/strapi-generate/package.json
View File

@ -17,7 +17,7 @@
"fs-extra": "^4.0.0",
"lodash": "^4.17.4",
"reportback": "^2.0.1",
"strapi-utils": "^3.0.0-alpha.4.8"
"strapi-utils": "file:../strapi-utils"
},
"author": {
"name": "Strapi team",
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-helper-plugin/package.json
View File

@ -120,4 +120,4 @@
"webpack-hot-middleware": "2.13.1",
"whatwg-fetch": "1.0.0"
}
}
}

4
packages/strapi-mongoose/package.json
View File

@ -20,7 +20,7 @@
"mongoose-double": "0.0.1",
"mongoose-float": "^1.0.2",
"pluralize": "^6.0.0",
"strapi-utils": "^3.0.0-alpha.4.8"
"strapi-utils": "file:../strapi-utils"
},
"strapi": {
"isHook": true
@ -49,4 +49,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-plugin-content-manager/package.json
View File

@ -64,4 +64,4 @@
"strapi-helper-plugin": "file:../strapi-helper-plugin",
"webpack": "^2.1.0-beta.25"
}
}
}

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

@ -39,7 +39,7 @@
list-style: none;
padding: 0;
> li {
height: 5.2rem;
min-height: 5.2rem;
line-height: 5.2rem;
font-size: 1.3rem;
position: relative;
@ -50,7 +50,7 @@
.hoveredLanguage {
position: absolute;
top: -.2rem;
height: 5.4rem;
min-height: 5.4rem;
width: 100%;
background-color: rgba(14,22,34,0.03);
}
@ -107,6 +107,10 @@
.centered {
width: 25rem;
text-align: right;
display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
> button {
padding: 0;
}
@ -303,14 +307,14 @@
.databaseFont {
font-size: 1.3rem;
&:hover {
.hovered {
position: absolute;
top: 0rem!important;
//.hovered {
// position: absolute;
//top: 0rem!important;
height: 5.2rem;
margin-right: 13rem!important;
width: 100%;
//margin-right: 13rem!important;
//width: 100%;
background-color: rgba(14,22,34,0.03);
}
//}
}
}

8
packages/strapi-plugin-settings-manager/admin/src/components/RowDatabase/index.js
View File

@ -54,9 +54,7 @@ class RowDatabase extends React.Component { // eslint-disable-line react/prefer-
render() {
return (
<li className={styles.databaseFont} style={{ cursor: 'pointer'}} onClick={this.showDatabaseModal}>
<div className={styles.hovered} />
<li className={`${styles.databaseFont}`} style={{ cursor: 'pointer'}} onClick={this.showDatabaseModal}>
<div className={styles.flexLi}>
<div className={styles.flexed}>
<div className={styles.squared} style={{ backgroundColor: this.props.data.color }}>
@ -67,7 +65,7 @@ class RowDatabase extends React.Component { // eslint-disable-line react/prefer-
<div className={styles.dbHost}>
{this.props.data.host}
</div>
<div className={styles.centered} style={{ width: '8rem'}}>{this.props.data.database}</div>
<div className={styles.centered} style={{ width: '15rem'}}>{this.props.data.database}</div>
<div className={styles.flexed} style={{ minWidth: '3rem', justifyContent: 'space-between'}}>
<div className={styles.ico}><i className="fa fa-pencil" id={this.props.data.name} /></div>
@ -81,7 +79,7 @@ class RowDatabase extends React.Component { // eslint-disable-line react/prefer-
</ModalHeader>
<div className={styles.bordered} />
<form>
<form autoComplete="off">
<ModalBody className={styles.modalBody}>
<div className={styles.spacerSmall} />

2
packages/strapi-plugin-settings-manager/package.json
View File

@ -67,4 +67,4 @@
"npm": ">= 3.0.0"
},
"license": "MIT"
}
}

2
packages/strapi-utils/package.json
View File

@ -45,4 +45,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

18
packages/strapi/package.json
View File

@ -50,14 +50,14 @@
"koa-static": "^4.0.1",
"lodash": "^4.16.5",
"node-schedule": "^1.2.0",
"strapi-generate": "^3.0.0-alpha.4.8",
"strapi-generate-admin": "^3.0.0-alpha.4.8",
"strapi-generate-api": "^3.0.0-alpha.4.8",
"strapi-generate-new": "^3.0.0-alpha.4.8",
"strapi-generate-policy": "^3.0.0-alpha.4.8",
"strapi-generate-service": "^3.0.0-alpha.4.8",
"strapi-mongoose": "^3.0.0-alpha.4.8",
"strapi-utils": "^3.0.0-alpha.4.8"
"strapi-generate": "file:../strapi-generate",
"strapi-generate-admin": "file:../strapi-generate-admin",
"strapi-generate-api": "file:../strapi-generate-api",
"strapi-generate-new": "file:../strapi-generate-new",
"strapi-generate-policy": "file:../strapi-generate-policy",
"strapi-generate-service": "file:../strapi-generate-service",
"strapi-mongoose": "file:../strapi-mongoose",
"strapi-utils": "file:../strapi-utils"
},
"author": {
"email": "hi@strapi.io",
@ -84,4 +84,4 @@
},
"preferGlobal": true,
"license": "MIT"
}
}