Skip to content

fix(advanced checklist): UI changes #1208

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
johnny243 merged 4 commits into from
Jul 5, 2022
Merged

fix(advanced checklist): UI changes #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d601f64
fix: remove create task circle
johnny243 Jul 5, 2022
4d98f13
fix: adjust outer margin
johnny243 Jul 5, 2022
9990aba
fix: remove reorder icon
johnny243 Jul 5, 2022
045726f
fix: adjust checkbox and text size
johnny243 Jul 5, 2022
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 ...Packages/Editors/org.standardnotes.advanced-checklist/src/common/components/MainTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ type MainTitleProps = {
crossed?: boolean
}

export const MainTitle: React.FC<MainTitleProps> = ({ children, highlight = false, crossed = false }) => {
export const MainTitle: React.FC<MainTitleProps> = ({ children, highlight = false, crossed = false, ...props }) => {
return (
<Header1 className={`sk-h1 ${highlight ? 'info' : ''}`} crossed={crossed}>
<Header1 className={`sk-h1 ${highlight ? 'info' : ''}`} crossed={crossed} {...props}>
{children}
</Header1>
)
Expand Down
4 changes: 2 additions & 2 deletions ...ages/Editors/org.standardnotes.advanced-checklist/src/common/components/TextAreaInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const StyledTextArea = styled.textarea`
background-color: transparent;
border: none;
color: inherit;
font-size: 1rem;
font-size: 0.98rem;
font-weight: 400;
margin-left: 6px;
margin-left: 2px;
outline: none;
overflow: hidden;
resize: none;
Expand Down
4 changes: 2 additions & 2 deletions .../org.standardnotes.advanced-checklist/src/common/components/svg/CheckBoxElementsDefs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $transition-duration: 750ms;
bottom: 0;
cursor: pointer;
fill: none;
height: 22px;
height: 19px;
left: 0;
margin: auto;
position: absolute;
Expand All @@ -32,7 +32,7 @@ $transition-duration: 750ms;
stroke-width: 2;
stroke: var(--sn-stylekit-neutral-color);
top: 0;
width: 22px;
width: 19px;
}

.align-baseline {
Expand Down
7 changes: 0 additions & 7 deletions ...c/Packages/Editors/org.standardnotes.advanced-checklist/src/features/tasks/CreateTask.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,12 @@ import { useAppDispatch, useAppSelector, useDebouncedCallback } from '../../app/
import { GroupModel, taskAdded, tasksGroupDraft } from './tasks-slice'

import { TextInput } from '../../common/components'
import { DottedCircleIcon } from '../../common/components/icons'
import { isLastActiveGroup } from '../../common/utils'

const Container = styled.div`
align-items: center;
display: flex;
margin-bottom: 8px;

& > *:first-child {
margin-left: 1px;
margin-right: 9px;
}
`

type CreateTaskProps = {
Expand Down Expand Up @@ -67,7 +61,6 @@ const CreateTask: React.FC<CreateTaskProps> = ({ group }) => {

return (
<Container>
<DottedCircleIcon />
<TextInput
testId="create-task-input"
disabled={!canEdit}
Expand Down
11 changes: 3 additions & 8 deletions ...rc/Packages/Editors/org.standardnotes.advanced-checklist/src/features/tasks/TaskGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import TaskGroupOptions from './TaskGroupOptions'

import { useEffect, useState } from 'react'
import { CircularProgressBar, GenericInlineText, MainTitle, RoundButton } from '../../common/components'
import { ChevronDownIcon, ChevronUpIcon, ReorderIcon } from '../../common/components/icons'
import { ChevronDownIcon, ChevronUpIcon } from '../../common/components/icons'

const TaskGroupContainer = styled.div<{ isLast?: boolean }>`
background-color: var(--sn-stylekit-background-color);
border: 1px solid var(--sn-stylekit-border-color);
border-radius: 8px;
border-radius: 4px;
box-sizing: border-box;
padding: 16px;
margin-bottom: ${({ isLast }) => (!isLast ? '9px' : '0px')};
Expand Down Expand Up @@ -85,12 +85,7 @@ const TaskGroup: React.FC<TaskGroupProps> = ({
>
<div className="flex items-center justify-between h-8 mt-1 mb-1">
<div className="flex flex-grow items-center" onClick={handleClick}>
{canEdit && (
<div className="mr-3 pt-1px" {...props}>
<ReorderIcon highlight={isDragging} />
</div>
)}
<MainTitle crossed={allTasksCompleted && collapsed} highlight={isDragging}>
<MainTitle crossed={allTasksCompleted && collapsed} highlight={isDragging} {...props}>
{groupName}
</MainTitle>
<CircularProgressBar size={18} percentage={percentageCompleted} />
Expand Down
6 changes: 1 addition & 5 deletions packages/components/src/Packages/Editors/org.standardnotes.advanced-checklist/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@ import { CheckBoxElementsDefs } from './common/components/svg'
import { getPlainPreview } from './common/utils'

const MainContainer = styled.div`
margin: 16px;
margin: 6px;
padding-bottom: 60px;

@media only screen and (max-width: 600px) {
margin: 8px;
}
`

const FloatingContainer = styled.div`
Expand Down