cozy-ui 122.14.1 → 123.0.0

package/react/Icons/Up.jsx

@@ -1,14 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/up.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/up.svg` to regenerate;
 import React from 'react'
 
-import SvgUpTwake from './Up_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgUp(props) {
-  if (isTwakeTheme()) return SvgUpTwake(props)
   return (
     <svg viewBox="0 0 16 16" {...props}>
-      <path fillRule="evenodd" d="M11 16V8h5L8 0 0 8h5v8z" />
+      <path d="M7 3.825l-4.9 4.9c-.2.2-.433.296-.7.287A1.006 1.006 0 01.7 8.7C.517 8.5.42 8.266.412 8A.916.916 0 01.7 7.3L7.3.7a.88.88 0 01.325-.213C7.742.446 7.867.425 8 .425s.258.02.375.062A.877.877 0 018.7.7l6.6 6.6a.933.933 0 01.275.687c0 .275-.092.513-.275.713-.2.2-.438.3-.713.3a.973.973 0 01-.712-.3L9 3.825V15c0 .283-.096.52-.288.712A.967.967 0 018 16a.967.967 0 01-.713-.288A.968.968 0 017 15V3.825z" />
     </svg>
   )
 }

package/react/Icons/Upload.jsx

@@ -1,17 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/upload.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/upload.svg` to regenerate;
 import React from 'react'
 
-import SvgUploadTwake from './Upload_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgUpload(props) {
-  if (isTwakeTheme()) return SvgUploadTwake(props)
   return (
     <svg viewBox="0 0 16 16" {...props}>
-      <path
-        fillRule="evenodd"
-        d="M7 6.414L5.707 7.707a1 1 0 01-1.414-1.414l3-3a1 1 0 011.414 0l3 3a1 1 0 01-1.414 1.414L9 6.414V14a1 1 0 11-2 0V6.414zM1 2h14a1 1 0 100-2H1a1 1 0 100 2z"
-      />
+      <path d="M14 11v3H2v-3H0v3c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-3h-2zM3 5l1.41 1.41L7 3.83V12h2V3.83l2.59 2.58L13 5 8 0 3 5z" />
     </svg>
   )
 }

package/react/Icons/Versioning.jsx

@@ -1,25 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/permissions/versioning.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/permissions/versioning.svg` to regenerate;
 import React from 'react'
 
-import SvgVersioningTwake from './Versioning_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgVersioning(props) {
-  if (isTwakeTheme()) return SvgVersioningTwake(props)
   return (
-    <svg viewBox="0 0 48 48" fill="none" {...props}>
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M42 0H6C2.692 0 0 2.692 0 6v36c0 3.308 2.692 6 6 6h36c3.308 0 6-2.692 6-6V6c0-3.308-2.692-6-6-6z"
-        fill="#D6D8DA"
-      />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M24 6c9.941 0 18 8.06 18 18 0 9.941-8.059 18-18 18A18.003 18.003 0 017.516 31.24l-.192-.452a2 2 0 013.64-1.652l.102.233A14.003 14.003 0 0024 38c7.732 0 14-6.268 14-14s-6.268-14-14-14c-4.317 0-8.288 1.97-10.904 5.217a1.999 1.999 0 012.33.38l.11.123a2 2 0 01-.134 2.706l-.122.11-6 5c-1.263 1.053-3.16.214-3.275-1.384L6 22v-8a2 2 0 013.74-.987A17.981 17.981 0 0124 6zm0 8a2 2 0 012 2v7.172l3.414 3.414A1.998 1.998 0 0128 30a1.995 1.995 0 01-1.414-.586l-4-3.998A2.05 2.05 0 0122 24v-8a2 2 0 012-2z"
-        fill="#5D6165"
-      />
+    <svg viewBox="0 0 16 16" {...props}>
+      <path d="M7.111 4.444V8.89l3.778 2.24.684-1.138-3.129-1.858v-3.69H7.111zM16 6.222V0l-2.347 2.347A7.944 7.944 0 008 0a8 8 0 108 8h-1.778A6.229 6.229 0 018 14.222 6.229 6.229 0 011.778 8 6.23 6.23 0 018 1.778c1.716 0 3.271.702 4.4 1.822L9.778 6.222H16z" />
     </svg>
   )
 }

package/react/Icons/Videos.jsx

@@ -1,17 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/videos.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/videos.svg` to regenerate;
 import React from 'react'
 
