Merge branch 'staging' into 'project-admin'
# Conflicts: # src/menu-left.pug # src/page-circle-profile.pug
No related branches found
No related tags found
Showing
- src/menu-left.pug 3 additions, 1 deletionsrc/menu-left.pug
- src/page-project-profile.pug 4 additions, 3 deletionssrc/page-project-profile.pug
- src/styles/base/menu-left.scss 9 additions, 1 deletionsrc/styles/base/menu-left.scss
- src/styles/components/_index.scss 1 addition, 1 deletionsrc/styles/components/_index.scss
- src/styles/components/tags.scss 19 additions, 0 deletionssrc/styles/components/tags.scss
- src/styles/components/user-role.scss 0 additions, 9 deletionssrc/styles/components/user-role.scss
- src/styles/layout/circle/circle-edit.scss 1 addition, 1 deletionsrc/styles/layout/circle/circle-edit.scss
- src/styles/layout/circle/circle-profile.scss 73 additions, 75 deletionssrc/styles/layout/circle/circle-profile.scss
- src/styles/layout/circle/circle.scss 1 addition, 1 deletionsrc/styles/layout/circle/circle.scss
- src/styles/layout/job-offers/job-offers.scss 1 addition, 1 deletionsrc/styles/layout/job-offers/job-offers.scss
- src/styles/layout/members/members.scss 1 addition, 1 deletionsrc/styles/layout/members/members.scss
- src/styles/layout/project-profile/project-profile.scss 21 additions, 4 deletionssrc/styles/layout/project-profile/project-profile.scss
- src/styles/layout/user/user-profile.scss 1 addition, 1 deletionsrc/styles/layout/user/user-profile.scss
- src/templates/hd-captain.pug 7 additions, 1 deletionsrc/templates/hd-captain.pug
- src/templates/hd-circle-team.pug 14 additions, 5 deletionssrc/templates/hd-circle-team.pug
- src/templates/hd-project-team.pug 20 additions, 0 deletionssrc/templates/hd-project-team.pug
Loading
Please register or sign in to comment