Skip to content
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.

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

Implemented Themed Logout Button and Sidebar #564

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/client/components/AppSidebar/FolderOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ export const FolderOption: React.FC<FolderOptionProps> = ({

const renderIcon = () => {
if (folder === 'FAVORITES') {
return <Star size={15} className="app-sidebar-icon" color={iconColor} />
return <Star size={15} className="app-sidebar-icon star" color={iconColor} />
} else if (folder === 'ALL') {
return <Book size={15} className="app-sidebar-icon" color={iconColor} />
} else {
return <Trash2 size={15} className="app-sidebar-icon" color={iconColor} />
return <Trash2 size={15} className="app-sidebar-icon trash" color={iconColor} />
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/client/containers/NoteMenuBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export const NoteMenuBar = () => {
</button>
{!activeNote.scratchpad && (
<>
<button className="note-menu-bar-button" onClick={favoriteNoteHandler}>
<button className="note-menu-bar-button star" onClick={favoriteNoteHandler}>
<Star aria-hidden="true" size={18} />
<span className="sr-only">Add note to favorites</span>
</button>
Expand Down
1 change: 1 addition & 0 deletions src/client/containers/SettingsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ export const SettingsModal: React.FC = () => {
<div className="subtitle">{currentUser.bio}</div>
</div>
<button
className="profile-logout-button"
onClick={() => {
_logout()
}}
Expand Down
16 changes: 16 additions & 0 deletions src/client/styles/_app-sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@
svg {
stroke: darken($light-font-color, 10%);
}

svg.star {
stroke: darken($warning, 10%);
}

svg.trash {
stroke: darken($error, 10%);
}
}
}

Expand Down Expand Up @@ -106,6 +114,14 @@
svg {
stroke: $primary;
}

svg.star {
stroke: darken($warning, 10%);
}

svg.trash {
stroke: darken($error, 10%);
}
}

&.dragged-over {
Expand Down
11 changes: 11 additions & 0 deletions src/client/styles/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,17 @@
margin: 0;
margin-right: 1rem;
}
margin-right: 1rem;
}

.profile-logout-button {
background-color: rgb(202, 29, 29);
border-color: rgb(202, 29, 29);

&:hover {
background-color: rgb(189, 32, 32);
border-color: rgb(189, 32, 32);
}
}

.subtitle {
Expand Down
5 changes: 5 additions & 0 deletions src/client/styles/_note-menu-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
color: lighten($font-color, 15%);
padding: 0 0.75rem;
margin: 0;
&.star {
&:hover {
color: darken($warning, 8%);
}
}
&.trash {
&:hover {
color: darken($error, 20%);
Expand Down
1 change: 1 addition & 0 deletions src/client/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ $accent-gray: #d0d0d0;
$accent-lightgray: lighten($accent-gray, 12%);
$dimmer-background: rgba(0, 0, 0, 0.6);
$error: #f2777a;
$warning: #ffb10a;

$box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.1), 0 2px 4px 0 rgba(0, 0, 0, 0.08);

Expand Down