-import SvgVideosTwake from './Videos_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgVideos(props) {
-  if (isTwakeTheme()) return SvgVideosTwake(props)
   return (
-    <svg viewBox="0 0 16 16" {...props}>
-      <path
-        fillRule="evenodd"
-        d="M1 1h14a1 1 0 011 1v12a1 1 0 01-1 1H1a1 1 0 01-1-1V2a1 1 0 011-1zm.5 1a.5.5 0 000 1h1a.5.5 0 000-1h-1zm0 11a.5.5 0 100 1h1a.5.5 0 100-1h-1zm3-11a.5.5 0 000 1h1a.5.5 0 000-1h-1zm0 11a.5.5 0 100 1h1a.5.5 0 100-1h-1zm3-11a.5.5 0 000 1h1a.5.5 0 000-1h-1zm0 11a.5.5 0 100 1h1a.5.5 0 100-1h-1zm3-11a.5.5 0 100 1h1a.5.5 0 100-1h-1zm0 11a.5.5 0 100 1h1a.5.5 0 100-1h-1zm3-11a.5.5 0 100 1h1a.5.5 0 100-1h-1zm0 11a.5.5 0 100 1h1a.5.5 0 100-1h-1zM6 11.066a.5.5 0 00.777.416l4.599-3.064a.5.5 0 000-.832L6.777 4.52A.5.5 0 006 4.935v6.131z"
-      />
+    <svg viewBox="0 0 16 14" {...props}>
+      <path d="M5.818 3.364v5.818l5.091-2.91-5.09-2.908zm8.728-2.91H1.455C.655.455 0 1.11 0 1.91v8.727c0 .8.655 1.455 1.455 1.455H5.09v1.455h5.818V12.09h3.636c.8 0 1.455-.655 1.455-1.455V1.91c0-.8-.655-1.454-1.454-1.454zm0 10.182H1.455V1.91h13.09v8.727z" />
     </svg>
   )
 }

package/react/Icons/Walk.jsx

@@ -1,18 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/walk.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/walk.svg` to regenerate;
 import React from 'react'
 
-import SvgWalkTwake from './Walk_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgWalk(props) {
-  if (isTwakeTheme()) return SvgWalkTwake(props)
   return (
-    <svg viewBox="0 0 16 17" {...props}>
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M10.602 3.663A2 2 0 118.38.337a2 2 0 012.222 3.326zm-.121 3.73a2.55 2.55 0 001.51.607 1 1 0 110 2 4.071 4.071 0 01-3-1.29l-.69 1.58 2.33 1.94a1 1 0 01.36.77v2a1 1 0 01-2 0v-1.53l-2.58-2.12-1.48 4a1.003 1.003 0 11-1.88-.7L5.87 7l-1.12.32-.82 2a1 1 0 11-1.86-.74l1-2.5a1 1 0 01.66-.59l3.36-1h.12c.11-.014.22-.014.33 0h.1a2.16 2.16 0 012 1.51 2.56 2.56 0 00.84 1.394z"
-      />
+    <svg viewBox="0 0 11 17" {...props}>
+      <path d="M6.244 3.727c.819 0 1.489-.67 1.489-1.489 0-.818-.67-1.488-1.489-1.488-.818 0-1.488.67-1.488 1.488 0 .819.67 1.489 1.488 1.489zm-2.753 2.53L1.407 16.75H2.97l1.34-5.954 1.562 1.489v4.465H7.36v-5.581L5.798 9.68l.446-2.232a5.45 5.45 0 004.093 1.86V7.82c-1.414 0-2.604-.744-3.2-1.786l-.744-1.191a1.597 1.597 0 00-1.972-.625L.663 5.81v3.498H2.15v-2.53l1.34-.521z" />
     </svg>
   )
 }

package/react/Icons/Wallet.jsx

@@ -1,17 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/wallet.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/wallet.svg` to regenerate;
 import React from 'react'
 
