Commit Graph

184 Commits

Author SHA1 Message Date
b1dc7087c2 Web: Components: Themes: add icon fill 2022-04-05 13:28:44 +03:00
a3bdebfe90
Merge pull request #495 from ONLYOFFICE/hotfix/campaigns-banner
Hotfix/campaigns banner
2022-04-01 18:13:14 +03:00
Timofey Boyko
d30c565ca4 Web:Components:Themes: change padding for context-menu-button of row view 2022-04-01 12:40:51 +03:00
57b3e60ac5 Web: Components: Submenu: add theme 2022-03-30 21:14:53 +03:00
Timofey Boyko
b91f5deb68 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-30 11:18:19 +03:00
Timofey Boyko
e5f3d27eb9 Web:Common:Section: add support dark-theme for section-header with scroll 2022-03-30 11:17:43 +03:00
75bd270037 Web: Files: Fix thumbnails: increased size and replaced 'resize' to real size 2022-03-29 22:03:11 +03:00
f05dadf17c Web: Components: Avatar: substitute default image 2022-03-29 11:20:57 +03:00
Timofey Boyko
822abd7a08 Web:Components:Themes: fix border image source width for table container header and fix section width 2022-03-28 18:15:29 +03:00
Timofey Boyko
d2e192d048 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-28 11:15:47 +03:00
Timofey Boyko
2e1055c1f6 Web:Components:Themes: change hover color of tabs container in base theme 2022-03-28 11:15:24 +03:00
35114d973d Web: Components: Themes: add colors for downloadAppList 2022-03-26 13:58:50 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
33ae3ba6c5 Web: Components: Themes: add personal logo color 2022-03-22 17:59:45 +03:00
a2ad2b450f Web: Components: CampaignsBanner: fix style 2022-03-22 17:43:28 +03:00
a0f0f8bffc Web: Components: Themes: fix arrow color 2022-03-22 12:30:21 +03:00
b76d091e9d Web: Components: Themes: fix floatingButton theme 2022-03-21 18:33:45 +03:00
Timofey Boyko
8355fa388d Web:Common: remove old filter component, update import and change themes 2022-03-21 13:56:42 +03:00
836a2180ba Web: Components: Fixed styles. 2022-03-18 12:11:43 +03:00
9efaef5d45 Web: Components: fix tooltip shadow 2022-03-17 11:12:15 +03:00
b07aeae206 Web: Components: fix tooltip padding 2022-03-17 10:47:24 +03:00
c001de8f74 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-16 13:03:29 +03:00
9056b14453 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-16 12:11:48 +03:00
5bebc14b58 Web: Components: fix social buttons theme 2022-03-16 11:44:03 +03:00
50c8920bb6 Web:Components:Changed the margin of the fieldContainer for base theme. Changed fillColor of arrow in comboBox for base theme. 2022-03-16 11:21:36 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
mushka
57f75cd8a5 merge with feature/virtual-rooms-1.2 2022-03-14 18:53:15 +03:00
mushka
7537292369 fixed padding-forced vertical discentering bug 2022-03-14 18:28:46 +03:00
mushka
546f7bc4a7 fixed horizontal alignment bugs 2022-03-11 17:21:52 +03:00
mushka
588ce13e08 deleted commented visual intends 2022-03-11 14:18:11 +03:00
mushka
25ad35ab6a added Normal Touchscreen/Desktop differentiation 2022-03-11 13:41:48 +03:00
mushka
0d2c626445 design tweaks 2022-03-10 15:35:26 +03:00
mushka
959c8f1e99 redesigned buttons 2022-03-10 15:14:08 +03:00
f401926098 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-09 11:56:03 +03:00
Timofey Boyko
98ac515760 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-05 18:51:07 +03:00
Timofey Boyko
e273391c00 Web:Files:Section: add theme support for desktop sort button in tile view 2022-03-05 18:51:00 +03:00
84810de125 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-components/context-menu/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
2022-03-05 17:52:01 +03:00
Timofey Boyko
d85ae13b7a Web:Files: fix table view in dark-theme 2022-03-05 17:47:56 +03:00
250eeaaa60 Web: Components: fixed slider margin 2022-03-04 18:54:14 +05:00
Timofey
19937f50dd Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-01 22:05:41 +08:00
f3afd79a3f Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
#	packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
#	packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
#	packages/asc-web-common/components/PageLayout/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/context-menu/styled-context-menu.js
#	packages/asc-web-components/drop-down/index.js
#	packages/asc-web-components/link-with-dropdown/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/themes/dark.js
#	products/ASC.Files/Client/public/images/files.menu.svg
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/QuickButtons.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.People/Client/public/images/people.menu.svg
#	products/ASC.People/Client/src/components/GroupSelector/index.js
#	products/ASC.People/Client/src/components/PeopleSelector/index.js
#	products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
#	products/ASC.People/Client/src/pages/Home/index.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
2022-03-01 13:50:26 +03:00
Timofey
337497c5d5 Web:Common: add circle indicator if filter is active 2022-02-24 16:36:59 +08:00
32868de412 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	public/locales/de/Common.json
2022-02-22 13:53:00 +03:00
Timofey
aa91c011d8 Web:Common: refactoring new filter input and add support group selector 2022-02-22 17:10:13 +08:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
Timofey
1a386a8adf Web:Common:Components: add support dark-theme for new filter input 2022-02-21 19:55:06 +08:00
Timofey
767f17b92c Web:Components:DropDown: add border at dark-theme 2022-02-09 15:36:18 +08:00
Timofey
bdb587199b Web:Studio: add support dark-theme for top arrow in profile menu 2022-02-08 17:52:22 +08:00
Timofey
972b315f45 Web:Components:NewContextMenu: add support dark-theme 2022-02-08 00:05:55 +08:00
Timofey
2e72853ead Web:Common:Navigation: add support dark-theme 2022-02-07 23:35:09 +08:00