Skip to content

UI: Restyled App Navigators #686

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
Rokt33r merged 2 commits into from
Nov 16, 2020
Merged

UI: Restyled App Navigators #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
250bb65
Added Team Switcher Colors
ellekasai Nov 16, 2020
1b5f9ee
Restyled App Navigators
ellekasai Nov 16, 2020
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
26 changes: 14 additions & 12 deletions src/components/molecules/AppNavigatorStorageItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,45 @@ import { openContextMenu } from '../../lib/electronOnly'
import { useStorageRouter } from '../../lib/storageRouter'

const Container = styled.div`
${flexCenter}
position: relative;
height: 48px;
width: 48px;
margin-bottom: 4px;
&:first-child {
margin-top: 10px;
}
${flexCenter}
border-radius: 14px;
border-width: 3px;
border-style: solid;
border-color: transparent;

&:first-child {
margin-top: 10px;
}
&:hover {
border-color: ${({ theme }) => theme.borderColor};
}
&.active {
border-color: ${({ theme }) => theme.textColor};
}
`

const MainButton = styled.button`
${flexCenter}
height: 36px;
width: 36px;
border-radius: 8px;
${border}
cursor: pointer;
${flexCenter}
font-size: 18px;
border: none;
background-color: ${({ theme }) => theme.secondaryButtonBackgroundColor};
color: ${({ theme }) => theme.secondaryButtonLabelColor};
border: 1px solid ${({ theme }) => theme.borderColor};
background-color: ${({ theme }) => theme.teamSwitcherBackgroundColor};
border: 1px solid ${({ theme }) => theme.teamSwitcherBorderColor};
color: ${({ theme }) => theme.teamSwitcherTextColor};
font-size: 13px;

&:hover,
&:active,
&.active {
background-color: ${({ theme }) => theme.teamSwitcherHoverBackgroundColor};
color: ${({ theme }) => theme.teamSwitcherHoverTextColor};
cursor: pointer;
color: ${({ theme }) => theme.secondaryButtonHoverLabelColor};
background-color: ${({ theme }) => theme.primaryColor};
}

&:disabled {
Expand Down
6 changes: 3 additions & 3 deletions src/components/organisms/AppNavigator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, { useMemo, useCallback, MouseEventHandler } from 'react'
import styled from '../../lib/styled'
import {
borderRight,
border,
secondaryButtonStyle,
flexCenter,
} from '../../lib/styled/styleFunctions'
Expand Down Expand Up @@ -238,18 +237,19 @@ const ControlContainer = styled.div`
`

const NavigatorButton = styled.button`
position: relative;
${secondaryButtonStyle}
position: relative;
height: 36px;
width: 36px;
${border}
margin-bottom: 8px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
font-size: 22px;
border-radius: 8px;
border: none;

&:first-child {
margin-top: 5px;
}
Expand Down
7 changes: 7 additions & 0 deletions src/lib/styled/BaseTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ export interface BaseTheme {
noteNavEmptyItemColor: string
noteNavItemBackgroundColor: string

// Team Switcher
teamSwitcherBackgroundColor: string
teamSwitcherBorderColor: string
teamSwitcherTextColor: string
teamSwitcherHoverBackgroundColor: string
teamSwitcherHoverTextColor: string

// Button
primaryButtonLabelColor: string
primaryButtonBackgroundColor: string
Expand Down
8 changes: 8 additions & 0 deletions src/themes/dark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const primaryColor = '#5580DC'
const primaryDarkerColor = '#4070D8'
const dangerColor = '#DC3545'

const dark54Color = 'rgba(0,0,0,0.54)'
const dark26Color = 'rgba(0,0,0,0.26)'
const light70Color = 'rgba(255,255,255,0.7)'
const light30Color = 'rgba(255,255,255,0.3)'
Expand Down Expand Up @@ -59,6 +60,13 @@ export const darkTheme: BaseTheme = {
navItemActiveBackgroundColor: '#444',
navItemHoverActiveBackgroundColor: '#555',

// Team Switcher
teamSwitcherBackgroundColor: light100Color,
teamSwitcherBorderColor: 'transparent',
teamSwitcherTextColor: dark54Color,
teamSwitcherHoverBackgroundColor: light100Color,
teamSwitcherHoverTextColor: dark54Color,

// NotePage
noteNavEmptyItemColor: '#999',
noteNavItemBackgroundColor: '#444',
Expand Down
7 changes: 7 additions & 0 deletions src/themes/legacy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ export const legacyTheme: BaseTheme = {
navItemActiveBackgroundColor: '#444',
navItemHoverActiveBackgroundColor: '#555',

// Team Switcher
teamSwitcherBackgroundColor: light100Color,
teamSwitcherBorderColor: 'transparent',
teamSwitcherTextColor: dark54Color,
teamSwitcherHoverBackgroundColor: light100Color,
teamSwitcherHoverTextColor: dark54Color,

// NotePage
noteNavEmptyItemColor: '#999',
noteNavItemBackgroundColor: base2Color,
Expand Down
7 changes: 7 additions & 0 deletions src/themes/light.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ export const lightTheme: BaseTheme = {
navItemActiveBackgroundColor: uiVividBackgroundColor,
navItemHoverActiveBackgroundColor: uiVivid2BackgroundColor,

// Team Switcher
teamSwitcherBackgroundColor: light100Color,
teamSwitcherBorderColor: dark12Color,
teamSwitcherTextColor: dark54Color,
teamSwitcherHoverBackgroundColor: light100Color,
teamSwitcherHoverTextColor: dark54Color,

// NotePage
noteNavEmptyItemColor: uiDimColor,
noteNavItemBackgroundColor: uiVividBackgroundColor,
Expand Down
7 changes: 7 additions & 0 deletions src/themes/sepia.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ export const sepiaTheme: BaseTheme = {
navItemActiveBackgroundColor: '#eee8d6',
navItemHoverActiveBackgroundColor: '#e0e0e0',

// Team Switcher
teamSwitcherBackgroundColor: '#eee8d6',
teamSwitcherBorderColor: 'transparent',
teamSwitcherTextColor: base3Color,
teamSwitcherHoverBackgroundColor: primaryColor,
teamSwitcherHoverTextColor: light100Color,

// NotePage
noteNavEmptyItemColor: '#777',
noteNavItemBackgroundColor: '#eee8d6',
Expand Down
9 changes: 8 additions & 1 deletion src/themes/solarizedDark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const solarizedDarkTheme: BaseTheme = {
primaryColor: primaryColor,
primaryDarkerColor: primaryDarkerColor,
dangerColor: dangerColor,
borderColor: dark26Color,
borderColor: light12Color,
noteListIconColor: light30Color,
noteListActiveIconColor: light70Color,
noteDetailIconColor: light30Color,
Expand Down Expand Up @@ -60,6 +60,13 @@ export const solarizedDarkTheme: BaseTheme = {
navItemActiveBackgroundColor: light24Color,
navItemHoverActiveBackgroundColor: light18Color,

// Team Switcher
teamSwitcherBackgroundColor: light12Color,
teamSwitcherBorderColor: dark26Color,
teamSwitcherTextColor: light100Color,
teamSwitcherHoverBackgroundColor: primaryColor,
teamSwitcherHoverTextColor: light100Color,

// NotePage
noteNavEmptyItemColor: '#bbb',
noteNavItemBackgroundColor: light12Color,
Expand Down