-import SvgWalletTwake from './Wallet_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgWallet(props) {
-  if (isTwakeTheme()) return SvgWalletTwake(props)
   return (
-    <svg viewBox="0 0 16 16" {...props}>
-      <path
-        fillRule="evenodd"
-        d="M2 0h11a1 1 0 011 1v3h1a1 1 0 011 1v10a1 1 0 01-1 1H2a2 2 0 01-2-2V2a2 2 0 012-2zm1 2a1 1 0 100 2h9V2H3zm8 9a1 1 0 100-2 1 1 0 000 2z"
-      />
+    <svg viewBox="0 0 16 13" {...props}>
+      <path d="M12.8 0H3.2A3.2 3.2 0 000 3.2v6.4a3.2 3.2 0 003.2 3.2h9.6A3.2 3.2 0 0016 9.6V3.2A3.2 3.2 0 0012.8 0zm-1.488 7.816c-.192.16-.456.224-.704.16L1.72 5.8c.24-.584.808-1 1.48-1h9.6c.536 0 1.008.272 1.304.672l-2.792 2.344zM3.2 1.6h9.6c.88 0 1.6.72 1.6 1.6v.44a3.198 3.198 0 00-1.6-.44H3.2c-.584 0-1.128.168-1.6.44V3.2c0-.88.72-1.6 1.6-1.6z" />
     </svg>
   )
 }

package/react/Icons/WalletAdd.jsx

@@ -1,4 +1,4 @@
-// Automatically created, please run `scripts/generate-svg-icon.sh assets/icons/ui/wallet-add.svg` to regenerate;
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/wallet-add.svg` to regenerate;
 import React from 'react'
 
 function SvgWalletAdd(props) {

package/react/Icons/WalletNew.jsx

@@ -1,4 +1,4 @@
-// Automatically created, please run `scripts/generate-svg-icon.sh assets/icons/ui/wallet-new.svg` to regenerate;
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/wallet-new.svg` to regenerate;
 import React from 'react'
 
 function SvgWalletNew(props) {

package/react/Icons/Warn.jsx

@@ -1,17 +1,11 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/warn.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/warn.svg` to regenerate;
 import React from 'react'
 
-import SvgWarnTwake from './Warn_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgWarn(props) {
-  if (isTwakeTheme()) return SvgWarnTwake(props)
   return (
-    <svg viewBox="0 0 48 48" {...props}>
-      <path
-        fillRule="evenodd"
-        d="M24 48c13.255 0 24-10.745 24-24S37.255 0 24 0 0 10.745 0 24s10.745 24 24 24zm-1.503-34.897c.83-1.438 2.175-1.44 3.007 0l9.992 17.294c.83 1.438.16 2.603-1.504 2.603H14.008c-1.661 0-2.336-1.162-1.504-2.603l9.993-17.294zm.082 5.323A1.334 1.334 0 0123.93 17h.141c.79 0 1.395.633 1.35 1.426l-.365 6.576c-.03.551-.499.998-1.055.998a1.069 1.069 0 01-1.055-.998l-.366-6.576zM22.5 29c0-.828.666-1.5 1.5-1.5.828 0 1.5.666 1.5 1.5 0 .828-.666 1.5-1.5 1.5-.828 0-1.5-.666-1.5-1.5z"
-      />
+    <svg viewBox="0 0 16 16" {...props}>
+      <path d="M11.316 0H4.684L0 4.684v6.632L4.684 16h6.632L16 11.316V4.684L11.316 0zm2.906 10.578l-3.644 3.644H5.422l-3.644-3.644V5.422l3.644-3.644h5.156l3.644 3.644v5.156z" />
+      <path d="M8 12.444a.889.889 0 100-1.777.889.889 0 000 1.777zm-.889-8.888H8.89v6.222H7.11V3.556z" />
     </svg>
   )
 }

package/react/Icons/Warning.jsx

@@ -1,17 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/warning.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/warning.svg` to regenerate;
 import React from 'react'
 
-import SvgWarningTwake from './Warning_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgWarning(props) {
-  if (isTwakeTheme()) return SvgWarningTwake(props)
   return (
-    <svg viewBox="0 0 16 16" {...props}>
-      <path
-        d="M7.022 1.736c.543-.959 1.428-.95 1.966 0l6.532 11.529c.543.958.094 1.735-1.016 1.735h-13C.399 15-.051 14.215.487 13.265l6.535-11.53zM7.004 13c0-.552.443-1 1-1 .552 0 1 .444 1 1 0 .553-.444 1-1 1-.553 0-1-.444-1-1zm0-7.997a.999.999 0 011-1.003c.552 0 1 .438 1 1.003v4.994a.999.999 0 01-1 1.003c-.553 0-1-.438-1-1.003V5.003z"
-        fillRule="evenodd"
-      />
+    <svg viewBox="0 0 16 14" {...props}>
+      <path d="M0 13.818h16L8 0 0 13.818zm8.727-2.182H7.273v-1.454h1.454v1.454zm0-2.909H7.273V5.818h1.454v2.91z" />
     </svg>
   )
 }

package/react/Icons/WarningCircle.jsx

