Commit Graph

10 Commits

Author SHA1 Message Date
1083fd8416 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
Artem Tarasov
d73bb73dab Web: Components: rewrited component SwitchButton to ViewSelector 2021-06-29 15:27:46 +03:00
b7ce849e32 Web: Components: Theme: Fixed line height for ComboBox component 2021-06-18 09:57:02 +03:00
Artem Tarasov
ee4760e899 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-11 18:30:44 +03:00
7e19a25b0c Web: fixed text styles 2021-05-24 14:30:11 +03:00
Artem Tarasov
1d90de34ec Web: Commponents: added SwitchButton component (from AppComponents) 2021-03-24 16:14:59 +03:00
Artem Tarasov
dabf704485 Web: Client/Components: Wizard: layout fix 2021-03-18 22:55:15 +03:00
TatianaLopaeva
131de36293 Web: Components: combobox: Fixed styles of icon. 2021-03-18 13:45:22 +03:00
Artem Tarasov
460b34a1a8 Web: Components: added themes for storybook 2021-03-14 21:10:16 +03:00
Artem Tarasov
5f2d0e4616 Web: Components: changed component hierarchy 2021-02-24 17:42:09 +03:00