diff --git a/packages/strapi-admin/admin/src/components/Row/index.js b/packages/strapi-admin/admin/src/components/Row/index.js index d3339bed41..b55c6f9e47 100644 --- a/packages/strapi-admin/admin/src/components/Row/index.js +++ b/packages/strapi-admin/admin/src/components/Row/index.js @@ -44,11 +44,13 @@ class Row extends React.Component { }, { icoType: 'trash', + id: this.props.name, onClick: this.handleClick, }, ] : [ { icoType: 'trash', + id: this.props.name, onClick: this.handleClick, }, ]; diff --git a/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js b/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js index a775970b33..5da414bf76 100644 --- a/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js +++ b/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js @@ -12,6 +12,9 @@ import { makeSelectPluginToDelete } from './selectors'; export function* deletePlugin() { try { const plugin = yield select(makeSelectPluginToDelete()); + + console.log("DELETE", plugin); + const requestUrl = `/admin/plugins/uninstall/${plugin}`; const resp = yield call(request, requestUrl, { method: 'DELETE' }); diff --git a/packages/strapi-plugin-upload/admin/src/assets/icons/icon_upload_2.svg b/packages/strapi-plugin-upload/admin/src/assets/icons/icon_upload_2.svg deleted file mode 100644 index 55d6278ae4..0000000000 --- a/packages/strapi-plugin-upload/admin/src/assets/icons/icon_upload_2.svg +++ /dev/null @@ -1 +0,0 @@ -icon_upload_2 \ No newline at end of file diff --git a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/index.js b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/index.js index 2687101067..07bd7f0b0f 100644 --- a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/index.js @@ -13,6 +13,7 @@ import styles from './styles.scss'; /* eslint-disable react/no-string-refs */ /* eslint-disable jsx-a11y/label-has-for */ +/* eslint-disable react/jsx-tag-spacing */ class PluginInputFile extends React.PureComponent { state = { isDraging: false }; @@ -39,7 +40,6 @@ class PluginInputFile extends React.PureComponent { ); - console.log(showLoader); return ( + {!showLoader && } {showLoader && } diff --git a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss index 9fbd506895..8a8bae1dd9 100644 --- a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss +++ b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss @@ -4,30 +4,36 @@ bottom: 0; left: 0; right: 0; - background-image: url('../../assets/icons/icon_upload_2.svg'); - background-size: auto 64px; - background-position: center 27px; - background-repeat: no-repeat; } .pluginInputFile { position: relative; height: 146px; width: 100%; + padding-top: 28px; border: 2px dashed #E3E9F3; border-radius: 2px; - background-image: url('../../assets/icons/icon_upload_2.svg'); - background-size: auto 64px; - background-position: center 27px; - background-repeat: no-repeat; + text-align: center; > input { display: none; } + + .icon{ + width: 82px; + path{ + fill: #CCD0DA; + transition: fill .3s ease; + } + } + + &:hover{ + cursor: pointer; + } } .textWrapper { - margin-top: 103px; + margin-top: 10px; text-align: center; font-size: 13px; color: #9EA7B8; @@ -48,28 +54,49 @@ cursor: pointer; } +@mixin smoothBlink($firstColor, $secondColor) { + @-webkit-keyframes blink { + 0% { + fill: $firstColor; + background-color: $firstColor; + } + 26% { + fill: $secondColor; + background-color: $secondColor; + } + 76% { + fill: $firstColor; + background-color: $firstColor; + } + } + + @keyframes blink { + 0% { + fill: $firstColor; + background-color: $firstColor; + } + 26% { + fill: $secondColor; + background-color: $secondColor; + } + 76% { + fill: $firstColor; + background-color: $firstColor; + } + } + + -webkit-animation: blink 2s linear infinite; + -moz-animation: blink 2s linear infinite; + -o-animation: blink 2s linear infinite; + animation: blink 2s linear infinite; +} + .quadrat { - border: 2px dashed rgba(28,93,231,0.10) !important; - -webkit-animation: blink 1s infinite; /* Safari 4+ */ - -moz-animation: blink 1s infinite; /* Fx 5+ */ - -o-animation: blink 1s infinite; /* Opera 12+ */ - animation: blink 1s infinite; /* IE 10+, Fx 29+ */ -} + .icon{ + path { + fill: #729BEF; + } + } -@-webkit-keyframes blink { - 0%, 49% { - background-color: rgba(28,93,231,0.01); - } - 50%, 100% { - background-color: rgb(250, 250, 251); - } -} - -@keyframes blink { - 0%, 49% { - background-color: rgba(28,93,231,0.01); - } - 50%, 100% { - background-color: rgb(250, 250, 251); - } + @include smoothBlink(transparent, rgba(28, 93, 231, 0.05)); }
{!showLoader && } {showLoader && } diff --git a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss index 9fbd506895..8a8bae1dd9 100644 --- a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss +++ b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss @@ -4,30 +4,36 @@ bottom: 0; left: 0; right: 0; - background-image: url('../../assets/icons/icon_upload_2.svg'); - background-size: auto 64px; - background-position: center 27px; - background-repeat: no-repeat; } .pluginInputFile { position: relative; height: 146px; width: 100%; + padding-top: 28px; border: 2px dashed #E3E9F3; border-radius: 2px; - background-image: url('../../assets/icons/icon_upload_2.svg'); - background-size: auto 64px; - background-position: center 27px; - background-repeat: no-repeat; + text-align: center; > input { display: none; } + + .icon{ + width: 82px; + path{ + fill: #CCD0DA; + transition: fill .3s ease; + } + } + + &:hover{ + cursor: pointer; + } } .textWrapper { - margin-top: 103px; + margin-top: 10px; text-align: center; font-size: 13px; color: #9EA7B8; @@ -48,28 +54,49 @@ cursor: pointer; } +@mixin smoothBlink($firstColor, $secondColor) { + @-webkit-keyframes blink { + 0% { + fill: $firstColor; + background-color: $firstColor; + } + 26% { + fill: $secondColor; + background-color: $secondColor; + } + 76% { + fill: $firstColor; + background-color: $firstColor; + } + } + + @keyframes blink { + 0% { + fill: $firstColor; + background-color: $firstColor; + } + 26% { + fill: $secondColor; + background-color: $secondColor; + } + 76% { + fill: $firstColor; + background-color: $firstColor; + } + } + + -webkit-animation: blink 2s linear infinite; + -moz-animation: blink 2s linear infinite; + -o-animation: blink 2s linear infinite; + animation: blink 2s linear infinite; +} + .quadrat { - border: 2px dashed rgba(28,93,231,0.10) !important; - -webkit-animation: blink 1s infinite; /* Safari 4+ */ - -moz-animation: blink 1s infinite; /* Fx 5+ */ - -o-animation: blink 1s infinite; /* Opera 12+ */ - animation: blink 1s infinite; /* IE 10+, Fx 29+ */ -} + .icon{ + path { + fill: #729BEF; + } + } -@-webkit-keyframes blink { - 0%, 49% { - background-color: rgba(28,93,231,0.01); - } - 50%, 100% { - background-color: rgb(250, 250, 251); - } -} - -@keyframes blink { - 0%, 49% { - background-color: rgba(28,93,231,0.01); - } - 50%, 100% { - background-color: rgb(250, 250, 251); - } + @include smoothBlink(transparent, rgba(28, 93, 231, 0.05)); }