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
Commits
24adf7b2
Commit
24adf7b2
authored
2 years ago
by
Tomáš Valenta
Browse files
Options
Downloads
Plain Diff
Merge branch 'test' of gitlab.pirati.cz:to/majak into feat/personal-calendars
parents
3a481d7f
538b6f38
No related branches found
No related tags found
2 merge requests
!787
Release
,
!749
Add personal calendars, move from requests-cache to Django cache
Pipeline
#12368
passed
2 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
district/templates/district/district_contact_page.html
+1
-1
1 addition, 1 deletion
district/templates/district/district_contact_page.html
shared/templates/shared/article_preview.html
+1
-1
1 addition, 1 deletion
shared/templates/shared/article_preview.html
with
2 additions
and
2 deletions
district/templates/district/district_contact_page.html
+
1
−
1
View file @
24adf7b2
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
{% endif %}
{% endif %}
<div
class=
"card elevation-3"
>
<div
class=
"card elevation-3"
>
<div
class=
"card__body"
>
<div
class=
"card__body"
>
{% include "shared/person_badge_wide_snippet.html" with person_page=item.value.person
title=item.value.position
%}
{% include "shared/person_badge_wide_snippet.html" with person_page=item.value.person %}
</div>
</div>
</div>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
shared/templates/shared/article_preview.html
+
1
−
1
View file @
24adf7b2
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
{{ article.title }}
{{ article.title }}
</h1>
</h1>
</a>
</a>
<p
class=
"card-body-text flex-grow{% if article.is_black %} bg-black{% endif %}"
>
<p
class=
"card-body-text
text-ellipsis overflow-hidden h-64
flex-grow{% if article.is_black %} bg-black{% endif %}"
>
{{ article.perex }}
{{ article.perex }}
</p>
</p>
<div
class=
"inline-block-nogap mt-4"
>
<div
class=
"inline-block-nogap mt-4"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment