diff --git a/package.json b/package.json
index cdcf46d3b653a4b3c6fedfb94df664acaf23fbdf..bfdfcccad02db5d79a1c34de412d1153a93760eb 100644
--- a/package.json
+++ b/package.json
@@ -48,16 +48,16 @@
"@sentry/react": "^8.26.0",
"classnames": "^2.5.1",
"cozy-bar": "10.0.0",
- "cozy-client": "45.1.0",
- "cozy-device-helper": "3.0.0",
- "cozy-flags": ">3.2.2",
+ "cozy-client": "48.21.0",
+ "cozy-device-helper": "3.1.0",
+ "cozy-flags": "4.0.0",
"cozy-harvest-lib": "9.26.14",
"cozy-intent": "^2.22.0",
"cozy-keys-lib": ">=6.0.0",
"cozy-logger": ">1.7.0",
"cozy-realtime": "5.0.1",
"cozy-scripts": "8.3",
- "cozy-ui": "^101.0.0",
+ "cozy-ui": "^111.9.0",
"d3": "^7.9.0",
"file-saver": "^2.0.5",
"global": "^4.4.0",
diff --git a/src/components/Action/ActionList/__snapshots__/ActionList.spec.tsx.snap b/src/components/Action/ActionList/__snapshots__/ActionList.spec.tsx.snap
index e1772af32ac582ed39669e5e3220281fed659749..3d7043616ac3dc6220045b31bd66a2b9b5fa74f5 100644
--- a/src/components/Action/ActionList/__snapshots__/ActionList.spec.tsx.snap
+++ b/src/components/Action/ActionList/__snapshots__/ActionList.spec.tsx.snap
@@ -13,16 +13,6 @@ exports[`ActionList component should match snapshot and render correctly 3 butto
<span
class="MuiButton-label"
>
- <svg
- aria-hidden="true"
- class="action-icon styles__icon___23x3R"
- height="100"
- width="100"
- >
- <use
- xlink:href="#"
- />
- </svg>
<div
class="action-title text-18-bold"
>
@@ -38,16 +28,6 @@ exports[`ActionList component should match snapshot and render correctly 3 butto
<span
class="MuiButton-label"
>
- <svg
- aria-hidden="true"
- class="action-icon styles__icon___23x3R"
- height="100"
- width="100"
- >
- <use
- xlink:href="#"
- />
- </svg>
<div
class="action-title text-18-bold"
>
@@ -63,16 +43,6 @@ exports[`ActionList component should match snapshot and render correctly 3 butto
<span
class="MuiButton-label"
>
- <svg
- aria-hidden="true"
- class="action-icon styles__icon___23x3R"
- height="100"
- width="100"
- >
- <use
- xlink:href="#"
- />
- </svg>
<div
class="action-title text-18-bold"
>
diff --git a/src/components/Navbar/navBar.scss b/src/components/Navbar/navBar.scss
index 99dbd344f6d9655c511fbd9b95267e51e7f30504..e5343a7902d1f20a21d2c8379a836067ca183180 100644
--- a/src/components/Navbar/navBar.scss
+++ b/src/components/Navbar/navBar.scss
@@ -114,6 +114,11 @@
height: 56px;
}
+ .c-nav {
+ margin-top: 4px;
+ margin-bottom: 0;
+ }
+
.c-nav-item {
height: 54px;
margin: -0.3rem 0 0 0;
diff --git a/src/styles/base/_typography.scss b/src/styles/base/_typography.scss
index a0a743fb893995f6081059ed136c91c9bd35de1f..18a7a9be78df766853ffe9bfdad93522961ca7a8 100644
--- a/src/styles/base/_typography.scss
+++ b/src/styles/base/_typography.scss
@@ -36,7 +36,9 @@ p {
text-align: center;
letter-spacing: 0.15px;
color: $grey-bright;
- text-shadow: 0px -1px 0px #060609, 0px 1px 0px rgba(255, 255, 255, 0.07);
+ text-shadow:
+ 0px -1px 0px #060609,
+ 0px 1px 0px rgba(255, 255, 255, 0.07);
}
@each $name, $size in $text-size {
@@ -131,13 +133,3 @@ p {
font-size: 0.75rem;
}
}
-
-/* Cozy bar */
-.cozybar {
- font-family: $text-font;
- font-style: normal;
- font-weight: bold;
- font-size: 1.3125rem;
- line-height: 120%;
- color: $grey-bright;
-}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 626da078699f2a6ef09e718a9015ea0a3faee281..175d98f2b2e1f25451e321ade7d3ef715855af37 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -52,6 +52,10 @@
--elecColorRadialGradient: #{$elec-color-radial-gradient};
--gasColorRadialGradient: #{$gas-color-radial-gradient};
--waterColorRadialGradient: #{$water-color-radial-gradient};
+
+ // Override Cozy UI colors
+ --paperBackgroundColor: $dark-2;
+ --primaryTextColor: $grey-bright;
}
.application {
diff --git a/src/targets/browser/index.ejs b/src/targets/browser/index.ejs
index ee85e8ba084bdce2227a5426926788879554db44..b2711492a810f395bfa216dd018dea595b8a998f 100644
--- a/src/targets/browser/index.ejs
+++ b/src/targets/browser/index.ejs
@@ -21,6 +21,7 @@
<!-- PWA Colors -->
<meta name="theme-color" content="#343641" />
<meta name="background-color" content="#121212" />
+ <meta name="color-scheme" content="only dark" />
<% _.forEach(htmlWebpackPlugin.files.css, function(file) { %>
<link rel="stylesheet" href="<%- file %>">
diff --git a/src/targets/public/index.ejs b/src/targets/public/index.ejs
index 6a02d8eded146705720414f370c649dc892cb194..359ee7568dd51f01a7faf607cd516c9fd51a5c50 100644
--- a/src/targets/public/index.ejs
+++ b/src/targets/public/index.ejs
@@ -17,6 +17,7 @@
<!-- PWA Colors -->
<meta name="theme-color" content="#343641" />
<meta name="background-color" content="#121212" />
+ <meta name="color-scheme" content="only dark" />
<% _.forEach(htmlWebpackPlugin.files.css, function(file) { %>
<link rel="stylesheet" href="<%- file %>">
diff --git a/yarn.lock b/yarn.lock
index b44ce04843bb67892be9b066ac895a438eda5863..916f9cddce1c711df8687771fc67aa228b5b8f2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2371,6 +2371,20 @@
mkdirp "^1.0.4"
rimraf "^3.0.2"
+"@pdf-lib/standard-fonts@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@pdf-lib/standard-fonts/-/standard-fonts-1.0.0.tgz#8ba691c4421f71662ed07c9a0294b44528af2d7f"
+ integrity sha512-hU30BK9IUN/su0Mn9VdlVKsWBS6GyhVfqjwl1FjZN4TxP6cCw0jP2w7V3Hf5uX7M0AZJ16vey9yE0ny7Sa59ZA==
+ dependencies:
+ pako "^1.0.6"
+
+"@pdf-lib/upng@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@pdf-lib/upng/-/upng-1.0.1.tgz#7dc9c636271aca007a9df4deaf2dd7e7960280cb"
+ integrity sha512-dQK2FUMQtowVP00mtIksrlZhdFXQZPC+taih1q4CvPZ5vqdxR/LKBaFg0oAfzd1GlHZXXSPdQfzQnt+ViGvEIQ==
+ dependencies:
+ pako "^1.0.10"
+
"@pkgr/core@^0.1.0":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
@@ -6054,16 +6068,16 @@ cozy-client@29.2.0:
sift "^6.0.0"
url-search-params-polyfill "^8.0.0"
-cozy-client@45.1.0:
- version "45.1.0"
- resolved "https://registry.yarnpkg.com/cozy-client/-/cozy-client-45.1.0.tgz#5755bc4d766c467da98a043a6e16657bfffb41b2"
- integrity sha512-acQwXj6dNFT9rv06SfzHu3bYprjZzK0tkvRX14MpYRMRoIho5G4uLEB44BLEZ0+6i141e3LjMsfQj1BN3pMk5w==
+cozy-client@48.21.0:
+ version "48.21.0"
+ resolved "https://registry.yarnpkg.com/cozy-client/-/cozy-client-48.21.0.tgz#cb51d4765ad5cc42644bdc00afff8db300a9de31"
+ integrity sha512-kec/fcvZ8aOEa4jbbOpaDauOOHRFGw1PihowJTCcbm8P7gOVvKFoQEcLJi/QwchngWPgNt4vcPevmokhYvRCYQ==
dependencies:
"@cozy/minilog" "1.0.0"
"@types/jest" "^26.0.20"
"@types/lodash" "^4.14.170"
btoa "^1.2.1"
- cozy-stack-client "^45.0.1"
+ cozy-stack-client "^48.16.0"
date-fns "2.29.3"
json-stable-stringify "^1.0.1"
lodash "^4.17.13"
@@ -6103,10 +6117,10 @@ cozy-client@^33.2.0:
sift "^6.0.0"
url-search-params-polyfill "^8.0.0"
-cozy-device-helper@3.0.0, cozy-device-helper@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/cozy-device-helper/-/cozy-device-helper-3.0.0.tgz#c6316b7877c48ba9b343f80b13275b42027717bc"
- integrity sha512-dkwQ8I0B2TiGs6MDdvSWOJKHMUwTHJegr67E3hpsupy5G9Z52dyjYtbK6bfoj0ykhit15fVI7bi8ivDyoM1oRg==
+cozy-device-helper@3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/cozy-device-helper/-/cozy-device-helper-3.1.0.tgz#140079bf4a6844b21d6ac0a3a2d75741dba15faa"
+ integrity sha512-KorbuWN+oZ+v7okbXQTbLuW6nt7IyVnIIsDXB3Ay6zdtl5nV13+fOGKeRsjaecgBDLSXWJ07j0ooT7l6orZpDg==
dependencies:
lodash "^4.17.19"
@@ -6117,6 +6131,13 @@ cozy-device-helper@^2.1.0:
dependencies:
lodash "^4.17.19"
+cozy-device-helper@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/cozy-device-helper/-/cozy-device-helper-3.0.0.tgz#c6316b7877c48ba9b343f80b13275b42027717bc"
+ integrity sha512-dkwQ8I0B2TiGs6MDdvSWOJKHMUwTHJegr67E3hpsupy5G9Z52dyjYtbK6bfoj0ykhit15fVI7bi8ivDyoM1oRg==
+ dependencies:
+ lodash "^4.17.19"
+
cozy-doctypes@^1.83.8:
version "1.83.8"
resolved "https://registry.yarnpkg.com/cozy-doctypes/-/cozy-doctypes-1.83.8.tgz#99ec864059034bd032f6f01e322b57fea130a5d3"
@@ -6139,7 +6160,7 @@ cozy-doctypes@^1.85.3:
lodash "^4.17.19"
prop-types "^15.7.2"
-cozy-flags@>3.2.2:
+cozy-flags@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/cozy-flags/-/cozy-flags-4.0.0.tgz#047f9a93f826808bfd23ab206d0bf8235c162237"
integrity sha512-us+XDoqPCnDflu7gJrZAmE5SDmkIx2QEhs+fItQOf2JjnGpfBvmIhLMv51/P5INPL4bAQSUHE6ddwNFwOruqBw==
@@ -6385,19 +6406,19 @@ cozy-stack-client@^33.4.0:
mime "^2.4.0"
qs "^6.7.0"
-cozy-stack-client@^45.0.1:
- version "45.13.0"
- resolved "https://registry.yarnpkg.com/cozy-stack-client/-/cozy-stack-client-45.13.0.tgz#394b21a153b752be99ac6c79d073159fd024a4f4"
- integrity sha512-ruigDMH6XB1Pxa+e3doAMjXihgKSdNZpNPlEcpd7l8MfHazUaHVs/D8Kyop1n+VGM/4va2DU1c1nE7ainT7+jw==
+cozy-stack-client@^48.16.0:
+ version "48.16.0"
+ resolved "https://registry.yarnpkg.com/cozy-stack-client/-/cozy-stack-client-48.16.0.tgz#e8820197a0eb640e2d9061e21fad430ca5e56065"
+ integrity sha512-JgXAsmXESCfbC+T2EiXzUoPiDNFf2ePzNFQK98ZbWorAj8G6DcggdcG83/eD4QCwmv/1jXTaUWI1euTQdYEDQg==
dependencies:
detect-node "^2.0.4"
mime "^2.4.0"
qs "^6.7.0"
-cozy-ui@^101.0.0:
- version "101.2.0"
- resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-101.2.0.tgz#42d15aaa28aeecb63b0eee8bdba4fb770168316c"
- integrity sha512-J0R7gOfK13KOfjerHEWiEzwOizquPWKjnz3PnR9CsyYbEkWO03cqjJ/EFvXXhLmQKdXeD0fJgXfjSyVr1k2dbQ==
+cozy-ui@^111.9.0:
+ version "111.9.0"
+ resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-111.9.0.tgz#45903a91cb8cf7394f590ae544ab60e3997feb04"
+ integrity sha512-BDzmiUHLe1vUTGZwQApta9omiTTA17NfgpbYHhKvHDHaya+9K1i6caNLtwXzttFBliLgPe3wUFa+edsCkKKQuw==
dependencies:
"@babel/runtime" "^7.3.4"
"@material-ui/core" "4.12.3"
@@ -6406,7 +6427,6 @@ cozy-ui@^101.0.0:
bundlemon "^1.3.2"
chart.js "3.7.1"
classnames "^2.2.5"
- copy-text-to-clipboard "3.2.0"
cozy-interapp "^0.5.4"
date-fns "^1.28.5"
filesize "8.0.7"
@@ -6414,8 +6434,9 @@ cozy-ui@^101.0.0:
intersection-observer "0.11.0"
mime-types "2.1.35"
mui-bottom-sheet "https://github.com/cozy/mui-bottom-sheet.git#v1.0.9"
- node-polyglot "^2.2.2"
+ node-polyglot "^2.5.0"
normalize.css "^8.0.0"
+ pdf-lib "1.17.1"
piwik-react-router "0.12.1"
react-chartjs-2 "4.1.0"
react-markdown "^4.0.8"
@@ -12978,7 +12999,7 @@ node-polyglot@2.4.2, node-polyglot@^2.4.0:
string.prototype.trim "^1.2.4"
warning "^4.0.3"
-node-polyglot@^2.2.2:
+node-polyglot@^2.5.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/node-polyglot/-/node-polyglot-2.6.0.tgz#3d5889664253d90babc0fcd3c12ae0ac7b98289f"
integrity sha512-ZZFkaYzIfGfBvSM6QhA9dM8EEaUJOVewzGSRcXWbJELXDj0lajAtKaENCYxvF5yE+TgHg6NQb0CmgYMsMdcNJQ==
@@ -13534,7 +13555,7 @@ p-try@^2.0.0:
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-pako@~1.0.5:
+pako@^1.0.10, pako@^1.0.11, pako@^1.0.6, pako@~1.0.5:
version "1.0.11"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
@@ -13751,6 +13772,16 @@ pbkdf2@^3.0.3:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
+pdf-lib@1.17.1:
+ version "1.17.1"
+ resolved "https://registry.yarnpkg.com/pdf-lib/-/pdf-lib-1.17.1.tgz#9e7dd21261a0c1fb17992580885b39e7d08f451f"
+ integrity sha512-V/mpyJAoTsN4cnP31vc0wfNA1+p20evqqnap0KLoRUN0Yk/p3wN52DOEsL4oBFcLdb76hlpKPtzJIgo67j/XLw==
+ dependencies:
+ "@pdf-lib/standard-fonts" "^1.0.0"
+ "@pdf-lib/upng" "^1.0.1"
+ pako "^1.0.11"
+ tslib "^1.11.1"
+
pdfjs-dist@2.12.313:
version "2.12.313"
resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.12.313.tgz#62f2273737bb956267ae2e02cdfaddcb1099819c"