Merge branch 'master' into record-desktop-audio

elan-ev · Aug 30, 2023 · e825987 · e825987
2 parents 38210e1 + e6415c5
commit e825987
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
         REACT_APP_INCLUDE_LEGAL_NOTICES: 1
       run: |
         rm -rf build
-        PUBLIC_PATH="/" npm run build:release
+        npm run build:release
 
     - name: Archive prod deployment files as artifact
       if: github.repository_owner == 'elan-ev' && github.ref == 'refs/heads/master'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "@emotion/react": "^11.11.1",
     "@fontsource-variable/roboto-flex": "^5.0.3",
     "@iarna/toml": "^2.2.5",
-    "@opencast/appkit": "^0.1.4",
+    "@opencast/appkit": "^0.2.0",
     "@svgr/webpack": "^8.0.1",
     "babel-loader": "^9.1.2",
     "copy-webpack-plugin": "^10.2.4",

diff --git a/src/App.tsx b/src/App.tsx
@@ -11,7 +11,7 @@ export const App: React.FC = () => {
   return <>
     <GlobalStyle />
     <PreventClose />
-    <ColorSchemeProvider>
+    <ColorSchemeProvider allowedSchemes={["light", "dark"]}>
       <Root />
     </ColorSchemeProvider>
   </>;

diff --git a/src/index.html b/src/index.html
@@ -34,6 +34,7 @@
         --color-danger2: #feaba1;
         --color-danger4: #c22a2c;
         --color-danger5: #880e11;
+        --color-accent9: #044a81;
         --color-accent8: #215D99;
         --color-accent7: #3073B8;
         --color-accent6: #3E8AD8;
@@ -63,8 +64,9 @@
         --color-danger2: #712f2a;
         --color-danger4: #dd554b;
         --color-danger5: #f87965;
-        --color-accent8: #6b90c5;
-        --color-accent7: #5185c6;
+        --color-accent9: #85ace3;
+        --color-accent8: #7da4db;
+        --color-accent7: #588ccd;
         --color-accent6: #1f72ba;
         --color-accent5: #1c619e;
         --color-accent4: #195483;

diff --git a/src/layout/index.tsx b/src/layout/index.tsx
@@ -74,13 +74,17 @@ const OverlayBox: React.FC<OverlayBoxProps> = ({ close, children, maxWidth }) =>
         position: "relative",
         backgroundColor: bg,
         borderRadius: 8,
-        padding: 16,
-        paddingLeft: 32,
+        padding: 32,
+        paddingLeft: 48,
         width: "82%",
         flex: "0 1 auto",
         minHeight: 0,
         maxWidth,
         boxShadow: "0 4px 16px var(--shadow-color))",
+        [screenWidthAtMost(850)]: {
+          padding: 24,
+          paddingLeft: 32,
+        },
         [screenWidthAtMost(480)]: {
           width: "95%",
           padding: "12px 20px",

diff --git a/src/shortcuts.tsx b/src/shortcuts.tsx
@@ -245,7 +245,7 @@ const ShortcutGroupOverview: React.FC<ShortcutGroupOverviewProps> = ({ groupId,
             css={{
               minWidth: 250,
               width: "calc(33.33% - 12px)",
-              [screenWidthAtMost(1005)]: {
+              [screenWidthAtMost(1070)]: {
                 width: "calc(50% - 6px)",
               },
               [screenWidthAtMost(720)]: {

diff --git a/src/steps/index.tsx b/src/steps/index.tsx
@@ -129,7 +129,7 @@ const ProgressSidebar: React.FC<ProgressSidebarProps> = ({ currentStep }) => {
               zIndex: 100,
               backgroundColor: COLORS.neutral05,
               svg: {
-                color: i === currentIndex ? COLORS.accent5 : COLORS.neutral40,
+                color: i === currentIndex ? COLORS.accent6 : COLORS.neutral40,
                 fontSize: 2 * CIRCLE_RADIUS,
                 flexShrink: 0,
                 // We want an effective stroke width of 2. If we scale the icon
@@ -149,7 +149,7 @@ const ProgressSidebar: React.FC<ProgressSidebarProps> = ({ currentStep }) => {
               <div css={{
                 fontSize: 14,
                 lineHeight: 1.2,
-                color: i == currentIndex ? COLORS.accent8 : COLORS.neutral60,
+                color: i == currentIndex ? COLORS.accent8 : COLORS.neutral70,
                 [screenWidthAtMost(BREAKPOINTS.large)]: {
                   display: "none",
                 },

diff --git a/src/steps/video-setup/preview.tsx b/src/steps/video-setup/preview.tsx
@@ -50,8 +50,8 @@ const StreamPreview: React.FC<{ input: Input }> = ({ input }) => (
     position: "relative",
   }}>
     <PreviewVideo input={input} />
-    <DesktopAudioInfo isDesktop={input.isDesktop} stream={input.stream} />
-    <StreamSettings isDesktop={input.isDesktop} stream={input.stream} />
+    {input.stream && <DesktopAudioInfo isDesktop={input.isDesktop} stream={input.stream} />}
+    {input.stream && <StreamSettings isDesktop={input.isDesktop} stream={input.stream} />}
   </div>
 );