Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Maják
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

449c1934

Commit 449c1934 authored Aug 23, 2022 by OndraPetrzilka

Downloads
- Plain Diff

Merge branch 'feature/pirati-cz' into feature/pirati-cz-ondra

parents a6fbbb4c f77d4fef

No related branches found

No related tags found

3 merge requests!607Pirati.cz,!586Feature/pirati cz ondra,!575Feature/pirati cz

Checking pipeline status

Changes 6
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

main/models.py 34 additions, 4 deletions

main/models.py
main/styleguide/source/_patterns/atoms/buttons/button-animated.mustache 3 additions, 3 deletions

...e/source/_patterns/atoms/buttons/button-animated.mustache
main/styleguide/source/css/molecules/carousels.pcss 11 additions, 7 deletions

main/styleguide/source/css/molecules/carousels.pcss
main/styleguide/source/css/molecules/sliding_button.pcss 1 addition, 1 deletion

main/styleguide/source/css/molecules/sliding_button.pcss
main/styleguide/source/js/components/header/HeaderCarousel.vue 39 additions, 7 deletions

...styleguide/source/js/components/header/HeaderCarousel.vue
main/templates/main/main_work_page.html 66 additions, 1 deletion

main/templates/main/main_work_page.html

with 154 additions and 23 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

Pirátský GitLab - Home of the CopyLeft