@@ -1,17 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/warning-circle.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/warning-circle.svg` to regenerate;
 import React from 'react'
 
-import SvgWarningCircleTwake from './WarningCircle_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgWarningCircle(props) {
-  if (isTwakeTheme()) return SvgWarningCircleTwake(props)
   return (
     <svg viewBox="0 0 16 16" {...props}>
-      <path
-        fillRule="evenodd"
-        d="M8 0a8 8 0 110 16A8 8 0 018 0zm0 9.75a1.25 1.25 0 100 2.5 1.25 1.25 0 000-2.5zM8 4a1 1 0 00-.993.883L7 5v3a1 1 0 001.993.117L9 8V5a1 1 0 00-1-1z"
-      />
+      <path d="M8 0C3.584 0 0 3.584 0 8s3.584 8 8 8 8-3.584 8-8-3.584-8-8-8zm.8 12H7.2v-1.6h1.6V12zm0-3.2H7.2V4h1.6v4.8z" />
     </svg>
   )
 }

package/react/Icons/Water.jsx

@@ -1,18 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/water.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/water.svg` to regenerate;
 import React from 'react'
 
-import SvgWaterTwake from './Water_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgWater(props) {
-  if (isTwakeTheme()) return SvgWaterTwake(props)
   return (
-    <svg viewBox="0 0 16 16" {...props}>
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M10.804 3.718C10.076 2.696 9.332 1.627 8.76.511A.93.93 0 007.938 0a.903.903 0 00-.821.511c-.558 1.1-1.27 2.138-1.952 3.145C3.785 5.655 2.5 7.53 2.5 9.621c0 3.238 2.277 5.578 5.423 5.578 3.176 0 5.577-2.402 5.577-5.578 0-2.076-1.317-3.935-2.696-5.903z"
-      />
+    <svg viewBox="0 0 13 16" {...props}>
+      <path d="M6.4 0C2.136 3.64 0 6.784 0 9.44 0 13.424 3.04 16 6.4 16c3.36 0 6.4-2.576 6.4-6.56 0-2.656-2.136-5.8-6.4-9.44zm0 14.4c-2.68 0-4.8-2.056-4.8-4.96 0-1.872 1.56-4.352 4.8-7.312 3.24 2.96 4.8 5.432 4.8 7.312 0 2.904-2.12 4.96-4.8 4.96zM3.064 9.6a.6.6 0 01.592.496c.328 1.776 1.824 2.384 2.912 2.296a.602.602 0 01.632.6c0 .32-.256.584-.576.6-1.704.104-3.696-.872-4.152-3.296a.6.6 0 01.592-.696z" />
     </svg>
   )
 }

package/react/Icons/Work.jsx

