Merge branch 'challenge-2' into development
Showing
- scipost/static/scipost/assets/config/preconfig.scss 3 additions, 0 deletionsscipost/static/scipost/assets/config/preconfig.scss
- scipost/static/scipost/assets/css/_general.scss 24 additions, 1 deletionscipost/static/scipost/assets/css/_general.scss
- scipost/static/scipost/assets/css/_grid.scss 16 additions, 2 deletionsscipost/static/scipost/assets/css/_grid.scss
- scipost/static/scipost/assets/css/_navbar.scss 116 additions, 27 deletionsscipost/static/scipost/assets/css/_navbar.scss
- scipost/static/scipost/assets/js/scripts.js 9 additions, 0 deletionsscipost/static/scipost/assets/js/scripts.js
- scipost/templates/scipost/FAQ.html 5 additions, 11 deletionsscipost/templates/scipost/FAQ.html
- scipost/templates/scipost/about.html 7 additions, 1 deletionscipost/templates/scipost/about.html
- scipost/templates/scipost/bare_base.html 2 additions, 0 deletionsscipost/templates/scipost/bare_base.html
- scipost/templates/scipost/base_about.html 15 additions, 0 deletionsscipost/templates/scipost/base_about.html
- scipost/templates/scipost/footer.html 57 additions, 13 deletionsscipost/templates/scipost/footer.html
- scipost/templates/scipost/foundation.html 6 additions, 12 deletionsscipost/templates/scipost/foundation.html
- scipost/templates/scipost/index_sidebar_2.html 0 additions, 38 deletionsscipost/templates/scipost/index_sidebar_2.html
- scipost/templates/scipost/navbar.html 178 additions, 54 deletionsscipost/templates/scipost/navbar.html
Loading
Please register or sign in to comment