Merge branch 'master' into development
Showing
- journals/templates/journals/journals.html 6 additions, 2 deletionsjournals/templates/journals/journals.html
- journals/views.py 1 addition, 1 deletionjournals/views.py
- news/models.py 1 addition, 0 deletionsnews/models.py
- news/templates/news/news_card_content.html 4 additions, 4 deletionsnews/templates/news/news_card_content.html
- news/templates/news/news_card_content_for_api.html 1 addition, 1 deletionnews/templates/news/news_card_content_for_api.html
- news/templates/news/news_card_content_short.html 1 addition, 1 deletionnews/templates/news/news_card_content_short.html
- scipost/static/scipost/assets/css/_cards.scss 12 additions, 3 deletionsscipost/static/scipost/assets/css/_cards.scss
- scipost/static/scipost/assets/css/_general.scss 7 additions, 0 deletionsscipost/static/scipost/assets/css/_general.scss
- scipost/static/scipost/assets/css/_homepage.scss 0 additions, 4 deletionsscipost/static/scipost/assets/css/_homepage.scss
- scipost/static/scipost/images/doaj_logo_200.jpg 0 additions, 0 deletionsscipost/static/scipost/images/doaj_logo_200.jpg
- scipost/templates/scipost/comments_block.html 1 addition, 1 deletionscipost/templates/scipost/comments_block.html
- scipost/templates/scipost/index.html 32 additions, 4 deletionsscipost/templates/scipost/index.html
- scipost/views.py 4 additions, 4 deletionsscipost/views.py
Loading
Please register or sign in to comment