@@ -1,18 +1,10 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/work.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/work.svg` to regenerate;
 import React from 'react'
 
-import SvgWorkTwake from './Work_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgWork(props) {
-  if (isTwakeTheme()) return SvgWorkTwake(props)
   return (
     <svg viewBox="0 0 16 16" {...props}>
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M12 4h2c1.11 0 2 .89 2 2v7c0 1.11-.89 2-2 2H2c-1.11 0-2-.89-2-2l.01-7C.01 4.89.89 4 2 4h2V2c0-1.11.89-2 2-2h4c1.11 0 2 .89 2 2v2zM6 4h4V2H6v2zm1 4a1 1 0 100 2h2a1 1 0 100-2H7z"
-      />
+      <path d="M14.4 3.2h-3.2V1.6c0-.888-.712-1.6-1.6-1.6H6.4c-.888 0-1.6.712-1.6 1.6v1.6H1.6C.712 3.2.008 3.912.008 4.8L0 13.6c0 .888.712 1.6 1.6 1.6h12.8c.888 0 1.6-.712 1.6-1.6V4.8c0-.888-.712-1.6-1.6-1.6zm-4.8 0H6.4V1.6h3.2v1.6z" />
     </svg>
   )
 }

package/react/Icons/WorkplaceText.jsx

@@ -1,4 +1,4 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/twake/illus/workplace-text.svg` to regenerate;
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/illus/workplace-text.svg` to regenerate;
 import React from 'react'
 
 function SvgWorkplaceText(props) {

package/react/Icons/WrenchCircle.jsx

@@ -1,16 +1,18 @@
-// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/wrench-circle.svg` to regenerate
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/wrench-circle.svg` to regenerate;
 import React from 'react'
 
-import SvgWrenchCircleTwake from './WrenchCircle_twake'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
-
 function SvgWrenchCircle(props) {
-  if (isTwakeTheme()) return SvgWrenchCircleTwake(props)
   return (
     <svg viewBox="0 0 16 16" {...props}>
       <path
         fillRule="evenodd"
-        d="M8 0a8 8 0 110 16A8 8 0 018 0zm1.91 4.182a4.052 4.052 0 00-4.636-.773l2.262 2.262.072.086a.62.62 0 01-.072.793l-.99.99-.078.068a.61.61 0 01-.801-.067L3.404 5.279l-.09.199a4.05 4.05 0 00.87 4.43 4.055 4.055 0 004.293.923l2.422 2.423a6.029 6.029 0 002.326-2.302l-2.41-2.414.072-.2a4.054 4.054 0 00-.976-4.156z"
+        clipRule="evenodd"
+        d="M8 0C3.584 0 0 3.584 0 8s3.584 8 8 8 8-3.584 8-8-3.584-8-8-8zm0 14.4A6.408 6.408 0 011.6 8c0-3.528 2.872-6.4 6.4-6.4 3.528 0 6.4 2.872 6.4 6.4 0 3.528-2.872 6.4-6.4 6.4z"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M9.192 7.504a2.783 2.783 0 00-.648-2.896 2.775 2.775 0 00-3.28-.472l1.88 1.88-1.128 1.128-1.88-1.88a2.773 2.773 0 00.472 3.28c.784.784 1.92.992 2.896.648l2.728 2.728c.16.16.408.16.568 0l1.12-1.12a.396.396 0 000-.568L9.192 7.504z"
       />
     </svg>
   )

package/react/InfosBadge/index.jsx

@@ -2,17 +2,15 @@ import cx from 'classnames'
 import React from 'react'
 
 import Badge from '../Badge'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
 import { makeStyles } from '../styles'
 
 const useStyles = makeStyles({
   qualifier: {
-    height: isTwakeTheme() ? '24px' : '1.125rem', // compensation of the specific border size
-    minWidth: isTwakeTheme() ? '24px' : '1.125rem',
+    height: '24px', // compensation of the specific border size
+    minWidth: '24px',
     backgroundColor: 'var(--paperBackgroundColor)',
     color: 'var(--iconTextColor)',
-    border: isTwakeTheme() ? undefined : '1px solid var(--borderMainColor)',
-    boxShadow: isTwakeTheme() ? 'var(--shadow3)' : undefined
+    boxShadow: 'var(--shadow3)'
   }
 })
 

package/react/Layout/Layout.jsx

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 
 import styles from './styles.styl'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
 
 export const Layout = ({ children, className, monoColumn, ...rest }) => {
   return (
@@ -11,7 +10,7 @@ export const Layout = ({ children, className, monoColumn, ...rest }) => {
       className={cx(
         monoColumn ? styles['o-layout'] : styles['o-layout-2panes'],
         className,
-        { [styles['o-layout--rounded']]: isTwakeTheme() }
+        [styles['o-layout--rounded']]
       )}
       {...rest}
     >

package/react/MuiCozyTheme/makeTheme.jsx

@@ -1,17 +1,11 @@
 import { makeShadows } from './helpers'
 import { makePalette } from './makePalette'
-import { makeTwakeTypography } from './makeTwakeTypography'
 import { makeTypography } from './makeTypography'
 import { makeDarkInvertedOverrides } from './overrides/makeDarkInvertedOverrides'
 import { makeDarkNormalOverrides } from './overrides/makeDarkNormalOverrides'
 import { makeLightInvertedOverrides } from './overrides/makeLightInvertedOverrides'
 import { makeLightNormalOverrides } from './overrides/makeLightNormalOverrides'
-import { makeDarkInvertedTwakeOverrides } from './overrides/twake/makeDarkInvertedOverrides'
-import { makeDarkNormalTwakeOverrides } from './overrides/twake/makeDarkNormalOverrides'
-import { makeLightInvertedTwakeOverrides } from './overrides/twake/makeLightInvertedOverrides'
-import { makeLightNormalTwakeOverrides } from './overrides/twake/makeLightNormalOverrides'
 import isTesting from '../helpers/isTesting'
-import { isTwakeTheme } from '../helpers/isTwakeTheme'
 import { createTheme } from '../styles'
 import { createNodeWithThemeCssVars } from '../utils/color'
 
@@ -26,17 +20,6 @@ const makeOverridesByTheme = theme => ({
   }
 })
 
-const makeTwakeOverridesByTheme = theme => ({
-  light: {
-    normal: makeLightNormalTwakeOverrides(theme),
-    inverted: makeLightInvertedTwakeOverrides(theme)
-  },
-  dark: {
-    normal: makeDarkNormalTwakeOverrides(theme),
-    inverted: makeDarkInvertedTwakeOverrides(theme)
-  }
-})
-
 const themesCommonConfig = {
   shape: {
     borderRadius: 6
@@ -61,25 +44,20 @@ const themesCommonConfig = {
 }
 
 export const makeTheme = (type, variant) => {
-  const uiThemeName = isTwakeTheme() ? 'Twake' : 'Cozy'
   // to hold the values of css variables, recoverable by getCssVariableValue()
   createNodeWithThemeCssVars(type, variant)
 
   const palette = makePalette(type, variant)
   const theme = createTheme({
     ...themesCommonConfig,
-    typography:
-      uiThemeName === 'Cozy' ? makeTypography(palette) : makeTwakeTypography(),
+    typography: makeTypography(),
     shadows: makeShadows(type, variant),
     type,
     variant,
     palette
   })
 
-  const overrides =
-    uiThemeName === 'Cozy'
-      ? makeOverridesByTheme(theme)[type][variant]
-      : makeTwakeOverridesByTheme(theme)[type][variant]
+  const overrides = makeOverridesByTheme(theme)[type][variant]
 
   return {
     ...theme,

package/react/MuiCozyTheme/makeTypography.js

@@ -1,66 +1,78 @@
-export const makeTypography = palette => ({
+export const makeTypography = () => ({
   fontFamily: 'var(--primaryFont)',
   h1: {
-    fontSize: 48,
-    fontWeight: 'bold',
-    lineHeight: 1.087,
-    letterSpacing: -0.8
+    fontSize: 45,
+    fontWeight: 600,
+    lineHeight: 1.087
   },
   h2: {
     fontSize: 32,
-    fontWeight: 'bold',
-    lineHeight: 1.313,
-    letterSpacing: -0.4
+    fontWeight: 600,
+    lineHeight: 1.313
   },
   h3: {
     fontSize: 24,
-    fontWeight: 'bold',
+    fontWeight: 600,
     lineHeight: 1.167
   },
   h4: {
-    fontSize: 20,
-    fontWeight: 'bold',
+    fontSize: 22,
+    fontWeight: 600,
     lineHeight: 1.167
   },
   h5: {
-    fontSize: 18,
-    fontWeight: 'bold',
-    lineHeight: 1.313
+    fontSize: 16,
+    fontWeight: 500,
+    lineHeight: 1.313,
+    letterSpacing: '0.15px'
   },
   h6: {
-    fontSize: 16,
-    fontWeight: 'bold',
-    lineHeight: 1.313
+    fontSize: 14,
+    fontWeight: 500,
+    lineHeight: 1.313,
+    letterSpacing: '0.1px'
   },
   subtitle1: {
-    fontWeight: 'bold',
     fontSize: 14,
+    fontWeight: 500,
     lineHeight: 1.358,
-    textTransform: 'uppercase'
+    letterSpacing: '0.1px'
   },
   subtitle2: {
-    fontWeight: 'bold',
-    fontSize: 12,
+    fontSize: 14,
+    fontWeight: 600,
     lineHeight: 1.334,
-    textTransform: 'uppercase'
+    letterSpacing: '0.25px'
   },
   body1: {
     fontSize: 16,
-    lineHeight: 1.313
+    fontWeight: 400,
+    lineHeight: 1.313,
+    letterSpacing: '-0.15px'
   },
   body2: {
     fontSize: 14,
-    lineHeight: 1.313
+    fontWeight: 500,
+    lineHeight: 1.313,
+    letterSpacing: '0.25px'
   },
   button: {
-    fontWeight: 'bold',
-    fontSize: 14,
-    lineHeight: 1.313
+    fontSize: 16,
+    fontWeight: 500,
+    lineHeight: 1.313,
+    textTransform: 'inherit'
   },
   caption: {
     fontSize: 12,
+    fontWeight: 500,
     lineHeight: 1.313,
-    color: palette.text.secondary,
-    display: 'block'
+    letterSpacing: '0.5px'
+  },
+  overline: {
+    fontSize: 11,
+    fontWeight: 500,
+    lineHeight: '16px',
+    letterSpacing: '0.5px',
+    textTransform: 'inherit'
   }
 })