Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Maják
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TO
Maják
Compare revisions
e64995d654eaa4845e475fb37b7540e5b8610ac0 to c480c23e0e80aafe117aa065adeb18eada7c76a1
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
to/majak
Select target project
No results found
c480c23e0e80aafe117aa065adeb18eada7c76a1
Select Git revision
Branches
feat-more-blocks
feat-rework-election-page
feat/custom-css
feat/dary-improvements
feat/geo-feature-collections
feat/hideable-tweets
feat/instagram-feed
feat/people-octopus-imports
feat/pirstan-changes
feat/redesign-fixes-3
feat/redesign-improvements-10
feat/redesign-improvements-8
feat/separate-import-thread
feature/crypto-widget
features/add-custom-numbering-for-candidates
features/add-dynamic-candidate-numbers
features/add-embed-to-articles
features/add-feature-enlarging-sub-block
features/add-link-to-images
features/add-pdf-page
features/add-redirects
features/add-thumbnail-principle-to-uniweb-and-senate
features/add-timeline
features/add-typed-table
features/create-collapsible-extra-legal-info
features/create-mastodon-feed-block
features/create-wordcloud-from-article-page
features/donation-panel-should-be-optional
features/extend-hero-banner
features/fix-broken-calendar-categories
master
test
32 results
Swap
Target
to/majak
Select target project
to/majak
b1242/majak
2 results
e64995d654eaa4845e475fb37b7540e5b8610ac0
Select Git revision
Branches
feat-more-blocks
feat-rework-election-page
feat/custom-css
feat/dary-improvements
feat/geo-feature-collections
feat/hideable-tweets
feat/instagram-feed
feat/people-octopus-imports
feat/pirstan-changes
feat/redesign-fixes-3
feat/redesign-improvements-10
feat/redesign-improvements-8
feat/separate-import-thread
feature/crypto-widget
features/add-custom-numbering-for-candidates
features/add-dynamic-candidate-numbers
features/add-embed-to-articles
features/add-feature-enlarging-sub-block
features/add-link-to-images
features/add-pdf-page
features/add-redirects
features/add-thumbnail-principle-to-uniweb-and-senate
features/add-timeline
features/add-typed-table
features/create-collapsible-extra-legal-info
features/create-mastodon-feed-block
features/create-wordcloud-from-article-page
features/donation-panel-should-be-optional
features/extend-hero-banner
features/fix-broken-calendar-categories
master
test
32 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Add calendar time under date, make date accessible
· 12f3cdf4
jindra12
authored
2 years ago
#189
12f3cdf4
main: now for copy
· c480c23e
Ondrej Rehounek
authored
2 years ago
and
jan.bednarik
committed
2 years ago
c480c23e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/templates/main/includes/layout/footer.html
+2
-1
2 additions, 1 deletion
main/templates/main/includes/layout/footer.html
shared/templates/shared/calendar_current_events_snippet.html
+8
-2
8 additions, 2 deletions
shared/templates/shared/calendar_current_events_snippet.html
with
10 additions
and
3 deletions
main/templates/main/includes/layout/footer.html
View file @
c480c23e
...
...
@@ -63,7 +63,8 @@
{% endif %}
<div
class=
"max-w-xs"
>
<span
class=
"text-xs text-grey-350 "
>
<span
class=
"-scale-x-100 inline-block"
>
©
</span>
Piráti, 2022. Všechna práva vyhlazena. Sdílejte a nechte ostatní sdílet za stejných podmínek.
<br><br>
<span
class=
"-scale-x-100 inline-block"
>
©
</span>
Piráti, {% now 'Y' %}.
Všechna práva vyhlazena. Sdílejte a nechte ostatní sdílet za stejných podmínek.
<br><br>
<a
href=
"{{ page.root_page.gdpr_and_cookies_url }}"
>
Zásady ochrany osobních údajů
</a>
</span>
</div>
...
...
This diff is collapsed.
Click to expand it.
shared/templates/shared/calendar_current_events_snippet.html
View file @
c480c23e
...
...
@@ -19,8 +19,14 @@
</div>
<div
class=
"col-span-8 grid grid-cols-3 col-gap-4 calendar-table-row__col calendar-table-row__col--norborder"
>
<div
class=
"col-span-3 md:col-span-1"
>
<strong
class=
"block"
>
{{ event.start|date:"l j. E"|capfirst }}
</strong>
<p
class=
"font-light text-sm mt-1"
>
{{ event.duration }}
</p></div>
<strong
class=
"block"
>
<time
datetime=
"{{ event.start|date:"
Y-m-d
H:m
"|
capfirst
}}"
>
{{ event.start|date:"l j. E"|capfirst }}
</time>
</strong>
<p
class=
"font-light text-sm mt-1"
aria-hidden=
"true"
>
{{ event.start|date:"G:i" }}
</p>
<p
class=
"font-light text-sm mt-1"
>
{{ event.duration }}
</p>
</div>
<div
class=
"col-span-3 md:col-span-2 mt-4 md:mt-0 overflow-hidden"
>
<span
class=
"font-bold block"
>
{{ event.summary }}
...
...
This diff is collapsed.
Click to expand it.