-
- Downloads
Merge branch 'feature/pirati-cz' into feature/pirati-cz-dan
# Conflicts: # main/static/main/css/styles.css # main/static/main/js/main.bundle.js # main/templates/main/blocks/news_block.html
No related branches found
No related tags found
Showing
- .pre-commit-config.yaml 1 addition, 1 deletion.pre-commit-config.yaml
- main/blocks.py 12 additions, 3 deletionsmain/blocks.py
- main/migrations/0026_remove_mainhomepage_max_items_and_more.py 138 additions, 0 deletions...migrations/0026_remove_mainhomepage_max_items_and_more.py
- main/models.py 7 additions, 19 deletionsmain/models.py
- main/static/main/css/styles.css 39 additions, 4 deletionsmain/static/main/css/styles.css
- main/static/main/images/background-images/50632006293_2001701fa0_o.jpg 0 additions, 0 deletions...ain/images/background-images/50632006293_2001701fa0_o.jpg
- main/static/main/images/background-images/bartos-2.jpg 0 additions, 0 deletionsmain/static/main/images/background-images/bartos-2.jpg
- main/static/main/images/background-images/bartos-newsletter.png 0 additions, 0 deletions...tatic/main/images/background-images/bartos-newsletter.png
- main/static/main/js/main.bundle.js 1 addition, 0 deletionsmain/static/main/js/main.bundle.js
- main/styleguide/source/_patterns/atoms/buttons/button-animated.mustache 2 additions, 2 deletions...e/source/_patterns/atoms/buttons/button-animated.mustache
- main/styleguide/source/_patterns/molecules/articles/article-carousel-item.mustache 1 addition, 4 deletions...atterns/molecules/articles/article-carousel-item.mustache
- main/styleguide/source/_patterns/molecules/blocks/contact-block.mustache 1 addition, 8 deletions.../source/_patterns/molecules/blocks/contact-block.mustache
- main/styleguide/source/_patterns/molecules/representative-box.mustache 1 addition, 8 deletions...de/source/_patterns/molecules/representative-box.mustache
- main/styleguide/source/_patterns/templates/homepage.mustache 6 additions, 6 deletionsmain/styleguide/source/_patterns/templates/homepage.mustache
- main/styleguide/source/css/molecules/sliding_button.pcss 1 addition, 0 deletionsmain/styleguide/source/css/molecules/sliding_button.pcss
- main/styleguide/source/css/organisms/footer.pcss 5 additions, 1 deletionmain/styleguide/source/css/organisms/footer.pcss
- main/styleguide/source/js/components/RegionMap.vue 10 additions, 20 deletionsmain/styleguide/source/js/components/RegionMap.vue
- main/templates/main/blocks/boxes_block.html 8 additions, 1 deletionmain/templates/main/blocks/boxes_block.html
- main/templates/main/blocks/news_block.html 8 additions, 6 deletionsmain/templates/main/blocks/news_block.html
- main/templates/main/blocks/regions_block.html 9 additions, 2 deletionsmain/templates/main/blocks/regions_block.html
Loading
Please register or sign in to comment