stylings for basket page
Merge branch 'master' into feature/more-tree-view

Conflicts:
	assets/css/ashtag-custom.css