Skip to content
Snippets Groups Projects
Commit b2b0fd0c authored by OndraPetrzilka's avatar OndraPetrzilka
Browse files

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

parents 4a67906f 9625c3c2
No related branches found
No related tags found
3 merge requests!607Pirati.cz,!589Feature/pirati cz ondra,!575Feature/pirati cz
Pipeline #9418 passed
Stage: build
Show whitespace changes
Inline Side-by-side
Showing
with 82 additions and 50 deletions
main/styleguide/source/_patterns/organisms/main-articles-article-list.mustache 0 → 100644
+ 14
− 0
View file @ b2b0fd0c
<section class="grid-container mb-4 justify-start xl:mb-14">
<div class="grid-content-with-right-side">
<div class="leading-6">
<h2 class="head-6xl mb-8">
Články
</h2>
{{> molecules-person-article-preview }}
{{> molecules-person-article-preview }}
</div>
<div class="flex justify-center">
{{> atoms-button-animated(btn-text: "Zobrazit další", classes-btn-hidden: "bg-black") }}
</div>
</div>
</section>
main/styleguide/source/_patterns/organisms/main-articles-timeline.mustache 0 → 100644
+ 43
− 0
View file @ b2b0fd0c
<div class="grid-container article-section">
<div class="grid-full mb-8">
<div class="mb-4">
<h3 class="head-7xl mb-4 xl:hidden">Červenec</h3>
<div class="flex flex-col justify-between xl:flex-row">
<div class="xl:pt-8">
{{> molecules-work-article-preview }}
{{> molecules-work-article-preview }}
</div>
<div class="relative border border-violet-400 mx-8 hidden xl:block">
<div class="absolute bg-violet-400 p-1 text-white font-bold" style="transform: translateX(-50%); top: -1rem">
Červenec
</div>
</div>
<div class="xl:pt-14">
{{> molecules-work-article-preview }}
{{> molecules-work-article-preview }}
</div>
</div>
</div>
<div class="mb-4">
<h3 class="head-7xl mb-4 xl:hidden">Srpen</h3>
<div class="flex flex-col justify-between xl:flex-row">
<div class="xl:pt-8">
{{> molecules-work-article-preview }}
{{> molecules-work-article-preview }}
</div>
<div class="relative border border-violet-400 mx-8 hidden xl:block">
<div class="absolute bg-violet-400 p-1 text-white font-bold" style="transform: translateX(-50%); top: -1rem">
Srpen
</div>
</div>
<div class="xl:pt-14">
{{> molecules-work-article-preview }}
{{> molecules-work-article-preview }}
</div>
</div>
</div>
<div class="flex justify-center">
{{> atoms-button-animated(btn-text: "Zobrazit další", classes-btn-hidden: "bg-black") }}
</div>
</div>
</div>
main/styleguide/source/_patterns/templates/how-we-works.mustache
+ 17
− 42
View file @ b2b0fd0c
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
<main role="main"> <main role="main">
<div class="grid-container mb-2 xl:mb-12"> <div class="grid-container mb-2 xl:mb-12">
<div class="grid-left-side">
{{> molecules-sidebar-menu }}
</div>
<div class="grid-content leading-6"> <div class="grid-content leading-6">
<h2 class="head-xl mb-2"> <h2 class="head-xl mb-2">
Piráti pracují pro občany ČR na všech úrovních. V zastupitelstev obcí působí 400 zastupitelů, dalších 100 v krajích. Piráti pracují pro občany ČR na všech úrovních. V zastupitelstev obcí působí 400 zastupitelů, dalších 100 v krajích.
...@@ -18,48 +15,26 @@ ...@@ -18,48 +15,26 @@
</div> </div>
</div> </div>
<div class="grid-container article-section"> <div class="__js-root">
<div class="grid-full mb-8"> <ui-view-provider :initial="{timeline: true, articles: false}" :sync-location="true"
<div class="mb-4"> v-slot="{ isCurrentView, toggleView }">
<h3 class="head-7xl mb-4 xl:hidden">Červenec</h3> <div class="grid-container article-section mb-8">
<div class="flex flex-col justify-between xl:flex-row"> <div class="grid-full">
<div class="xl:pt-8"> <div class="switch">
{{> molecules-work-article-preview }} <a @click="toggleView('timeline')" class="switch__item"
{{> molecules-work-article-preview }} :class="{'switch__item--active': isCurrentView('timeline')}">Poslanecká sněmovna</a>
</div> <a @click="toggleView('articles')" class="switch__item"
<div class="relative border border-violet-400 mx-8 hidden xl:block"> :class="{'switch__item--active': isCurrentView('articles')}">Vláda</a>
<div class="absolute bg-violet-400 p-1 text-white font-bold" style="transform: translateX(-50%); top: -1rem"> </div>
Červenec </div>
</div> </div>
</div> <template v-if="isCurrentView('timeline')">
<div class="xl:pt-14"> {{> organisms-main-articles-timeline }}
{{> molecules-work-article-preview }} </template>
{{> molecules-work-article-preview }} <template v-if="isCurrentView('articles')">
</div> {{> organisms-main-articles-article-list }}
</div> </template>
</div> </ui-view-provider>
<div class="mb-4">
<h3 class="head-7xl mb-4 xl:hidden">Srpen</h3>
<div class="flex flex-col justify-between xl:flex-row">
<div class="xl:pt-8">
{{> molecules-work-article-preview }}
{{> molecules-work-article-preview }}
</div>
<div class="relative border border-violet-400 mx-8 hidden xl:block">
<div class="absolute bg-violet-400 p-1 text-white font-bold" style="transform: translateX(-50%); top: -1rem">
Srpen
</div>
</div>
<div class="xl:pt-14">
{{> molecules-work-article-preview }}
{{> molecules-work-article-preview }}
</div>
</div>
</div>
<div class="flex justify-center">
{{> atoms-button-animated(btn-text: "Zobrazit další", classes-btn-hidden: "bg-black") }}
</div>
</div>
</div> </div>
</main> </main>
{{> organisms-newsletter-section }} {{> organisms-newsletter-section }}
......
main/styleguide/source/_patterns/templates/person.mustache
+ 5
− 5
View file @ b2b0fd0c
...@@ -85,19 +85,19 @@ ...@@ -85,19 +85,19 @@
</h2> </h2>
<div class="__js-root twitter-carousel-root"> <div class="__js-root twitter-carousel-root">
<ui-twitter-carousel> <ui-twitter-carousel>
<div class="md:w-1/3 lg:w-1/4 pr-2"> <div class="w-full flex max-w-xs">
{{> molecules-twitter-box }} {{> molecules-twitter-box }}
</div> </div>
<div class="md:w-1/3 lg:w-1/4 pr-2"> <div class="w-full flex max-w-xs">
{{> molecules-twitter-box }} {{> molecules-twitter-box }}
</div> </div>
<div class="md:w-1/3 lg:w-1/4 pr-2"> <div class="w-full flex max-w-xs">
{{> molecules-twitter-box }} {{> molecules-twitter-box }}
</div> </div>
<div class="md:w-1/3 lg:w-1/4"> <div class="w-full flex max-w-xs">
{{> molecules-twitter-box }} {{> molecules-twitter-box }}
</div> </div>
<div class="md:w-1/3 lg:w-1/4"> <div class="w-full flex max-w-xs">
{{> molecules-twitter-box }} {{> molecules-twitter-box }}
</div> </div>
</ui-twitter-carousel> </ui-twitter-carousel>
......
main/styleguide/source/css/molecules/carousels.pcss
+ 2
− 2
View file @ b2b0fd0c
...@@ -186,12 +186,12 @@ ...@@ -186,12 +186,12 @@
top: -2.6rem; top: -2.6rem;
} }
&:before { &:before {
background: linear-gradient(90deg, rgba(2,0,36,0) 0%, rgba(255,255,255,1) 100%);
content: ''; content: '';
height: 100%; height: 100%;
position: absolute;
right: 0; right: 0;
position: absolute;
width: 20%; width: 20%;
z-index: 100; z-index: 100;
background: linear-gradient(90deg, rgba(2,0,36,0) 0%, rgba(255,255,255,1) 100%);
} }
} }
main/styleguide/source/js/components/ViewProvider.vue
+ 1
− 1
View file @ b2b0fd0c
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
this.$data.views = Object.assign({}, this.data.views, updates); this.$data.views = Object.assign({}, this.data.views, updates);
}, },
toggleView(viewId) { toggleView(viewId) {
this.setView(viewId, !this.isCurrentView(viewId), true); !this.isCurrentView(viewId) && this.setView(viewId, !this.isCurrentView(viewId), true);
}, },
showView(viewId) { showView(viewId) {
this.setView(viewId, true, true); this.setView(viewId, true, true);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Pirátský GitLab - Home of the CopyLeft