Commit Graph

758 Commits

Author SHA1 Message Date
Timofey
6d88c4c90a Web:Common:Components: fix navigation crash in common folder 2022-02-08 15:25:36 +08:00
Timofey
2e72853ead Web:Common:Navigation: add support dark-theme 2022-02-07 23:35:09 +08:00
Timofey
0bf9116f91 Web:Common:PageLayout: set catalog height on mobile devices 2022-02-07 22:27:05 +08:00
Timofey
2b23aae93f Web:Common:PageLayout: fix margin-top on mobile devices for catalog 2022-02-07 21:30:31 +08:00
Timofey
951002ca07 Web:Common:Components: fix floating button background color for both themes and add center align for svg 2022-02-07 17:56:31 +08:00
Timofey
e0ba6ebcb1 Web:Common:Components: delete top css property for catalog 2022-02-04 23:24:39 +08:00
Timofey
1c80398617 Web:Common:Catalog: refactoring catalog components and add support dark-theme 2022-02-04 21:21:30 +08:00
Timofey
bd8d8180f9 Web: fixed code format 2022-02-03 23:34:19 +08:00
Timofey
223c04a3c7 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-03 20:59:26 +08:00
Timofey
20b4a691dd Web:Common:Components: enable floating buttons with secondary and primary progress on desktop 2022-02-03 16:34:47 +08:00
Timofey
918b138f92 Web:Common:Components: add clear trash button 2022-02-03 16:06:36 +08:00
Timofey
7086d0cc50 Web:Common:Navigation: change drop box width on tablet devices 2022-02-02 23:04:41 +08:00
Timofey
512885373d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-02 19:35:42 +08:00
Timofey
cfe493839b Merge branch 'feature/navigation' into feature/virtual-rooms-1.2 2022-02-02 19:34:33 +08:00
Timofey
7c61e54a7b Web:Common:Components: refactoring navigation component 2022-02-02 19:24:35 +08:00
Timofey
427b10142c Merge branch 'develop' into feature/navigation 2022-02-02 17:31:53 +08:00
Timofey
f6090b4f58 Merge branch 'feature/navigation' into feature/virtual-rooms-1.2 2022-02-01 18:44:49 +08:00
Timofey
2870da6271 Web:Common:Components: fixed top and left position for navigation drop-box 2022-02-01 18:37:44 +08:00
Timofey
46afa9b16c Merge branch 'develop' into feature/navigation 2022-02-01 16:45:30 +08:00
Timofey
cf3d4c71e3 Merge branch 'devlop' into branch feature/catalog 2022-01-31 23:52:52 +08:00
Timofey
91f0213c51 Web:Common:Components: disable floating button on mobile and tablet devices 2022-01-31 23:46:41 +08:00
Timofey
95353b1b4e Web:Common:Components: disable floating button on mobile devices 2022-01-31 21:40:43 +08:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08:00
Timofey
18ed20569d Web:Editor: wrap editor in theme provider and delete theme as props in components 2022-01-27 21:54:58 +08:00
Timofey
4b45eaa243 Merge branch 'develop' into feature/dark-theme 2022-01-27 18:10:13 +08:00
Timofey
f3a8ecc1ab Web:Common:FloatingButton: added 2px padding from the edge for the loading bar 2022-01-27 17:16:19 +08:00
Timofey
293de829bd Web:Files:Catalog: add main button mobile on mobile and tablet devices 2022-01-27 17:13:49 +08:00
Timofey
f955bea115 Web:Client:Components: fixed product name color for dark and base theme 2022-01-25 16:32:35 +08:00
Timofey
55fe7bd155 Web:Common:PageLayout: fixed background and fill color for section toggler in dark theme 2022-01-25 16:17:12 +08:00
Timofey
72c5c93737 Web: add theme support from props 2022-01-24 23:27:24 +08:00
Timofey
4dd1237974 Web:Common:ErrorContainer: add change theme in index.js and fixed height to 100vh 2022-01-24 20:03:19 +08:00
Timofey
57f5caba85 Web:Common:ErrorContainer: add support dark-theme 2022-01-24 18:48:24 +08:00
Timofey
d83808142a Web:Common:Loaders: add support dark-theme for tile loader 2022-01-21 22:40:29 +08:00
Dmitry Kulak
b740a4d00a Merge branch 'develop' into feature/redesign-tiles
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Server/DocStore
2022-01-21 16:47:39 +03:00
Timofey
f5ae02dfc9 Merge branch 'develop' into feature/catalog 2022-01-21 21:06:40 +08:00
Timofey
47974e378f Merge branch 'develop' into feature/dark-theme 2022-01-21 19:31:48 +08:00
Timofey
cfb4818b1e Web:Common:FloationgButton: add props variable 2022-01-20 23:46:46 +08:00
Timofey
84aabef8e7 Web:Common: update dark theme after merge branch 'develop' 2022-01-20 23:45:33 +08:00
Timofey
4598d238e5 Web:Components: update dark theme after merge branch 'develop' 2022-01-20 23:29:09 +08:00
Timofey
e5f06b932d Merge branch 'develop' into feature/dark-theme 2022-01-20 21:18:30 +08:00
99105f5d73 Merge branch 'develop' into component-tooltips
# Conflicts:
#	packages/asc-web-components/icon-button/index.js
#	products/ASC.Files/Client/public/locales/de/Article.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/en/Article.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/fr/Article.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/Article.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/pt-BR/Article.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Article.json
#	products/ASC.Files/Client/public/locales/ro/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Article.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/sk/Article.json
#	products/ASC.Files/Client/public/locales/sk/Translations.json
2022-01-20 15:45:24 +03:00
6c72436a03
Merge branch 'develop' into feature/mobile-main-button 2022-01-20 14:25:05 +03:00
Dmitry Kulak
5098ea1079 Web: Files: Tiles: Loaders: Fixed number of loaders on smartphones 2022-01-19 11:34:32 +03:00
Dmitry Kulak
e014ff614e Web: Files: Tiles: Loaders aligned with content, fixes 2021-12-30 10:55:16 +03:00
441d8875ba Web:Common:Store: change default theme 2021-12-29 23:14:21 +08:00
Dmitry Kulak
b5bcf38456 Merge remote-tracking branch 'origin/develop' into feature/redesign-tiles 2021-12-29 15:48:41 +03:00
0ad204743f Merge branch 'develop' into feature/dark-theme 2021-12-29 20:25:29 +08:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
f129a98d93 Web:Common:Store: add array for available themes 2021-12-28 21:35:47 +08:00
2140ccff0b Web:Client: add the ability to get default theme from browser theme and save it in local storage 2021-12-28 19:01:03 +08:00