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

Merge branch 'master' into docImprove

Browse Source
This commit is contained in:
Jim LAURIE 2018-02-19 10:58:23 +01:00 committed by GitHub
commit 71298adb53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/styles.scss
View File

@ -3,6 +3,12 @@
.leftMenuLinkContainer { /* stylelint-ignore */
padding-top: .6rem;
position: absolute;
top: 60px;
right: 0;
bottom: 0;
left: 0;
overflow-y: scroll;
}
.title {

5
packages/strapi-generate-new/lib/index.js
View File

@ -63,11 +63,6 @@ module.exports = {
// Empty public directory.
'public': {
folder: {}
},
// Empty node_modules directory.
'node_modules': {
folder: {}
}
}
};

2
packages/strapi-plugin-content-manager/admin/src/translations/en.json
View File

@ -7,7 +7,7 @@
"containers.Edit.submit": "Save",
"containers.Edit.editing": "Editing...",
"containers.Edit.delete": "Delete",
"containers.Edit.cancel": "Cancel",
"containers.Edit.cancel": "Reset",
"containers.Edit.returnList": "Return to list",
"containers.List.addAnEntry": "Add New {entity}",
"containers.List.pluginHeaderDescription": "{label} entries found",