Skip to content

fix: colors & navigation #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Exerbaind merged 1 commit into from
Nov 12, 2025
Merged

fix: colors & navigation #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/common/styles/themes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

--color-bottomBar-background: rgba(255, 255, 255, 0.88);

--color-segmentControl-background: var(--palette-white-100);
--color-segmentControl-background: rgba(242, 242, 242, 0.88);

--color-quickMenu-background: var(--palette-white-60);
--color-quickMenu-foreground: var(--palette-black-100);
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/Dropdown/Dropdown.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
border-radius: 10px;
background-color: var(--color-segmentControl-background);
backdrop-filter: blur(25px);
box-shadow: 0 4px 40px 0 rgba(0, 0, 0, 0.2);
z-index: 0;
transition: 0.2s;
transform: scale(0.3);
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/PageLayoutNew/PageLayoutNew.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
padding: 16px 0;
}

.isMobile {
padding: calc(var(--tg-content-safe-area-inset-top, 0px) + 66px) 0 16px 0;
}
// .isMobile {
// padding: calc(var(--tg-content-safe-area-inset-top, 0px) + 66px) 0 16px 0;
// }

.center {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/context/ThemeProvider/ThemeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const webApp = window.Telegram?.WebApp
export const ThemeProvider = ({ children }: Props) => {
const lightTgTheme = webApp?.colorScheme === 'light'

const [darkTheme, setDarkTheme] = useState(lightTgTheme)
const [darkTheme, setDarkTheme] = useState(!lightTgTheme)

const toggleThemeHandler = () => {
setDarkTheme((prevState) => !prevState)
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/admin/MainPage/MainPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const MainPage = () => {

return (
<PageLayoutNew>
<TelegramBackButton />
<TelegramBackButton hidden />
<TelegramMainButton text="Add Group or Channel" onClick={handleAddChat} />
<BlockNew gap={12} className={styles.container}>
<BlockNew padding="0 16px">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/admin/MainPage/components/ChatsBlock/ChatsBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const ChatsBlock = () => {
onClick={() => handleToggleDropdown()}
ref={buttonRef}
>
<Icon name="sortArrows" size={18} />
<Icon name="sortArrows" size={18} color="secondary" />
<Dropdown
active={isDropdownOpen}
options={[
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/admin/MainPage/components/UserChatsList/UserChatsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const UserChatsList = ({ chats }: UserChatsListProps) => {
}
onClick={() => {
hapticFeedback('soft')
navigate(`/client/${chat.slug}`)
navigate(`/admin/chat/${chat.slug}`)
}}
/>
))}
Expand Down
Loading