mirror of
https://github.com/urbit/shrub.git
synced 2024-12-22 10:21:31 +03:00
Merge pull request #4812 from urbit/mp/landscape/indigo-bump
landscape: update indigo-react to 1.2.21
This commit is contained in:
commit
b78e7583db
@ -111,7 +111,7 @@ module.exports = {
|
||||
]
|
||||
}
|
||||
},
|
||||
exclude: /node_modules\/(?!(@tlon\/indigo-dark|@tlon\/indigo-light)\/).*/
|
||||
exclude: /node_modules\/(?!(@tlon\/indigo-dark|@tlon\/indigo-light|@tlon\/indigo-react)\/).*/
|
||||
},
|
||||
{
|
||||
test: /\.css$/i,
|
||||
|
@ -30,7 +30,7 @@ module.exports = {
|
||||
]
|
||||
}
|
||||
},
|
||||
exclude: /node_modules\/(?!(@tlon\/indigo-dark|@tlon\/indigo-light)\/).*/
|
||||
exclude: /node_modules\/(?!(@tlon\/indigo-dark|@tlon\/indigo-light|@tlon\/indigo-react)\/).*/
|
||||
},
|
||||
{
|
||||
test: /\.css$/i,
|
||||
|
3882
pkg/interface/package-lock.json
generated
3882
pkg/interface/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -9,8 +9,8 @@
|
||||
"@reach/menu-button": "^0.10.5",
|
||||
"@reach/tabs": "^0.10.5",
|
||||
"@tlon/indigo-dark": "^1.0.6",
|
||||
"@tlon/indigo-light": "^1.0.6",
|
||||
"@tlon/indigo-react": "^1.2.19",
|
||||
"@tlon/indigo-light": "^1.0.7",
|
||||
"@tlon/indigo-react": "^1.2.21",
|
||||
"@tlon/sigil-js": "^1.4.3",
|
||||
"@urbit/api": "file:../npm/api",
|
||||
"any-ascii": "^0.1.7",
|
||||
|
@ -30,7 +30,7 @@ export const getModuleIcon = (mod: string) => {
|
||||
}
|
||||
|
||||
if (mod === 'post') {
|
||||
return 'Spaces';
|
||||
return 'Dashboard';
|
||||
}
|
||||
|
||||
return _.capitalize(mod);
|
||||
|
@ -188,7 +188,7 @@ class ChatInput extends Component<ChatInputProps, ChatInputState> {
|
||||
<LoadingSpinner />
|
||||
) : (
|
||||
<Icon
|
||||
icon='Links'
|
||||
icon='Attachment'
|
||||
width='16'
|
||||
height='16'
|
||||
onClick={() =>
|
||||
|
@ -220,7 +220,7 @@ export default function LaunchApp(props) {
|
||||
<NewGroup {...props} />
|
||||
</ModalButton>
|
||||
<ModalButton
|
||||
icon="Boot"
|
||||
icon="BootNode"
|
||||
bg="washedGray"
|
||||
color="black"
|
||||
text="Join Group"
|
||||
|
@ -107,7 +107,7 @@ export default function SettingsScreen(props: any) {
|
||||
</Text>
|
||||
<Col>
|
||||
<SidebarItem
|
||||
icon='Inbox'
|
||||
icon='Notifications'
|
||||
text='Notifications'
|
||||
hash='notifications'
|
||||
/>
|
||||
|
@ -83,7 +83,7 @@ const StatusBar = (props) => {
|
||||
onClick={() => history.push('/')}
|
||||
{...props}
|
||||
>
|
||||
<Icon icon='Spaces' color='black' />
|
||||
<Icon icon='Dashboard' color='black' />
|
||||
</Button>
|
||||
<StatusBarItem float={floatLeap} mr={2} onClick={() => toggleOmnibox()}>
|
||||
{!doNotDisturb && (notificationsCount > 0 || invites.length > 0) && (
|
||||
|
@ -65,7 +65,7 @@ export class OmniboxResult extends Component {
|
||||
<Icon
|
||||
display='inline-block'
|
||||
verticalAlign='middle'
|
||||
icon='Inbox'
|
||||
icon='Notifications'
|
||||
mr='2'
|
||||
size='18px'
|
||||
color={iconFill}
|
||||
@ -85,7 +85,7 @@ export class OmniboxResult extends Component {
|
||||
<Icon
|
||||
display='inline-block'
|
||||
verticalAlign='middle'
|
||||
icon='SignOut'
|
||||
icon='LogOut'
|
||||
mr='2'
|
||||
size='18px'
|
||||
color={iconFill}
|
||||
@ -119,7 +119,7 @@ export class OmniboxResult extends Component {
|
||||
<Icon
|
||||
display='inline-block'
|
||||
verticalAlign='middle'
|
||||
icon='Inbox'
|
||||
icon='Notifications'
|
||||
mr='2'
|
||||
size='18px'
|
||||
color={iconFill}
|
||||
|
@ -27,13 +27,13 @@ export function ChannelPopoverRoutesSidebar(props: {
|
||||
Preferences
|
||||
</Text>
|
||||
<SidebarItem
|
||||
icon="Inbox"
|
||||
icon='Notifications'
|
||||
text="Notifications"
|
||||
to={relativePath('/settings#notifications')}
|
||||
/>
|
||||
{!isOwner && (
|
||||
<SidebarItem
|
||||
icon="SignOut"
|
||||
icon="LogOut"
|
||||
text="Unsubscribe"
|
||||
color="red"
|
||||
to={relativePath('/settings#unsubscribe')}
|
||||
@ -45,7 +45,7 @@ export function ChannelPopoverRoutesSidebar(props: {
|
||||
Administration
|
||||
</Text>
|
||||
<SidebarItem
|
||||
icon="Boot"
|
||||
icon="BootNode"
|
||||
text="Channel Details"
|
||||
to={relativePath('/settings#details')}
|
||||
/>
|
||||
@ -56,14 +56,14 @@ export function ChannelPopoverRoutesSidebar(props: {
|
||||
/>
|
||||
{ isOwner ? (
|
||||
<SidebarItem
|
||||
icon="TrashCan"
|
||||
icon="X"
|
||||
text="Archive Channel"
|
||||
to={relativePath('/settings#archive')}
|
||||
color="red"
|
||||
/>
|
||||
) : (
|
||||
<SidebarItem
|
||||
icon="TrashCan"
|
||||
icon="X"
|
||||
text="Archive Channel"
|
||||
to={relativePath('/settings#remove')}
|
||||
color="red"
|
||||
|
@ -36,7 +36,7 @@ return;
|
||||
? 'Permanently delete this group. (All current members will no longer see this group.)'
|
||||
: 'You can rejoin if it is an open group, or if you are reinvited';
|
||||
|
||||
const icon = props.owner ? 'X' : 'SignOut';
|
||||
const icon = props.owner ? 'X' : 'LogOut';
|
||||
const { modal, showModal } = useModal({ modal:
|
||||
(dismiss: () => void) => {
|
||||
const onCancel = (e) => {
|
||||
|
@ -24,7 +24,7 @@ function canWrite(props) {
|
||||
if(vip === 'host-feed') {
|
||||
return isHost(association.group);
|
||||
}
|
||||
|
||||
|
||||
return isWriter(group, association.resource);
|
||||
}
|
||||
|
||||
@ -147,7 +147,7 @@ export function PostInput(props) {
|
||||
<LoadingSpinner />
|
||||
) : (
|
||||
<Icon
|
||||
icon='Links'
|
||||
icon='Attachment'
|
||||
width='16'
|
||||
height='16'
|
||||
onClick={uploadImage}
|
||||
|
@ -52,7 +52,7 @@ export function NewChannel(props: NewChannelProps): ReactElement {
|
||||
|
||||
const groups = useGroupState(state => state.groups);
|
||||
const waiter = useWaitForProps({ groups }, 5000);
|
||||
|
||||
|
||||
const onSubmit = async (values: FormSchema, actions) => {
|
||||
const name = (values.name) ? values.name : values.moduleType;
|
||||
const resId: string = stringToSymbol(values.name)
|
||||
@ -153,7 +153,7 @@ export function NewChannel(props: NewChannelProps): ReactElement {
|
||||
name="moduleType"
|
||||
/>
|
||||
<IconRadio
|
||||
icon="Publish"
|
||||
icon="Notebook"
|
||||
label="Notebook"
|
||||
id="publish"
|
||||
name="moduleType"
|
||||
|
@ -208,7 +208,7 @@ export function Participants(props: {
|
||||
</Row>
|
||||
<Col flexShrink={0} width="100%" height="fit-content">
|
||||
<Row alignItems="center" bg="washedGray" borderRadius="1" px="2" my="2">
|
||||
<Icon color="gray" icon="MagnifyingGlass" />
|
||||
<Icon color="gray" icon="Search" />
|
||||
<Input
|
||||
maxWidth="256px"
|
||||
color="gray"
|
||||
|
@ -76,7 +76,7 @@ export function PopoverRoutes(
|
||||
<Col gapY="2">
|
||||
<Text my="1" mx="3" gray>Group</Text>
|
||||
<SidebarItem
|
||||
icon="Inbox"
|
||||
icon='Notifications'
|
||||
to={relativeUrl('/settings#notifications')}
|
||||
text="Notifications"
|
||||
/>
|
||||
@ -98,7 +98,7 @@ export function PopoverRoutes(
|
||||
text="Group Details"
|
||||
/>
|
||||
<SidebarItem
|
||||
icon="Spaces"
|
||||
icon="Dashboard"
|
||||
to={relativeUrl('/settings#channels')}
|
||||
text="Channel Management"
|
||||
/>
|
||||
|
Loading…
Reference in New Issue
Block a user