Merge branch 'experimental' into jorran/wip (3fd9d99f) · Commits · SciPost / SciPost · GitLab

SciPost Code Repository

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SciPost
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3fd9d99f

Commit 3fd9d99f authored 8 years ago by Jorran de Wit

Downloads
- Plain Diff

Merge branch 'experimental' into jorran/wip

parents 75c9b2e2 fa64aa71

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.bootstraprc 10 additions, 10 deletions

.bootstraprc
SciPost_v1/settings/staging_release.py 0 additions, 4 deletions

SciPost_v1/settings/staging_release.py
journals/models.py 13 additions, 5 deletions

journals/models.py
journals/templates/journals/_publication_single_short_summary.html 3 additions, 0 deletions

...templates/journals/_publication_single_short_summary.html
news/models.py 1 addition, 1 deletion

news/models.py
scipost/static/scipost/assets/config/preconfig.scss 15 additions, 0 deletions

scipost/static/scipost/assets/config/preconfig.scss
scipost/static/scipost/assets/css/_cards.scss 7 additions, 0 deletions

scipost/static/scipost/assets/css/_cards.scss
scipost/static/scipost/assets/css/_journals.scss 7 additions, 1 deletion

scipost/static/scipost/assets/css/_journals.scss
scipost/static/scipost/assets/css/style.scss 1 addition, 0 deletions

scipost/static/scipost/assets/css/style.scss
scipost/templates/scipost/index.html 99 additions, 83 deletions

scipost/templates/scipost/index.html
scipost/views.py 8 additions, 10 deletions

scipost/views.py

with 164 additions and 114 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

SciPost Code Repository