Skip to content

Commit 2a77b89

Browse files
committed
Merge branch 'dev' into daniel
2 parents 0611e70 + dc55f43 commit 2a77b89

File tree

74 files changed

+3459
-3821
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+3459
-3821
lines changed

demo-app/src/client/Components/ButtonsWithMoreHooks.jsx

Lines changed: 0 additions & 61 deletions
This file was deleted.

demo-app/src/client/Components/Home.tsx

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ function Home(): JSX.Element {
1212
style={{
1313
backgroundColor: theme.backgroundColor,
1414
color: theme.textColor,
15+
boxShadow: `0 4px 6px ${theme.backgroundColor === '#1a202c' ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)'}`,
1516
}}
1617
>
17-
<h2>REACTIME - DEMO APP</h2>
18+
<h2 style={{ color: theme.textColor }}>REACTIME - DEMO APP</h2>
1819

1920
{user ? (
2021
<div>
@@ -24,10 +25,6 @@ function Home(): JSX.Element {
2425
style={{
2526
backgroundColor: theme.primaryColor,
2627
color: theme.backgroundColor,
27-
padding: '8px 16px',
28-
border: 'none',
29-
borderRadius: '4px',
30-
cursor: 'pointer',
3128
}}
3229
>
3330
Logout
@@ -41,10 +38,6 @@ function Home(): JSX.Element {
4138
style={{
4239
backgroundColor: theme.primaryColor,
4340
color: theme.backgroundColor,
44-
padding: '8px 16px',
45-
border: 'none',
46-
borderRadius: '4px',
47-
cursor: 'pointer',
4841
}}
4942
>
5043
Login as Test User
@@ -54,24 +47,14 @@ function Home(): JSX.Element {
5447
style={{
5548
backgroundColor: theme.secondaryColor,
5649
color: theme.backgroundColor,
57-
padding: '8px 16px',
58-
border: 'none',
59-
borderRadius: '4px',
6050
marginLeft: '8px',
61-
cursor: 'pointer',
6251
}}
6352
>
6453
Login as Admin
6554
</button>
6655
</div>
6756
)}
68-
69-
<p>
70-
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
71-
ut labore et dolore magna aliqua..."
72-
</p>
7357
</div>
7458
);
7559
}
76-
7760
export default Home;

0 commit comments

Comments
 (0)