Merge branch 'staging' into 'project-admin'
# Conflicts: # src/menu-left.pug # src/page-project-profile.pug # src/page-project.pug
Showing
- src/dependencies.pug 1 addition, 0 deletionssrc/dependencies.pug
- src/images/contributions-help.png 0 additions, 0 deletionssrc/images/contributions-help.png
- src/page-admin-circles.pug 2 additions, 2 deletionssrc/page-admin-circles.pug
- src/page-circle-profile.pug 4 additions, 2 deletionssrc/page-circle-profile.pug
- src/page-circle.pug 3 additions, 3 deletionssrc/page-circle.pug
- src/page-project-edit.pug 80 additions, 81 deletionssrc/page-project-edit.pug
- src/page-project-profile.pug 92 additions, 23 deletionssrc/page-project-profile.pug
- src/page-project.pug 33 additions, 10 deletionssrc/page-project.pug
- src/styles/base/form.scss 0 additions, 69 deletionssrc/styles/base/form.scss
- src/styles/base/main.scss 79 additions, 46 deletionssrc/styles/base/main.scss
- src/styles/base/menu-left.scss 45 additions, 17 deletionssrc/styles/base/menu-left.scss
- src/styles/base/user-avatar.scss 0 additions, 29 deletionssrc/styles/base/user-avatar.scss
- src/styles/components/sidebar.scss 2 additions, 2 deletionssrc/styles/components/sidebar.scss
- src/styles/index.scss 3 additions, 2 deletionssrc/styles/index.scss
- src/styles/layout/circle/circle.scss 2 additions, 7 deletionssrc/styles/layout/circle/circle.scss
- src/styles/layout/project-profile/_index.scss 2 additions, 1 deletionsrc/styles/layout/project-profile/_index.scss
- src/styles/layout/project-profile/project-profile.scss 99 additions, 186 deletionssrc/styles/layout/project-profile/project-profile.scss
- src/styles/layout/project-profile/project.scss 8 additions, 0 deletionssrc/styles/layout/project-profile/project.scss
- src/templates/hd-business-provider.pug 6 additions, 0 deletionssrc/templates/hd-business-provider.pug
- src/templates/hd-captain.pug 11 additions, 0 deletionssrc/templates/hd-captain.pug
Loading
Please register or sign in to comment