Merge branch 'staging' into 'parameters-on-sample-for-clients'
# Conflicts: # src/menu-left.pug
No related branches found
No related tags found
Showing
- src/dependencies.pug 2 additions, 1 deletionsrc/dependencies.pug
- src/menu-left.pug 1 addition, 1 deletionsrc/menu-left.pug
- src/page-admin-circles-create.pug 1 addition, 1 deletionsrc/page-admin-circles-create.pug
- src/page-admin-circles.pug 4 additions, 4 deletionssrc/page-admin-circles.pug
- src/page-admin-projects-create.pug 86 additions, 0 deletionssrc/page-admin-projects-create.pug
- src/page-admin-projects.pug 82 additions, 1 deletionsrc/page-admin-projects.pug
- src/page-admin.pug 5 additions, 5 deletionssrc/page-admin.pug
- src/page-circle-edit.pug 2 additions, 2 deletionssrc/page-circle-edit.pug
- src/page-circle-profile.pug 3 additions, 3 deletionssrc/page-circle-profile.pug
- src/page-project-create.pug 0 additions, 30 deletionssrc/page-project-create.pug
- src/page-project-drive.pug 0 additions, 11 deletionssrc/page-project-drive.pug
- src/page-project.pug 1 addition, 6 deletionssrc/page-project.pug
- src/styles/base/form.scss 6 additions, 2 deletionssrc/styles/base/form.scss
- src/styles/base/main.scss 22 additions, 1 deletionsrc/styles/base/main.scss
- src/styles/base/menu-left.scss 46 additions, 32 deletionssrc/styles/base/menu-left.scss
- src/styles/base/table.scss 193 additions, 0 deletionssrc/styles/base/table.scss
- src/styles/components/sidebar.scss 5 additions, 1 deletionsrc/styles/components/sidebar.scss
- src/styles/layout/circle/_index.scss 0 additions, 1 deletionsrc/styles/layout/circle/_index.scss
- src/styles/layout/circle/admin-circle-create.scss 0 additions, 13 deletionssrc/styles/layout/circle/admin-circle-create.scss
- src/styles/layout/circle/circle.scss 15 additions, 10 deletionssrc/styles/layout/circle/circle.scss
Loading
Please register or sign in to comment