-
- Downloads
Merge branch 'feature/pirati-cz' into feature/pirati-cz-dan
# Conflicts: # main/blocks.py
No related branches found
No related tags found
Showing
- main/blocks.py 29 additions, 6 deletionsmain/blocks.py
- main/migrations/0018_alter_maincontactpage_contact_boxes.py 20 additions, 0 deletionsmain/migrations/0018_alter_maincontactpage_contact_boxes.py
- main/migrations/0019_alter_maincontactpage_text.py 20 additions, 0 deletionsmain/migrations/0019_alter_maincontactpage_text.py
- main/migrations/0020_alter_mainhomepage_content.py 21 additions, 0 deletionsmain/migrations/0020_alter_mainhomepage_content.py
- main/migrations/0021_alter_maincontactpage_contact_boxes.py 21 additions, 0 deletionsmain/migrations/0021_alter_maincontactpage_contact_boxes.py
- main/migrations/0022_alter_mainarticlepage_region.py 18 additions, 0 deletionsmain/migrations/0022_alter_mainarticlepage_region.py
- main/migrations/0023_alter_mainprogrampage_program.py 21 additions, 0 deletionsmain/migrations/0023_alter_mainprogrampage_program.py
- main/models.py 9 additions, 10 deletionsmain/models.py
- main/styleguide/source/_patterns/atoms/form-fields/form-checkbox.mustache 2 additions, 2 deletions...source/_patterns/atoms/form-fields/form-checkbox.mustache
- main/styleguide/source/_patterns/atoms/form-fields/form-input.mustache 1 addition, 1 deletion...de/source/_patterns/atoms/form-fields/form-input.mustache
- main/styleguide/source/_patterns/molecules/footer/footer-person-contact.mustache 20 additions, 0 deletions..._patterns/molecules/footer/footer-person-contact.mustache
- main/styleguide/source/_patterns/organisms/footer.mustache 156 additions, 220 deletionsmain/styleguide/source/_patterns/organisms/footer.mustache
- main/styleguide/source/_patterns/organisms/newsletter-section.mustache 13 additions, 15 deletions...de/source/_patterns/organisms/newsletter-section.mustache
- main/styleguide/source/_patterns/templates/person.mustache 2 additions, 2 deletionsmain/styleguide/source/_patterns/templates/person.mustache
- main/styleguide/source/css/atoms/container.pcss 9 additions, 1 deletionmain/styleguide/source/css/atoms/container.pcss
- main/styleguide/source/css/molecules/carousels.pcss 4 additions, 2 deletionsmain/styleguide/source/css/molecules/carousels.pcss
- main/styleguide/source/css/organisms/footer.pcss 44 additions, 6 deletionsmain/styleguide/source/css/organisms/footer.pcss
- main/styleguide/source/images/background-images/bg-bartos-newsletter.jpg 0 additions, 0 deletions.../source/images/background-images/bg-bartos-newsletter.jpg
- main/styleguide/source/js/components/TwitterCarousel.vue 12 additions, 1 deletionmain/styleguide/source/js/components/TwitterCarousel.vue
- main/styleguide/source/js/components/footer/FooterCollapsible.vue 1 addition, 1 deletion...leguide/source/js/components/footer/FooterCollapsible.vue
Loading
Please register or sign in to comment