diff --git a/client/components/ProjectCard/ProjectCard.js b/client/components/ProjectCard/ProjectCard.js index 4deb8aaf..b7cc695f 100755 --- a/client/components/ProjectCard/ProjectCard.js +++ b/client/components/ProjectCard/ProjectCard.js @@ -74,7 +74,7 @@ class ProjectCard extends Component {
- +
diff --git a/client/components/ProjectCard/ProjectCard.scss b/client/components/ProjectCard/ProjectCard.scss index 1b091b3f..574e01b2 100755 --- a/client/components/ProjectCard/ProjectCard.scss +++ b/client/components/ProjectCard/ProjectCard.scss @@ -31,7 +31,7 @@ right: 0; width: .48rem; height: .48rem; - background: linear-gradient(225deg, #ccc, #ccc 50%, transparent 0); + // background: linear-gradient(225deg, #ccc, #ccc 50%, transparent 0); border-top-right-radius: 4px; .icon { cursor: pointer; @@ -41,6 +41,9 @@ right: 0; top: 0; } + .icon.active { + color: #fac200; + } } } .m-card { diff --git a/client/containers/Follows/Follows.js b/client/containers/Follows/Follows.js index 0669092f..9351cfea 100755 --- a/client/containers/Follows/Follows.js +++ b/client/containers/Follows/Follows.js @@ -73,7 +73,7 @@ class Follows extends Component { {data.length ? data.map((item, index) => { return ( - + ); }): } diff --git a/client/styles/common.scss b/client/styles/common.scss index 8424e088..04783c84 100755 --- a/client/styles/common.scss +++ b/client/styles/common.scss @@ -10,8 +10,12 @@ html, body { SimSun, sans-serif; margin: 0; padding: 0; - background: #ececec; } + +html { + background-color: #202d3a; +} + ::selection { background-color: #2395f1; } diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 5a52f9f6..37106811 100755 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -5296,6 +5296,14 @@ } } }, + "string_decoder": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", + "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", + "requires": { + "safe-buffer": "5.0.1" + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -5306,14 +5314,6 @@ "strip-ansi": "3.0.1" } }, - "string_decoder": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", - "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", - "requires": { - "safe-buffer": "5.0.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -6051,7 +6051,7 @@ "dependencies": { "async": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz", + "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/async/-/async-1.5.0.tgz", "integrity": "sha1-J5ZkJyNXOFlWVjP8YnRES+4vjOM=" }, "loader-utils": { @@ -12588,6 +12588,22 @@ } } }, + "require_optional": { + "version": "1.0.1", + "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/require_optional/-/require_optional-1.0.1.tgz", + "integrity": "sha1-TPNaQkf2TKPfjC7yCMxJSxyo/C4=", + "requires": { + "resolve-from": "2.0.0", + "semver": "5.4.1" + }, + "dependencies": { + "resolve-from": { + "version": "2.0.0", + "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/resolve-from/-/resolve-from-2.0.0.tgz", + "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" + } + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/require-directory/-/require-directory-2.1.1.tgz", @@ -12612,22 +12628,6 @@ "resolve-from": "1.0.1" } }, - "require_optional": { - "version": "1.0.1", - "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/require_optional/-/require_optional-1.0.1.tgz", - "integrity": "sha1-TPNaQkf2TKPfjC7yCMxJSxyo/C4=", - "requires": { - "resolve-from": "2.0.0", - "semver": "5.4.1" - }, - "dependencies": { - "resolve-from": { - "version": "2.0.0", - "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/resolve-from/-/resolve-from-2.0.0.tgz", - "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" - } - } - }, "requires-port": { "version": "1.0.0", "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/requires-port/-/requires-port-1.0.0.tgz", @@ -13301,6 +13301,14 @@ "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-convert": { "version": "0.2.1", "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/string-convert/-/string-convert-0.2.1.tgz", @@ -13387,14 +13395,6 @@ "strip-ansi": "3.0.1" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/stringstream/-/stringstream-0.0.5.tgz", @@ -14679,7 +14679,7 @@ }, "webpack-dev-middleware": { "version": "1.12.0", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz", + "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz", "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=", "requires": { "memory-fs": "0.4.1", @@ -14691,7 +14691,7 @@ "dependencies": { "time-stamp": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz", + "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/time-stamp/-/time-stamp-2.0.0.tgz", "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=" } } @@ -15215,7 +15215,7 @@ }, "ykit-config-antd": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/ykit-config-antd/-/ykit-config-antd-0.1.3.tgz", + "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/ykit-config-antd/-/ykit-config-antd-0.1.3.tgz", "integrity": "sha1-qUWmV0EHgAd0OrPgz3eBbD9KPN4=", "requires": { "antd": "2.12.8",