yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-18 03:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Jim Laurie 2017-12-07 17:04:24 +01:00
commit b7712cf512
10 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
# Don't check auto-generated stuff into git # Don't check auto-generated stuff into git
coverage coverage
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

@ -79,7 +79,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/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-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

@ -77,7 +77,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 {