Skip to content

Commit

Permalink
Rcint 3573 add color for header (#181)
Browse files Browse the repository at this point in the history
* upgrade commmon

* fix color
  • Loading branch information
alvita authored Apr 25, 2017
1 parent ef5692c commit fc7bc92
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"redux-thunk": "^2.1.0",
"ringcentral": "3.0.0",
"ringcentral-client": "^1.0.0-rc1",
"ringcentral-integration": "^0.5.19",
"ringcentral-integration": "^0.5.21",
"sass-loader": "^4.1.1",
"source-map-loader": "^0.1.5",
"style-loader": "^0.13.1",
Expand Down
3 changes: 3 additions & 0 deletions src/lib/commonStyles/colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ $rc-blue: #0684bd !default;

$rc-blue-highlight: rgba(6, 132, 189, 0.4) !default;

$rc-blue-highlight-solid: rgba(173, 210, 227, 1) !default;

$rc-orange: #e07800 !default;

$darkergray: #797979 !default;
Expand All @@ -24,6 +26,7 @@ $lightblack: #303030 !default;
//---- variable for theme ----//
$primary-color: $rc-blue !default;
$primary-color-highlight: $rc-blue-highlight !default;
$primary-color-highlight-solid: $rc-blue-highlight-solid !default;

$secondary-color: $rc-orange !default;

Expand Down
50 changes: 46 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2762,6 +2762,12 @@ [email protected]:
dependencies:
loader-utils "~0.2.5"

file-loader@^0.10.1:
version "0.10.1"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.1.tgz#815034119891fc6441fb5a64c11bc93c22ddd842"
dependencies:
loader-utils "^1.0.2"

file-loader@^0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.9.0.tgz#1d2daddd424ce6d1b07cfe3f79731bed3617ab42"
Expand Down Expand Up @@ -5261,6 +5267,10 @@ optionator@^0.8.1, optionator@^0.8.2:
type-check "~0.3.2"
wordwrap "~1.0.0"

options@>=0.0.5:
version "0.0.6"
resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"

orchestrator@^0.3.0:
version "0.3.8"
resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
Expand Down Expand Up @@ -5773,6 +5783,10 @@ progress@^1.1.8:
version "1.1.8"
resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"

promiscuous@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/promiscuous/-/promiscuous-0.6.0.tgz#54014cd3d62cafe831e3354990c05ff5b78c8892"

[email protected]:
version "5.0.0"
resolved "https://registry.yarnpkg.com/promise/-/promise-5.0.0.tgz#ac40b7866bed7aaf796ab5b79b80325e047ec0ef"
Expand Down Expand Up @@ -6368,19 +6382,28 @@ ringcentral-client@^1.0.0-rc1:
form-data "^2.1.2"
isomorphic-fetch "^2.2.1"

ringcentral-integration@^0.5.19:
version "0.5.19"
resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.5.19.tgz#8a6fc06d622185f95d02b16fdac87e5be1f2a8ca"
ringcentral-integration@^0.5.21:
version "0.5.21"
resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.5.21.tgz#fc00faf6b2612fd91372ec8e0011ff30b8a326b3"
dependencies:
data-types "git+https://github.com/u9520107/data-types.git#release"
file-loader "^0.10.1"
json-mask "^0.3.8"
loganberry "^0.9.1"
phoneformat.js "^1.0.3"
redux "^3.5.2"
reselect "^2.5.4"
ringcentral-web-phone "^0.4.1"
url-loader "^0.5.8"
uuid "^3.0.1"
yards "^0.1.4"

ringcentral-web-phone@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/ringcentral-web-phone/-/ringcentral-web-phone-0.4.1.tgz#dfa9d7e67dc8ae02bea844718552cd5738138001"
dependencies:
sip.js "^0.7.7"

[email protected]:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ringcentral/-/ringcentral-3.0.0.tgz#0afe670196accdd97c438b8ed66294f7b08e6538"
Expand Down Expand Up @@ -6539,6 +6562,14 @@ signal-exit@^3.0.0:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"

sip.js@^0.7.7:
version "0.7.7"
resolved "https://registry.yarnpkg.com/sip.js/-/sip.js-0.7.7.tgz#5274ea19383b3593e0f90945702cd311562a2add"
dependencies:
ws "^1.0.1"
optionalDependencies:
promiscuous "^0.6.0"

slash@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
Expand Down Expand Up @@ -7063,6 +7094,10 @@ uid-number@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"

[email protected]:
version "1.0.2"
resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"

unc-path-regex@^0.1.0:
version "0.1.2"
resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
Expand Down Expand Up @@ -7110,7 +7145,7 @@ [email protected]:
loader-utils "0.2.x"
mime "1.2.x"

url-loader@^0.5.7:
url-loader@^0.5.7, url-loader@^0.5.8:
version "0.5.8"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
dependencies:
Expand Down Expand Up @@ -7466,6 +7501,13 @@ write@^0.2.1:
dependencies:
mkdirp "^0.5.1"

ws@^1.0.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
dependencies:
options ">=0.0.5"
ultron "1.0.x"

xml-char-classes@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
Expand Down

0 comments on commit fc7bc92

Please sign in to comment.