Skip to content

Commit

Permalink
Revert "refactor: global styles"
Browse files Browse the repository at this point in the history
This reverts commit 8127992.
  • Loading branch information
fbwoolf committed Jan 11, 2022
1 parent 95c3a76 commit 97b16c1
Show file tree
Hide file tree
Showing 40 changed files with 213 additions and 161 deletions.
File renamed without changes
File renamed without changes
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/graphic-wink-app-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/assets/images/icon-chain-of-blocks.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/assets/images/icon-cross-over-eye.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions public/assets/images/icon-delay-apps.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions public/assets/images/icon-delay-key.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions public/assets/images/icon-delay-padlock.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions public/assets/images/icon-delay-private.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/assets/images/icon-padlock.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/assets/images/icon-shapes.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/assets/images/logo-data-vault.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions public/assets/images/onboarding/key-illustration-full.svg

This file was deleted.

9 changes: 0 additions & 9 deletions public/assets/images/onboarding/key-illustration-popup.svg

This file was deleted.

9 changes: 0 additions & 9 deletions public/assets/images/onboarding/secret-key.svg

This file was deleted.

8 changes: 2 additions & 6 deletions src/app/common/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,8 @@ export function isEmpty(value: Object) {
return Object.keys(value).length === 0;
}

type ViewMode = 'full' | 'popup' | 'popup-center';
type ViewMode = 'full' | 'popup';

export function getViewMode(): ViewMode {
return document.location.pathname.startsWith('/index.html')
? 'full'
: document.location.pathname.startsWith('/popup.html')
? 'popup'
: 'popup-center';
return document.location.pathname.startsWith('/index.html') ? 'full' : 'popup';
}
23 changes: 23 additions & 0 deletions src/app/components/styles/full-page-styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,29 @@ export const fullPageStyles = css`
.temp {
max-width: 440px;
}
.welcome-page {
.content-image {
order: 2;
height: calc(100vh - 102px);
.image-small {
display: none;
}
}
.content-text {
order: 1;
margin-left: 168px;
.title {
max-width: 500px;
font-size: 64px;
margin-bottom: 24px;
}
.text {
max-width: 440px;
font-size: 16px;
margin-bottom: 24px;
}
}
}
.onboarding-text {
text-align: center;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/styles/global-styles.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { memo } from 'react';
import { Global, css } from '@emotion/react';
import { CSSReset } from '@stacks/ui';
import { Global, css } from '@emotion/react';

import { extensionStyles } from './popup-styles';
import { fullPageStyles } from './full-page-styles';
Expand Down
16 changes: 16 additions & 0 deletions src/app/components/styles/popup-center-styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,21 @@ export const popupCenterStyles = css`
min-width: 440px !important;
overflow-x: hidden;
}
.welcome-page {
.content-image .image-large {
display: none;
}
.content-text {
.title {
width: 264px;
font-size: 32px;
line-height: 44px;
margin-top: 24px;
}
.text {
margin-bottom: 16px;
}
}
}
}
`;
18 changes: 17 additions & 1 deletion src/app/components/styles/popup-styles.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { css } from '@emotion/react';

export const extensionStyles = css`
.mode__popup {
.mode__extension {
&,
body {
min-height: 600px !important;
Expand All @@ -12,5 +12,21 @@ export const extensionStyles = css`
max-width: 392px;
}
}
.welcome-page {
.content-image .image-large {
display: none;
}
.content-text {
.title {
width: 264px;
font-size: 32px;
line-height: 44px;
margin-top: 24px;
}
.text {
margin-bottom: 16px;
}
}
}
}
`;

0 comments on commit 97b16c1

Please sign in to comment.