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

Merge pull request #353 from strapi/fix/release

Browse Source 
Fix setup and apply design changes
This commit is contained in:
Jim LAURIE 2017-12-05 18:47:48 +01:00 committed by GitHub
commit 839008b080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-admin/.gitignore vendored
View File

@ -1,7 +1,7 @@
# Don't check auto-generated stuff into git # Don't check auto-generated stuff into git
coverage coverage
build
node_modules node_modules
build
stats.json stats.json
package-lock.json package-lock.json

2
packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss
View File

@ -17,6 +17,7 @@
color: $left-menu-link-color; color: $left-menu-link-color;
text-decoration: none; text-decoration: none;
display: block; display: block;
-webkit-font-smoothing: antialiased;
&:hover { &:hover {
color: $white; color: $white;
@ -43,7 +44,6 @@
.linkIcon { .linkIcon {
position: relative; position: relative;
margin-right: 1.2rem; margin-right: 1.2rem;
vertical-align: middle;
font-size: 1.2rem; font-size: 1.2rem;
width: 1.4rem; width: 1.4rem;
height: 1.2rem; height: 1.2rem;

2
packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js
View File

@ -65,7 +65,7 @@ function LeftMenuLinkContainer({ plugins }) {
<p className={styles.title}><FormattedMessage {...messages.general} /></p> <p className={styles.title}><FormattedMessage {...messages.general} /></p>
<ul className={styles.list}> <ul className={styles.list}>
<LeftMenuLink <LeftMenuLink
icon="cubes" icon="puzzle-piece"
label={messages.listPlugins.id} label={messages.listPlugins.id}
destination="/list-plugins" destination="/list-plugins"
/> />

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

@ -13,7 +13,7 @@
color: $left-menu-title-color; color: $left-menu-title-color;
text-transform: uppercase; text-transform: uppercase;
font-size: 1.1rem; font-size: 1.1rem;
letter-spacing: .2rem; letter-spacing: .1rem;
font-weight: 600; font-weight: 600;
} }

2
packages/strapi-admin/admin/src/containers/HomePage/styles.scss
View File

@ -60,7 +60,7 @@
&:active { &:active {
box-shadow: inset 1px 1px 3px rgba(0,0,0,.15); box-shadow: inset 1px 1px 3px rgba(0,0,0,.15);
} }
padding-top: 4px;
padding-left: 1.6rem; padding-left: 1.6rem;
padding-right: 1.6rem; padding-right: 1.6rem;
&:before { &:before {

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

@ -34,12 +34,12 @@
"eslint": "^4.11.0", "eslint": "^4.11.0",
"eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2", "eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.7.0", "eslint-config-prettier": "^2.8.0",
"eslint-import-resolver-webpack": "^0.8.3", "eslint-import-resolver-webpack": "^0.8.3",
"eslint-plugin-babel": "^4.1.2", "eslint-plugin-babel": "^4.1.2",
"eslint-plugin-import": "^2.8.0", "eslint-plugin-import": "^2.8.0",
"eslint-plugin-jsx-a11y": "^6.0.2", "eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.4.0", "eslint-plugin-react": "^7.5.1",
"eslint-plugin-redux-saga": "^0.4.0", "eslint-plugin-redux-saga": "^0.4.0",
"extract-text-webpack-plugin": "^1.0.1", "extract-text-webpack-plugin": "^1.0.1",
"html-loader": "^0.4.3", "html-loader": "^0.4.3",

2
packages/strapi-helper-plugin/lib/internals/webpack/manifest.json
View File

File diff suppressed because one or more lines are too long

1
packages/strapi-helper-plugin/lib/src/components/Button/styles.scss
View File

@ -74,7 +74,6 @@
&:active { &:active {
box-shadow: inset 1px 1px 3px rgba(0,0,0,.15); box-shadow: inset 1px 1px 3px rgba(0,0,0,.15);
} }
padding-top: 4px;
padding-left: 1.6rem; padding-left: 1.6rem;
padding-right: 1.6rem; padding-right: 1.6rem;
&:before { &:before {

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

@ -83,7 +83,7 @@
"node-sass": "^4.5.3", "node-sass": "^4.5.3",
"null-loader": "^0.1.1", "null-loader": "^0.1.1",
"plop": "^1.8.0", "plop": "^1.8.0",
"postcss-cssnext": "^3.0.2", "postcss-cssnext": "^2.11.0",
"postcss-focus": "^2.0.0", "postcss-focus": "^2.0.0",
"postcss-loader": "^2.0.6", "postcss-loader": "^2.0.6",
"postcss-reporter": "^5.0.0", "postcss-reporter": "^5.0.0",

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

@ -54,12 +54,12 @@
"eslint": "^4.11.0", "eslint": "^4.11.0",
"eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2", "eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.7.0", "eslint-config-prettier": "^2.8.0",
"eslint-import-resolver-webpack": "^0.8.3", "eslint-import-resolver-webpack": "^0.8.3",
"eslint-plugin-babel": "^4.1.2", "eslint-plugin-babel": "^4.1.2",
"eslint-plugin-import": "^2.8.0", "eslint-plugin-import": "^2.8.0",
"eslint-plugin-jsx-a11y": "^6.0.2", "eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.4.0", "eslint-plugin-react": "^7.5.1",
"eslint-plugin-redux-saga": "^0.4.0", "eslint-plugin-redux-saga": "^0.4.0",
"plop": "^1.9.0", "plop": "^1.9.0",
"prettier": "^1.8.2", "prettier": "^1.8.2",

4
packages/strapi-plugin-content-type-builder/package.json
View File

@ -41,12 +41,12 @@
"eslint": "^4.11.0", "eslint": "^4.11.0",
"eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2", "eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.7.0", "eslint-config-prettier": "^2.8.0",
"eslint-import-resolver-webpack": "^0.8.3", "eslint-import-resolver-webpack": "^0.8.3",
"eslint-plugin-babel": "^4.1.2", "eslint-plugin-babel": "^4.1.2",
"eslint-plugin-import": "^2.8.0", "eslint-plugin-import": "^2.8.0",
"eslint-plugin-jsx-a11y": "^6.0.2", "eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.4.0", "eslint-plugin-react": "^7.5.1",
"eslint-plugin-redux-saga": "^0.4.0", "eslint-plugin-redux-saga": "^0.4.0",
"plop": "^1.9.0", "plop": "^1.9.0",
"prettier": "^1.8.2", "prettier": "^1.8.2",

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

@ -38,12 +38,12 @@
"eslint": "^4.11.0", "eslint": "^4.11.0",
"eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2", "eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.7.0", "eslint-config-prettier": "^2.8.0",
"eslint-import-resolver-webpack": "^0.8.3", "eslint-import-resolver-webpack": "^0.8.3",
"eslint-plugin-babel": "^4.1.2", "eslint-plugin-babel": "^4.1.2",
"eslint-plugin-import": "^2.8.0", "eslint-plugin-import": "^2.8.0",
"eslint-plugin-jsx-a11y": "^6.0.2", "eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.4.0", "eslint-plugin-react": "^7.5.1",
"eslint-plugin-redux-saga": "^0.4.0", "eslint-plugin-redux-saga": "^0.4.0",
"plop": "^1.9.0", "plop": "^1.9.0",
"prettier": "^1.8.2", "prettier": "^1.8.2",