From 632ea611fab09053130c09d1e6ca481420bf712f Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Mon, 23 Aug 2021 12:19:08 +0300 Subject: [PATCH] Get rid of IconSize (#51) Signed-off-by: Alexander Platov --- .../src/components/icons/Add.svelte | 9 ++--- .../src/components/icons/Close.svelte | 9 ++--- packages/ui/src/components/IconSize.svelte | 37 ------------------- packages/ui/src/components/icons/Add.svelte | 9 ++--- packages/ui/src/components/icons/Back.svelte | 9 ++--- .../ui/src/components/icons/Calendar.svelte | 11 ++---- packages/ui/src/components/icons/Check.svelte | 9 ++--- packages/ui/src/components/icons/Close.svelte | 9 ++--- .../ui/src/components/icons/Comments.svelte | 15 +++----- packages/ui/src/components/icons/Down.svelte | 9 ++--- .../ui/src/components/icons/Forward.svelte | 9 ++--- .../ui/src/components/icons/Search.svelte | 9 ++--- packages/ui/src/components/icons/ToDo.svelte | 15 +++----- packages/ui/src/components/icons/Up.svelte | 9 ++--- .../ui/src/components/internal/Root.svelte | 1 + .../ui/src/components/internal/Status.svelte | 15 +++----- .../components/internal/icons/Close.svelte | 9 ++--- .../components/internal/icons/FontSize.svelte | 15 +++----- .../src/components/internal/icons/Info.svelte | 6 +-- .../components/internal/icons/InfoOld.svelte | 25 ------------- .../src/components/internal/icons/Mute.svelte | 9 ++--- .../src/components/internal/icons/WiFi.svelte | 17 ++++----- packages/ui/src/index.ts | 1 - .../src/components/icons/Bookmark.svelte | 9 ++--- .../src/components/icons/Check.svelte | 11 ++---- .../src/components/icons/Close.svelte | 9 ++--- .../src/components/icons/Emoji.svelte | 9 ++--- .../src/components/icons/Heart.svelte | 9 ++--- .../src/components/icons/MoreH.svelte | 13 +++---- .../src/components/icons/Share.svelte | 11 ++---- .../src/components/icons/Address.svelte | 9 ++--- .../src/components/icons/Attachment.svelte | 9 ++--- .../src/components/icons/File.svelte | 9 ++--- .../src/components/icons/Mail.svelte | 9 ++--- .../src/components/icons/MoreH.svelte | 13 +++---- .../src/components/icons/Recruiting.svelte | 19 ++++------ .../src/components/icons/File.svelte | 9 ++--- .../src/components/icons/Add.svelte | 9 ++--- .../src/components/icons/Close.svelte | 9 ++--- .../src/components/icons/Collapsed.svelte | 9 ++--- .../src/components/icons/Down.svelte | 9 ++--- .../src/components/icons/Expanded.svelte | 9 ++--- .../src/components/icons/FullRight.svelte | 9 ++--- .../src/components/icons/Home.svelte | 9 ++--- .../src/components/icons/Lock.svelte | 9 ++--- .../src/components/icons/Mention.svelte | 9 ++--- .../src/components/icons/MoreH.svelte | 13 +++---- .../src/components/icons/Search.svelte | 9 ++--- .../src/components/icons/Star.svelte | 9 ++--- .../src/components/icons/Thread.svelte | 15 +++----- .../src/components/icons/Up.svelte | 9 ++--- .../src/components/icons/VCard.svelte | 29 +++++++-------- .../src/components/icons/VKanban.svelte | 11 ++---- .../src/components/icons/VList.svelte | 17 ++++----- 54 files changed, 195 insertions(+), 412 deletions(-) delete mode 100644 packages/ui/src/components/IconSize.svelte delete mode 100644 packages/ui/src/components/internal/icons/InfoOld.svelte diff --git a/packages/presentation/src/components/icons/Add.svelte b/packages/presentation/src/components/icons/Add.svelte index a4007930a7..6c7f0bb578 100644 --- a/packages/presentation/src/components/icons/Add.svelte +++ b/packages/presentation/src/components/icons/Add.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/presentation/src/components/icons/Close.svelte b/packages/presentation/src/components/icons/Close.svelte index ac4ecfab9d..ca01b782b1 100644 --- a/packages/presentation/src/components/icons/Close.svelte +++ b/packages/presentation/src/components/icons/Close.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/IconSize.svelte b/packages/ui/src/components/IconSize.svelte deleted file mode 100644 index dd04fac100..0000000000 --- a/packages/ui/src/components/IconSize.svelte +++ /dev/null @@ -1,37 +0,0 @@ - - - - -
- -
- - diff --git a/packages/ui/src/components/icons/Add.svelte b/packages/ui/src/components/icons/Add.svelte index 512a1fa982..0554580c81 100644 --- a/packages/ui/src/components/icons/Add.svelte +++ b/packages/ui/src/components/icons/Add.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/icons/Back.svelte b/packages/ui/src/components/icons/Back.svelte index d8ca3ec3b2..9b7ea666b7 100644 --- a/packages/ui/src/components/icons/Back.svelte +++ b/packages/ui/src/components/icons/Back.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/icons/Calendar.svelte b/packages/ui/src/components/icons/Calendar.svelte index ca33845818..b2e928d8f1 100644 --- a/packages/ui/src/components/icons/Calendar.svelte +++ b/packages/ui/src/components/icons/Calendar.svelte @@ -1,13 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/icons/Check.svelte b/packages/ui/src/components/icons/Check.svelte index d48788c055..b7b0a252fd 100644 --- a/packages/ui/src/components/icons/Check.svelte +++ b/packages/ui/src/components/icons/Check.svelte @@ -15,13 +15,10 @@ --> - - - - - + + + diff --git a/packages/ui/src/components/icons/Close.svelte b/packages/ui/src/components/icons/Close.svelte index 1062c75201..1897290eed 100644 --- a/packages/ui/src/components/icons/Close.svelte +++ b/packages/ui/src/components/icons/Close.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/icons/Comments.svelte b/packages/ui/src/components/icons/Comments.svelte index a2f48206dd..08424fd787 100755 --- a/packages/ui/src/components/icons/Comments.svelte +++ b/packages/ui/src/components/icons/Comments.svelte @@ -1,15 +1,10 @@ - - - - - - - - - + + + + + diff --git a/packages/ui/src/components/icons/Down.svelte b/packages/ui/src/components/icons/Down.svelte index feb40df776..fb90dc8ff0 100644 --- a/packages/ui/src/components/icons/Down.svelte +++ b/packages/ui/src/components/icons/Down.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/icons/Forward.svelte b/packages/ui/src/components/icons/Forward.svelte index 072b8d8e44..fd1e9c4357 100644 --- a/packages/ui/src/components/icons/Forward.svelte +++ b/packages/ui/src/components/icons/Forward.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/icons/Search.svelte b/packages/ui/src/components/icons/Search.svelte index c9275c19b6..d7481673f5 100644 --- a/packages/ui/src/components/icons/Search.svelte +++ b/packages/ui/src/components/icons/Search.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/icons/ToDo.svelte b/packages/ui/src/components/icons/ToDo.svelte index deff343f3c..aba36a1896 100644 --- a/packages/ui/src/components/icons/ToDo.svelte +++ b/packages/ui/src/components/icons/ToDo.svelte @@ -1,14 +1,11 @@ - - - - - - - - + + + + + + diff --git a/packages/ui/src/components/icons/Up.svelte b/packages/ui/src/components/icons/Up.svelte index a48dadb0c5..ca292b277d 100644 --- a/packages/ui/src/components/icons/Up.svelte +++ b/packages/ui/src/components/icons/Up.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/internal/Root.svelte b/packages/ui/src/components/internal/Root.svelte index 72cab4b6a6..7f07da7c33 100644 --- a/packages/ui/src/components/internal/Root.svelte +++ b/packages/ui/src/components/internal/Root.svelte @@ -79,6 +79,7 @@ min-height: $status-bar-height; min-width: 1200px; font-size: 12px; + line-height: 150%; .status-info { flex-grow: 1; diff --git a/packages/ui/src/components/internal/Status.svelte b/packages/ui/src/components/internal/Status.svelte index 07f09a091c..9d5e547dcf 100644 --- a/packages/ui/src/components/internal/Status.svelte +++ b/packages/ui/src/components/internal/Status.svelte @@ -3,29 +3,24 @@ import { Severity } from '@anticrm/platform' import Info from './icons/Info.svelte' - import InfoOld from './icons/InfoOld.svelte' import Label from '../Label.svelte' export let status: Status -
+
{#if status.severity !== Severity.OK} - - - - + + {/if}
\ No newline at end of file diff --git a/packages/ui/src/components/internal/icons/Close.svelte b/packages/ui/src/components/internal/icons/Close.svelte index b4ed4448ed..91609f52c2 100644 --- a/packages/ui/src/components/internal/icons/Close.svelte +++ b/packages/ui/src/components/internal/icons/Close.svelte @@ -15,13 +15,10 @@ --> - - - - - + + + diff --git a/packages/ui/src/components/internal/icons/FontSize.svelte b/packages/ui/src/components/internal/icons/FontSize.svelte index 46e424b5ca..25f1a48b7f 100644 --- a/packages/ui/src/components/internal/icons/FontSize.svelte +++ b/packages/ui/src/components/internal/icons/FontSize.svelte @@ -1,14 +1,11 @@ - - - - - - - - + + + + + + diff --git a/packages/ui/src/components/internal/icons/Info.svelte b/packages/ui/src/components/internal/icons/Info.svelte index 91f374b715..01f6931d20 100644 --- a/packages/ui/src/components/internal/icons/Info.svelte +++ b/packages/ui/src/components/internal/icons/Info.svelte @@ -19,7 +19,7 @@ - - - + + + diff --git a/packages/ui/src/components/internal/icons/InfoOld.svelte b/packages/ui/src/components/internal/icons/InfoOld.svelte deleted file mode 100644 index 92cb549ab8..0000000000 --- a/packages/ui/src/components/internal/icons/InfoOld.svelte +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - diff --git a/packages/ui/src/components/internal/icons/Mute.svelte b/packages/ui/src/components/internal/icons/Mute.svelte index 3056d0d3f6..dc58a8907c 100644 --- a/packages/ui/src/components/internal/icons/Mute.svelte +++ b/packages/ui/src/components/internal/icons/Mute.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/packages/ui/src/components/internal/icons/WiFi.svelte b/packages/ui/src/components/internal/icons/WiFi.svelte index ae2a86cf47..6e2480245d 100644 --- a/packages/ui/src/components/internal/icons/WiFi.svelte +++ b/packages/ui/src/components/internal/icons/WiFi.svelte @@ -1,15 +1,12 @@ - - - - - - - - - + + + + + + + diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts index e9e0b058c3..2b32b270ac 100644 --- a/packages/ui/src/index.ts +++ b/packages/ui/src/index.ts @@ -47,7 +47,6 @@ export { default as Grid } from './components/Grid.svelte' export { default as Row } from './components/Row.svelte' export { default as CheckBoxWithLabel } from './components/CheckBoxWithLabel.svelte' export { default as CheckBoxList } from './components/CheckBoxList.svelte' -export { default as IconSize } from './components/IconSize.svelte' export { default as EditWithIcon } from './components/EditWithIcon.svelte' export { default as Loading } from './components/Loading.svelte' export { default as Popup } from './components/Popup.svelte' diff --git a/plugins/chunter-resources/src/components/icons/Bookmark.svelte b/plugins/chunter-resources/src/components/icons/Bookmark.svelte index 8b8eed3ebd..2c811dc3b8 100644 --- a/plugins/chunter-resources/src/components/icons/Bookmark.svelte +++ b/plugins/chunter-resources/src/components/icons/Bookmark.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/chunter-resources/src/components/icons/Check.svelte b/plugins/chunter-resources/src/components/icons/Check.svelte index 19978b1486..ff5e330aaf 100644 --- a/plugins/chunter-resources/src/components/icons/Check.svelte +++ b/plugins/chunter-resources/src/components/icons/Check.svelte @@ -1,11 +1,8 @@ - - - - - - + + + + diff --git a/plugins/chunter-resources/src/components/icons/Close.svelte b/plugins/chunter-resources/src/components/icons/Close.svelte index 57ac05a9a6..39be939ee6 100644 --- a/plugins/chunter-resources/src/components/icons/Close.svelte +++ b/plugins/chunter-resources/src/components/icons/Close.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/chunter-resources/src/components/icons/Emoji.svelte b/plugins/chunter-resources/src/components/icons/Emoji.svelte index 285ab3bd47..87a32291bd 100644 --- a/plugins/chunter-resources/src/components/icons/Emoji.svelte +++ b/plugins/chunter-resources/src/components/icons/Emoji.svelte @@ -15,13 +15,10 @@ --> - - - - - + + + diff --git a/plugins/chunter-resources/src/components/icons/Heart.svelte b/plugins/chunter-resources/src/components/icons/Heart.svelte index f8b53a7ca5..dd712837ab 100644 --- a/plugins/chunter-resources/src/components/icons/Heart.svelte +++ b/plugins/chunter-resources/src/components/icons/Heart.svelte @@ -1,10 +1,7 @@ - - - - - + + + diff --git a/plugins/chunter-resources/src/components/icons/MoreH.svelte b/plugins/chunter-resources/src/components/icons/MoreH.svelte index bc50d04a8b..0c821baa97 100644 --- a/plugins/chunter-resources/src/components/icons/MoreH.svelte +++ b/plugins/chunter-resources/src/components/icons/MoreH.svelte @@ -1,13 +1,10 @@ - - - - - - - + + + + + diff --git a/plugins/chunter-resources/src/components/icons/Share.svelte b/plugins/chunter-resources/src/components/icons/Share.svelte index 6056184d33..92e7ee3df0 100644 --- a/plugins/chunter-resources/src/components/icons/Share.svelte +++ b/plugins/chunter-resources/src/components/icons/Share.svelte @@ -1,12 +1,9 @@ - - - - - - + + + + diff --git a/plugins/recruit-resources/src/components/icons/Address.svelte b/plugins/recruit-resources/src/components/icons/Address.svelte index f458f76d9c..136db5bc75 100644 --- a/plugins/recruit-resources/src/components/icons/Address.svelte +++ b/plugins/recruit-resources/src/components/icons/Address.svelte @@ -15,13 +15,10 @@ --> - - - - - + + + diff --git a/plugins/recruit-resources/src/components/icons/Attachment.svelte b/plugins/recruit-resources/src/components/icons/Attachment.svelte index 3e74bc4dd7..2f729737ec 100644 --- a/plugins/recruit-resources/src/components/icons/Attachment.svelte +++ b/plugins/recruit-resources/src/components/icons/Attachment.svelte @@ -15,13 +15,10 @@ --> - - - - - + + + diff --git a/plugins/recruit-resources/src/components/icons/File.svelte b/plugins/recruit-resources/src/components/icons/File.svelte index b0ad282350..d3584f6040 100644 --- a/plugins/recruit-resources/src/components/icons/File.svelte +++ b/plugins/recruit-resources/src/components/icons/File.svelte @@ -15,13 +15,10 @@ --> - - - - - + + + diff --git a/plugins/recruit-resources/src/components/icons/Mail.svelte b/plugins/recruit-resources/src/components/icons/Mail.svelte index 0da0365952..1431ce6b47 100644 --- a/plugins/recruit-resources/src/components/icons/Mail.svelte +++ b/plugins/recruit-resources/src/components/icons/Mail.svelte @@ -15,13 +15,10 @@ --> - - - - - + + + diff --git a/plugins/recruit-resources/src/components/icons/MoreH.svelte b/plugins/recruit-resources/src/components/icons/MoreH.svelte index 9e280b549a..4acd9cd326 100644 --- a/plugins/recruit-resources/src/components/icons/MoreH.svelte +++ b/plugins/recruit-resources/src/components/icons/MoreH.svelte @@ -1,13 +1,10 @@ - - - - - - - + + + + + diff --git a/plugins/recruit-resources/src/components/icons/Recruiting.svelte b/plugins/recruit-resources/src/components/icons/Recruiting.svelte index 510a21d1bb..ebe4157740 100644 --- a/plugins/recruit-resources/src/components/icons/Recruiting.svelte +++ b/plugins/recruit-resources/src/components/icons/Recruiting.svelte @@ -15,18 +15,15 @@ --> - - - - - - - - - - + + + + + + + + diff --git a/plugins/task-resources/src/components/icons/File.svelte b/plugins/task-resources/src/components/icons/File.svelte index b0ad282350..d3584f6040 100644 --- a/plugins/task-resources/src/components/icons/File.svelte +++ b/plugins/task-resources/src/components/icons/File.svelte @@ -15,13 +15,10 @@ --> - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Add.svelte b/plugins/workbench-resources/src/components/icons/Add.svelte index 756fca1519..d5a5a70dff 100644 --- a/plugins/workbench-resources/src/components/icons/Add.svelte +++ b/plugins/workbench-resources/src/components/icons/Add.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Close.svelte b/plugins/workbench-resources/src/components/icons/Close.svelte index 058a1c577e..74a431334b 100644 --- a/plugins/workbench-resources/src/components/icons/Close.svelte +++ b/plugins/workbench-resources/src/components/icons/Close.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Collapsed.svelte b/plugins/workbench-resources/src/components/icons/Collapsed.svelte index e237e48076..10b8b5f4dd 100644 --- a/plugins/workbench-resources/src/components/icons/Collapsed.svelte +++ b/plugins/workbench-resources/src/components/icons/Collapsed.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Down.svelte b/plugins/workbench-resources/src/components/icons/Down.svelte index 404e6bdc19..404c14a9d3 100644 --- a/plugins/workbench-resources/src/components/icons/Down.svelte +++ b/plugins/workbench-resources/src/components/icons/Down.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Expanded.svelte b/plugins/workbench-resources/src/components/icons/Expanded.svelte index 74cec8c413..beabe50e15 100644 --- a/plugins/workbench-resources/src/components/icons/Expanded.svelte +++ b/plugins/workbench-resources/src/components/icons/Expanded.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/FullRight.svelte b/plugins/workbench-resources/src/components/icons/FullRight.svelte index ec5cce4127..49f6fe13e2 100644 --- a/plugins/workbench-resources/src/components/icons/FullRight.svelte +++ b/plugins/workbench-resources/src/components/icons/FullRight.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Home.svelte b/plugins/workbench-resources/src/components/icons/Home.svelte index 661c0c159b..21df5139bb 100644 --- a/plugins/workbench-resources/src/components/icons/Home.svelte +++ b/plugins/workbench-resources/src/components/icons/Home.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Lock.svelte b/plugins/workbench-resources/src/components/icons/Lock.svelte index f3ecceb8c7..39881b2288 100644 --- a/plugins/workbench-resources/src/components/icons/Lock.svelte +++ b/plugins/workbench-resources/src/components/icons/Lock.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Mention.svelte b/plugins/workbench-resources/src/components/icons/Mention.svelte index 7e333be74d..4ddc225692 100644 --- a/plugins/workbench-resources/src/components/icons/Mention.svelte +++ b/plugins/workbench-resources/src/components/icons/Mention.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/MoreH.svelte b/plugins/workbench-resources/src/components/icons/MoreH.svelte index bc50d04a8b..0c821baa97 100644 --- a/plugins/workbench-resources/src/components/icons/MoreH.svelte +++ b/plugins/workbench-resources/src/components/icons/MoreH.svelte @@ -1,13 +1,10 @@ - - - - - - - + + + + + diff --git a/plugins/workbench-resources/src/components/icons/Search.svelte b/plugins/workbench-resources/src/components/icons/Search.svelte index 3db2d1322e..b29da26d5e 100644 --- a/plugins/workbench-resources/src/components/icons/Search.svelte +++ b/plugins/workbench-resources/src/components/icons/Search.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Star.svelte b/plugins/workbench-resources/src/components/icons/Star.svelte index 402a82d5b7..8e2a1a0322 100644 --- a/plugins/workbench-resources/src/components/icons/Star.svelte +++ b/plugins/workbench-resources/src/components/icons/Star.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/Thread.svelte b/plugins/workbench-resources/src/components/icons/Thread.svelte index 88ab4a66eb..5a97bd964b 100644 --- a/plugins/workbench-resources/src/components/icons/Thread.svelte +++ b/plugins/workbench-resources/src/components/icons/Thread.svelte @@ -1,14 +1,11 @@ - - - - - - - - + + + + + + diff --git a/plugins/workbench-resources/src/components/icons/Up.svelte b/plugins/workbench-resources/src/components/icons/Up.svelte index 67211b045b..480ed29b9e 100644 --- a/plugins/workbench-resources/src/components/icons/Up.svelte +++ b/plugins/workbench-resources/src/components/icons/Up.svelte @@ -1,11 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/VCard.svelte b/plugins/workbench-resources/src/components/icons/VCard.svelte index 9ac6d3ebe7..5128c9aa57 100644 --- a/plugins/workbench-resources/src/components/icons/VCard.svelte +++ b/plugins/workbench-resources/src/components/icons/VCard.svelte @@ -1,21 +1,18 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/plugins/workbench-resources/src/components/icons/VKanban.svelte b/plugins/workbench-resources/src/components/icons/VKanban.svelte index 616a810c3a..445e78a8ce 100644 --- a/plugins/workbench-resources/src/components/icons/VKanban.svelte +++ b/plugins/workbench-resources/src/components/icons/VKanban.svelte @@ -1,13 +1,8 @@ - - - - - + + + diff --git a/plugins/workbench-resources/src/components/icons/VList.svelte b/plugins/workbench-resources/src/components/icons/VList.svelte index fb234969d5..19a30b7b80 100644 --- a/plugins/workbench-resources/src/components/icons/VList.svelte +++ b/plugins/workbench-resources/src/components/icons/VList.svelte @@ -1,15 +1,12 @@ - - - - - - - - - + + + + + + +