Skip to content

Commit f709bdc

Browse files
author
KZ
authored
UI fixes (#1513)
1 parent f76da8f commit f709bdc

File tree

9 files changed

+46
-13
lines changed

9 files changed

+46
-13
lines changed

src/cloud/components/Application.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import Sidebar, {
6363
import SidebarHeader from '../../design/components/organisms/Sidebar/atoms/SidebarHeader'
6464
import SidebarButtonList from '../../design/components/organisms/Sidebar/molecules/SidebarButtonList'
6565
import { getTeamLinkHref } from './Link/TeamLink'
66+
import WithPastille from '../../design/components/atoms/WithPastille'
6667
import SidebarButton from '../../design/components/organisms/Sidebar/atoms/SidebarButton'
6768
import CloudGlobalSearch from './CloudGlobalSearch'
6869
import { useCloudSidebarSpaces } from '../lib/hooks/sidebar/useCloudSidebarSpaces'
@@ -76,6 +77,7 @@ import SidebarToggleButton from './SidebarToggleButton'
7677
import SidebarSubscriptionCTA from './Subscription/SidebarSubscriptionCTA'
7778
import { isEmpty } from 'lodash'
7879
import LoaderTopbar from '../../design/components/atoms/loaders/LoaderTopbar'
80+
import Icon from '../../design/components/atoms/Icon'
7981

8082
interface ApplicationProps {
8183
className?: string
@@ -452,7 +454,11 @@ const Application = ({
452454
{isTimeEligibleForDiscount(team) && subscription == null ? (
453455
<SidebarButton
454456
variant='subtle'
455-
icon={mdiGiftOutline}
457+
icon={
458+
<WithPastille>
459+
<Icon size={16} path={mdiGiftOutline} />
460+
</WithPastille>
461+
}
456462
id='sidebar__button__promo'
457463
label={translate(lngKeys.SidebarNewUserDiscount)}
458464
labelClick={() => {

src/cloud/components/Comments/CommentInput.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ const InputContainer = styled.div`
231231
.comment__input__container {
232232
display: flex;
233233
position: relative;
234+
margin-top: ${({ theme }) => theme.sizes.spaces.df}px;
234235
margin-bottom: ${({ theme }) => theme.sizes.spaces.md}px;
235236
236237
.comment__input__send_button {

src/cloud/components/Onboarding/FolderPageInviteSection.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,12 @@ const FolderPageInviteSectionContainer = styled.div`
178178
color: ${({ theme }) => theme.colors.text.subtle};
179179
}
180180
h5 {
181+
color: ${({ theme }) => theme.colors.text.primary};
181182
margin: ${({ theme }) => theme.sizes.spaces.sm}px 0;
182183
font-size: ${({ theme }) => theme.sizes.fonts.l}px;
183184
}
184185
p {
186+
color: ${({ theme }) => theme.colors.text.primary};
185187
font-size: ${({ theme }) => theme.sizes.fonts.df}px;
186188
margin-bottom: ${({ theme }) => theme.sizes.spaces.sm}px;
187189
}

src/cloud/components/Props/Pickers/UrlSelect.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ const UrlSelectContainer = styled.div`
127127
overflow: hidden;
128128
white-space: nowrap;
129129
text-overflow: ellipsis;
130-
line-height: 18px;
131-
min-height: 25px;
130+
line-height: 25px;
132131
width: 100%;
133132
134133
&.url-select__label--incorrect {

src/cloud/components/ViewerDisclaimer.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ const Container = styled.div`
106106
border-radius: ${({ theme }) => theme.borders.radius}px;
107107
108108
min-height: 36px;
109-
margin: ${({ theme }) => theme.sizes.spaces.md}px 0;
109+
margin: ${({ theme }) => theme.sizes.spaces.md}px
110+
${({ theme }) => theme.sizes.spaces.df}px;
110111
111112
.viewer__disclaimer__text--padding {
112113
padding: ${({ theme }) => theme.sizes.spaces.sm}px;

src/cloud/components/Views/EditableDocItemContainer.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,19 @@ const EditableDocItemContainer = ({ doc, children }: ItemProps) => {
8989
doc: SerializedDocWithSupplemental
9090
) => {
9191
const editTitleAction: MenuItem = {
92-
icon: <Icon path={mdiPencilOutline} />,
92+
icon: <Icon size={16} path={mdiPencilOutline} />,
9393
type: MenuTypes.Normal,
9494
label: translate(lngKeys.GeneralEditTitle),
9595
onClick: () => setEditingItemTitle(true),
9696
}
9797
const duplicateAction: MenuItem = {
98-
icon: <Icon path={mdiContentDuplicate} />,
98+
icon: <Icon size={16} path={mdiContentDuplicate} />,
9999
type: MenuTypes.Normal,
100100
label: translate(lngKeys.GeneralDuplicate),
101101
onClick: () => onDocDuplicate(doc),
102102
}
103103
const deleteDocAction: MenuItem = {
104-
icon: <Icon path={mdiTrashCanOutline} />,
104+
icon: <Icon size={16} path={mdiTrashCanOutline} />,
105105
type: MenuTypes.Normal,
106106
label: translate(lngKeys.GeneralDelete),
107107
onClick: () => deleteDocApi({ id: doc.id, teamId: doc.teamId }),

src/cloud/lib/i18n/enUS.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,8 @@ const enTranslation: TranslationSource = {
482482

483483
[lngKeys.ViewerDisclaimerIntro]: 'Please ask your admin to give you a ',
484484
[lngKeys.ViewerDisclaimerOutro]: 'so that you can edit this document',
485-
[lngKeys.ViewerDisclaimerFolderOutro]: 'so that you can edit this folder',
485+
[lngKeys.ViewerDisclaimerFolderOutro]:
486+
'so that you can create a document and folder, add properties, add views and edit folder',
486487
[lngKeys.MemberRole]: 'Member role',
487488

488489
[lngKeys.DiscountModalTitle]: 'Subscribe now to receive a discount',

src/cloud/lib/i18n/ja.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -480,12 +480,12 @@ const jpTranslation: TranslationSource = {
480480
[lngKeys.PlanDashboardPerUser]: '{{size}} dashboards',
481481
[lngKeys.PlanSmartviewPerDashboard]: '{{size}} smart views per dashboard',
482482
[lngKeys.SeeRoleDetails]: '各権限を確認する。',
483-
[lngKeys.ViewerDisclaimerIntro]: 'このドキュメントを編集できるように',
483+
[lngKeys.ViewerDisclaimerIntro]: 'Admin権限の方があなたの権限を',
484484
[lngKeys.ViewerDisclaimerOutro]:
485-
'Admin権限の方があなたの権限をMemberに変更すると、ドキュメント編集等を行うことができるようになります。',
485+
'に変更すると、ドキュメント編集やプロパティの追加を行うことができるようになります。',
486486
[lngKeys.ViewerDisclaimerFolderOutro]:
487-
'Admin権限の方があなたの権限をMemberに変更すると、フォルダー編集等を行うことができるようになります。',
488-
[lngKeys.MemberRole]: 'メンバーの役割',
487+
'に変更すると、ドキュメントやFolderの作成やプロパティの追加を行うことができるようになります。',
488+
[lngKeys.MemberRole]: 'Member',
489489

490490
[lngKeys.DiscountModalTitle]: '有料プランを購読し、割引を受け取りましょう!',
491491
[lngKeys.DiscountModalAlreadySubscribed]:
@@ -499,7 +499,7 @@ const jpTranslation: TranslationSource = {
499499

500500
[lngKeys.GeneralDocuments]: 'ドキュメント',
501501
[lngKeys.RequestSent]: 'リクエストが送信されました',
502-
[lngKeys.RequestAskMemberRole]: 'メンバーの役割を尋ねる',
502+
[lngKeys.RequestAskMemberRole]: 'Adminに申請を送る',
503503
[lngKeys.UploadLimit]: 'アップロード可能な最大容量は{{sizeInMb}}MBです。',
504504

505505
[lngKeys.OnboardingFolderSectionTitle]: 'Boost Noteへようこそ!',
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import React from 'react'
2+
import styled from '../../lib/styled'
3+
4+
export const WithPastille = ({ children }: React.PropsWithChildren<{}>) => (
5+
<Container>{children}</Container>
6+
)
7+
8+
export default WithPastille
9+
10+
const Container = styled.div`
11+
position: relative;
12+
&:after {
13+
position: absolute;
14+
content: '';
15+
width: 12px;
16+
height: 12px;
17+
background-color: #cd4400;
18+
top: 1px;
19+
right: -2px;
20+
border-radius: 50%;
21+
transform: translate3d(25%, -25%, 0);
22+
}
23+
`

0 commit comments

Comments
 (0)