From 07cac8225f8089a079afff139ba4a13c77d2a93b Mon Sep 17 00:00:00 2001 From: veshu Date: Wed, 24 Jul 2019 16:34:26 +0545 Subject: [PATCH 01/13] pr from https://github.com/topcoder-platform/topcoder-react-ui-kit/pull/11/ --- src/styles/_mixins/variables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/_mixins/variables.scss b/src/styles/_mixins/variables.scss index 4936adc..c19c6da 100644 --- a/src/styles/_mixins/variables.scss +++ b/src/styles/_mixins/variables.scss @@ -37,6 +37,7 @@ $tc-gray-neutral-light: #fafafb; $tc-white: #fff; /* Accents & Shades. */ +$tc-dark-blue-120: #006ad7; $tc-dark-blue-110: #006dea; $tc-dark-blue-105: #006feb; $tc-dark-blue-100: #0681ff; From 9cb85d52eb07d860156fa4c634cc97ef14829b97 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 25 Jul 2019 20:40:54 +0530 Subject: [PATCH 02/13] npm version update --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a3fe23..46baaaf 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lint:scss": "./node_modules/.bin/stylelint **/*.scss --syntax scss", "test": "npm run lint && npm run jest" }, - "version": "1.0.0", + "version": "1.0.1", "dependencies": { "prop-types": "^15.6.2", "react": "^16.4.1", From 587b17f3641162ace3af2affb930f4a02efb3eee Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 25 Jul 2019 20:52:33 +0530 Subject: [PATCH 03/13] Updating npm package version to v1.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 46baaaf..85a7d37 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lint:scss": "./node_modules/.bin/stylelint **/*.scss --syntax scss", "test": "npm run lint && npm run jest" }, - "version": "1.0.1", + "version": "1.0.2", "dependencies": { "prop-types": "^15.6.2", "react": "^16.4.1", From e22283a2de608db3eea518f5b7a1bb346860c8f1 Mon Sep 17 00:00:00 2001 From: r0hit-gupta Date: Thu, 25 Jul 2019 22:03:14 +0530 Subject: [PATCH 04/13] update colors --- src/styles/_mixins/variables.scss | 54 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/styles/_mixins/variables.scss b/src/styles/_mixins/variables.scss index 4936adc..7c85f09 100644 --- a/src/styles/_mixins/variables.scss +++ b/src/styles/_mixins/variables.scss @@ -37,7 +37,7 @@ $tc-gray-neutral-light: #fafafb; $tc-white: #fff; /* Accents & Shades. */ -$tc-dark-blue-110: #006dea; +$tc-dark-blue-110: #006ad7; $tc-dark-blue-105: #006feb; $tc-dark-blue-100: #0681ff; $tc-dark-blue-70: #55a5ff; @@ -45,24 +45,24 @@ $tc-dark-blue-30: #cee6ff; $tc-dark-blue-10: #f4f9ff; /* Light Blue - design color code. */ -$tc-light-blue-110: #169ed9; -$tc-light-blue-100: #26ade9; -$tc-light-blue-70: #67c5ef; -$tc-light-blue-30: #bde6f8; +$tc-light-blue-110: #009ddc; +$tc-light-blue-100: #15acec; +$tc-light-blue-70: #63c4f1; +$tc-light-blue-30: #bce6f9; $tc-light-blue-10: #e9f6fc; /* Warm Orange - data science color code. */ -$tc-orange-110: #f26500; -$tc-orange-100: #fb7d22; -$tc-orange-70: #fda464; -$tc-orange-30: #fee3d0; +$tc-orange-110: #ba4c00; +$tc-orange-100: #fd7d00; +$tc-orange-70: #ffa45d; +$tc-orange-30: #ffe3cf; $tc-orange-10: #fff0eb; /* Red - used for warnings/ */ $tc-red-110: #ea1900; -$tc-red-100: #f22f24; -$tc-red-70: #ff5b52; -$tc-red-30: #ffd4d1; +$tc-red-100: #f52c14; +$tc-red-70: #ff5a4c; +$tc-red-30: #ffd4d0; $tc-red-10: #fff4f4; /* Yellow. */ @@ -74,17 +74,17 @@ $tc-yellow-10: #fffde5; /* Greens - development color code. */ $tc-green-120: #328732; -$tc-green-110: #55b000; -$tc-green-100: #60c700; -$tc-green-70: #96d957; -$tc-green-30: #cfefb2; -$tc-green-10: #effae5; +$tc-green-110: #258025; +$tc-green-100: #5cc900; +$tc-green-70: #94db4e; +$tc-green-30: #cef0af; +$tc-green-10: #effae4; /* Purples. */ -$tc-purple-110: #9050a3; -$tc-purple-100: #9050a3; -$tc-purple-70: #b47dd6; -$tc-purple-30: #e2c7f2; +$tc-purple-110: #753488; +$tc-purple-100: #914da5; +$tc-purple-70: #b57ad8; +$tc-purple-30: #e2c6f3; $tc-purple-10: #f8f2fb; /* TC Metal colors - Badges. @@ -92,7 +92,7 @@ $tc-purple-10: #f8f2fb; * For metals the level 100 is the base metal color; 110 is for text inside * the metal-colored areas; and 130 is for small text inside metal-colored * areas, for better visibility. */ -$tc-gold-130: #865e07; +$tc-gold-130: #9a6d00; $tc-gold-110: #c99014; $tc-gold-100: #ffd84d; @@ -102,13 +102,13 @@ $tc-silver-100: #d1d0cf; $tc-bronze-130: #733d17; $tc-bronze-110: #854e29; -$tc-bronze-100: #d98d64; +$tc-bronze-100: #d98f64; /* Pastel colors, used for levels. */ -$tc-pastel-green: #25c089; -$tc-pastel-blue: #666eff; -$tc-pastel-yellow: #fcb816; -$tc-pastel-crimson: #e6175c; +$tc-pastel-green: #12c188; +$tc-pastel-blue: #5656f4; +$tc-pastel-yellow: #feb900; +$tc-pastel-crimson: #e90c5a; /* Color aliases. */ From fdfe7fd7cff05490dd87abe3f44542ec28fbbe0f Mon Sep 17 00:00:00 2001 From: r0hit-gupta Date: Thu, 25 Jul 2019 22:17:37 +0530 Subject: [PATCH 05/13] update colors --- src/styles/_mixins/variables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/_mixins/variables.scss b/src/styles/_mixins/variables.scss index 7c85f09..e8e6264 100644 --- a/src/styles/_mixins/variables.scss +++ b/src/styles/_mixins/variables.scss @@ -37,6 +37,7 @@ $tc-gray-neutral-light: #fafafb; $tc-white: #fff; /* Accents & Shades. */ +$tc-dark-blue-120: #006ad7; $tc-dark-blue-110: #006ad7; $tc-dark-blue-105: #006feb; $tc-dark-blue-100: #0681ff; From bcf361f0291de85286dd24921e71dfaf048bd376 Mon Sep 17 00:00:00 2001 From: r0hit-gupta Date: Thu, 25 Jul 2019 22:20:54 +0530 Subject: [PATCH 06/13] update colors --- src/shared/components/buttons/themes/danger.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/components/buttons/themes/danger.scss b/src/shared/components/buttons/themes/danger.scss index 5913fba..e1b368c 100644 --- a/src/shared/components/buttons/themes/danger.scss +++ b/src/shared/components/buttons/themes/danger.scss @@ -5,7 +5,7 @@ @import "default"; @mixin button { - background: $tc-red-70; + background: $tc-red-110; border-color: transparent; color: $tc-white; } @@ -38,7 +38,7 @@ } &:active { - background-color: $tc-red; + background-color: $tc-red-110; background-image: none; box-shadow: inset 0 1px 3px 0 rgba(71, 71, 79, 0.38); border-color: transparent; From 25b6443ab42e8f6b610b6a5f9dc3f11508b4708f Mon Sep 17 00:00:00 2001 From: r0hit-gupta Date: Thu, 25 Jul 2019 22:23:58 +0530 Subject: [PATCH 07/13] update colors --- src/shared/components/buttons/themes/primary.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/buttons/themes/primary.scss b/src/shared/components/buttons/themes/primary.scss index 09ef08d..7c4dba9 100644 --- a/src/shared/components/buttons/themes/primary.scss +++ b/src/shared/components/buttons/themes/primary.scss @@ -5,7 +5,7 @@ @import "default"; @mixin button { - background: $tc-dark-blue; + background: $tc-dark-blue-110; border-color: transparent; color: $tc-white; } From 8df7ee5b46b5c127a15c3977a6396812d7ef00ef Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 25 Jul 2019 23:59:05 +0530 Subject: [PATCH 08/13] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 85a7d37..d393405 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lint:scss": "./node_modules/.bin/stylelint **/*.scss --syntax scss", "test": "npm run lint && npm run jest" }, - "version": "1.0.2", + "version": "1.0.3", "dependencies": { "prop-types": "^15.6.2", "react": "^16.4.1", From a472d23e186899c17e4763f46fd5c727e296c7d6 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Mon, 29 Jul 2019 20:39:17 +0530 Subject: [PATCH 09/13] Upgrading npm version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d393405..9c11aa8 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lint:scss": "./node_modules/.bin/stylelint **/*.scss --syntax scss", "test": "npm run lint && npm run jest" }, - "version": "1.0.3", + "version": "1.0.4", "dependencies": { "prop-types": "^15.6.2", "react": "^16.4.1", From 92c2e46c348d430d17fd2d794cf0ccca82ef666c Mon Sep 17 00:00:00 2001 From: prakashdurlabhji Date: Tue, 30 Jul 2019 02:42:18 +0530 Subject: [PATCH 10/13] issue 2871 fix --- src/shared/components/tags/primary/data-science.scss | 2 +- src/shared/components/tags/primary/design.scss | 2 +- src/shared/components/tags/primary/development.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/components/tags/primary/data-science.scss b/src/shared/components/tags/primary/data-science.scss index 9cefbf0..1960f6d 100644 --- a/src/shared/components/tags/primary/data-science.scss +++ b/src/shared/components/tags/primary/data-science.scss @@ -12,7 +12,7 @@ &:focus, &:hover { color: $tc-white; - background-color: $tc-orange; + background-color: $tc-orange-110; } &:visited { diff --git a/src/shared/components/tags/primary/design.scss b/src/shared/components/tags/primary/design.scss index 633192c..df96c37 100644 --- a/src/shared/components/tags/primary/design.scss +++ b/src/shared/components/tags/primary/design.scss @@ -12,7 +12,7 @@ &:focus, &:hover { color: $tc-white; - background-color: $tc-light-blue; + background-color: $tc-light-blue-110; } &:visited { diff --git a/src/shared/components/tags/primary/development.scss b/src/shared/components/tags/primary/development.scss index eb020f7..60e57c5 100644 --- a/src/shared/components/tags/primary/development.scss +++ b/src/shared/components/tags/primary/development.scss @@ -12,7 +12,7 @@ &:focus, &:hover { color: $tc-white; - background-color: $tc-green; + background-color: $tc-green-110; } &:visited { From 21dc1c8d9065452ace6fb5c279a2c015e257bdf3 Mon Sep 17 00:00:00 2001 From: r0hit-gupta Date: Tue, 30 Jul 2019 22:24:32 +0530 Subject: [PATCH 11/13] update colors --- src/styles/_mixins/variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/_mixins/variables.scss b/src/styles/_mixins/variables.scss index e8e6264..325fca7 100644 --- a/src/styles/_mixins/variables.scss +++ b/src/styles/_mixins/variables.scss @@ -46,7 +46,7 @@ $tc-dark-blue-30: #cee6ff; $tc-dark-blue-10: #f4f9ff; /* Light Blue - design color code. */ -$tc-light-blue-110: #009ddc; +$tc-light-blue-110: #0076a5; $tc-light-blue-100: #15acec; $tc-light-blue-70: #63c4f1; $tc-light-blue-30: #bce6f9; @@ -75,7 +75,7 @@ $tc-yellow-10: #fffde5; /* Greens - development color code. */ $tc-green-120: #328732; -$tc-green-110: #258025; +$tc-green-110: #258205; $tc-green-100: #5cc900; $tc-green-70: #94db4e; $tc-green-30: #cef0af; From 6d0ec227a6d55a4ea68136544cb6a10ac8cbb7aa Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 31 Jul 2019 10:15:26 +0530 Subject: [PATCH 12/13] update npm version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c11aa8..fee1a60 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lint:scss": "./node_modules/.bin/stylelint **/*.scss --syntax scss", "test": "npm run lint && npm run jest" }, - "version": "1.0.4", + "version": "1.0.6", "dependencies": { "prop-types": "^15.6.2", "react": "^16.4.1", From 05e77e6d0a5d68fb2f73393b0b7eef7a4633b614 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 31 Jul 2019 12:41:13 +0530 Subject: [PATCH 13/13] Update npm version to 1.0.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fee1a60..20761fe 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lint:scss": "./node_modules/.bin/stylelint **/*.scss --syntax scss", "test": "npm run lint && npm run jest" }, - "version": "1.0.6", + "version": "1.0.7", "dependencies": { "prop-types": "^15.6.2", "react": "^16.4.1",