Skip to content

Commit 1916af3

Browse files
author
Simon Planinschek
committed
Merge commit. To resolve merge conflict
2 parents 47b25b1 + bc5518c commit 1916af3

1,317 files changed

Lines changed: 2635 additions & 1474 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/components/Icon360.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const Icon360: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const Icon360: React.FC<IconProps> = (props) => (
45
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
56
<path d="M0 0h24v24H0z" fill="none" />
67
<path d="M12 7C6.48 7 2 9.24 2 12c0 2.24 2.94 4.13 7 4.77V20l4-4-4-4v2.73c-3.15-.56-5-1.9-5-2.73 0-1.06 3.04-3 8-3s8 1.94 8 3c0 .73-1.46 1.89-4 2.53v2.05c3.53-.77 6-2.53 6-4.58 0-2.76-4.48-5-10-5z" />

‎src/components/Icon3dRotation.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const Icon3dRotation: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const Icon3dRotation: React.FC<IconProps> = (props) => (
45
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
56
<path d="M0 0h24v24H0z" fill="none" />
67
<path d="M7.52 21.48C4.25 19.94 1.91 16.76 1.55 13H.05C.56 19.16 5.71 24 12 24l.66-.03-3.81-3.81-1.33 1.32zm.89-6.52c-.19 0-.37-.03-.52-.08-.16-.06-.29-.13-.4-.24-.11-.1-.2-.22-.26-.37-.06-.14-.09-.3-.09-.47h-1.3c0 .36.07.68.21.95.14.27.33.5.56.69.24.18.51.32.82.41.3.1.62.15.96.15.37 0 .72-.05 1.03-.15.32-.1.6-.25.83-.44s.42-.43.55-.72c.13-.29.2-.61.2-.97 0-.19-.02-.38-.07-.56-.05-.18-.12-.35-.23-.51-.1-.16-.24-.3-.4-.43-.17-.13-.37-.23-.61-.31.2-.09.37-.2.52-.33.15-.13.27-.27.37-.42.1-.15.17-.3.22-.46.05-.16.07-.32.07-.48 0-.36-.06-.68-.18-.96-.12-.28-.29-.51-.51-.69-.2-.19-.47-.33-.77-.43C9.1 8.05 8.76 8 8.39 8c-.36 0-.69.05-1 .16-.3.11-.57.26-.79.45-.21.19-.38.41-.51.67-.12.26-.18.54-.18.85h1.3c0-.17.03-.32.09-.45s.14-.25.25-.34c.11-.09.23-.17.38-.22.15-.05.3-.08.48-.08.4 0 .7.1.89.31.19.2.29.49.29.86 0 .18-.03.34-.08.49-.05.15-.14.27-.25.37-.11.1-.25.18-.41.24-.16.06-.36.09-.58.09H7.5v1.03h.77c.22 0 .42.02.6.07s.33.13.45.23c.12.11.22.24.29.4.07.16.1.35.1.57 0 .41-.12.72-.35.93-.23.23-.55.33-.95.33zm8.55-5.92c-.32-.33-.7-.59-1.14-.77-.43-.18-.92-.27-1.46-.27H12v8h2.3c.55 0 1.06-.09 1.51-.27.45-.18.84-.43 1.16-.76.32-.33.57-.73.74-1.19.17-.47.26-.99.26-1.57v-.4c0-.58-.09-1.1-.26-1.57-.18-.47-.43-.87-.75-1.2zm-.39 3.16c0 .42-.05.79-.14 1.13-.1.33-.24.62-.43.85-.19.23-.43.41-.71.53-.29.12-.62.18-.99.18h-.91V9.12h.97c.72 0 1.27.23 1.64.69.38.46.57 1.12.57 1.99v.4zM12 0l-.66.03 3.81 3.81 1.33-1.33c3.27 1.55 5.61 4.72 5.96 8.48h1.5C23.44 4.84 18.29 0 12 0z" />

‎src/components/Icon4k.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const Icon4k: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const Icon4k: React.FC<IconProps> = (props) => (
45
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
56
<path d="M0 0h24v24H0V0z" fill="none" />
67
<path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 10.5h-1V15H9.5v-1.5h-3V9H8v3h1.5V9H11v3h1v1.5zm6 1.5h-1.75l-1.75-2.25V15H13V9h1.5v2.25L16.25 9H18l-2.25 3L18 15z" />

‎src/components/Icon5g.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const Icon5g: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const Icon5g: React.FC<IconProps> = (props) => (
45
<svg
56
xmlns="http://www.w3.org/2000/svg"
67
enable-background="new 0 0 24 24"

‎src/components/Icon6FtApart.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const Icon6FtApart: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const Icon6FtApart: React.FC<IconProps> = (props) => (
45
<svg
56
xmlns="http://www.w3.org/2000/svg"
67
enable-background="new 0 0 24 24"

‎src/components/IconAcUnit.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const IconAcUnit: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const IconAcUnit: React.FC<IconProps> = (props) => (
45
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
56
<path d="M0 0h24v24H0z" fill="none" />
67
<path d="M22 11h-4.17l3.24-3.24-1.41-1.42L15 11h-2V9l4.66-4.66-1.42-1.41L13 6.17V2h-2v4.17L7.76 2.93 6.34 4.34 11 9v2H9L4.34 6.34 2.93 7.76 6.17 11H2v2h4.17l-3.24 3.24 1.41 1.42L9 13h2v2l-4.66 4.66 1.42 1.41L11 17.83V22h2v-4.17l3.24 3.24 1.42-1.41L13 15v-2h2l4.66 4.66 1.41-1.42L17.83 13H22z" />

‎src/components/IconAccessAlarm.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const IconAccessAlarm: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const IconAccessAlarm: React.FC<IconProps> = (props) => (
45
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
56
<path d="M0 0h24v24H0z" fill="none" />
67
<path d="M22 5.72l-4.6-3.86-1.29 1.53 4.6 3.86L22 5.72zM7.88 3.39L6.6 1.86 2 5.71l1.29 1.53 4.59-3.85zM12.5 8H11v6l4.75 2.85.75-1.23-4-2.37V8zM12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9c4.97 0 9-4.03 9-9s-4.03-9-9-9zm0 16c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z" />

‎src/components/IconAccessAlarms.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const IconAccessAlarms: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const IconAccessAlarms: React.FC<IconProps> = (props) => (
45
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
56
<path d="M-618-568H782v3600H-618zM0 0h24v24H0z" fill="none" />
67
<path d="M22 5.7l-4.6-3.9-1.3 1.5 4.6 3.9L22 5.7zM7.9 3.4L6.6 1.9 2 5.7l1.3 1.5 4.6-3.8zM12.5 8H11v6l4.7 2.9.8-1.2-4-2.4V8zM12 4c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9zm0 16c-3.9 0-7-3.1-7-7s3.1-7 7-7 7 3.1 7 7-3.1 7-7 7z" />

‎src/components/IconAccessTime.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const IconAccessTime: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const IconAccessTime: React.FC<IconProps> = (props) => (
45
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
56
<path d="M0 0h24v24H0z" fill="none" />
67
<path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />

‎src/components/IconAccessibility.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { IconProps } from './types'
3-
const IconAccessibility: React.FC<IconProps> = (props: IconProps): any => (
3+
4+
const IconAccessibility: React.FC<IconProps> = (props) => (
45
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
56
<path d="M0 0h24v24H0z" fill="none" />
67
<path d="M12 2c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm9 7h-6v13h-2v-6h-2v6H9V9H3V7h18v2z" />

0 commit comments

Comments
 (0)