From 5218bd17e3107b3ce8f88a70598c86b167ac70d7 Mon Sep 17 00:00:00 2001 From: Tobias Johansson Date: Tue, 20 Nov 2018 16:29:01 +0100 Subject: [PATCH] Project-Timeline: Introduced timeline on projects Limited to projects of category assets and film for now. --- src/styles/main.sass | 1 + src/styles/project-main.sass | 2 ++ src/templates/homepage.pug | 7 +------ src/templates/projects/view.pug | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/styles/main.sass b/src/styles/main.sass index 75279c2..9f62cf9 100644 --- a/src/styles/main.sass +++ b/src/styles/main.sass @@ -71,6 +71,7 @@ @import "../../../pillar/src/styles/components/checkbox" @import "../../../pillar/src/styles/components/overlay" @import "../../../pillar/src/styles/components/card" +@import "../../../pillar/src/styles/components/placeholder" @import "../../../pillar/src/styles/components/timeline" @import "../../../pillar/src/styles/comments" diff --git a/src/styles/project-main.sass b/src/styles/project-main.sass index 9801e1b..8e5cb0b 100644 --- a/src/styles/project-main.sass +++ b/src/styles/project-main.sass @@ -58,6 +58,8 @@ @import "../../../pillar/src/styles/components/shortcode" @import "../../../pillar/src/styles/components/statusbar" @import "../../../pillar/src/styles/components/search" +@import "../../../pillar/src/styles/components/placeholder" +@import "../../../pillar/src/styles/components/timeline" @import "../../../pillar/src/styles/components/flyout" @import "../../../pillar/src/styles/components/forms" diff --git a/src/templates/homepage.pug b/src/templates/homepage.pug index 9072a48..3cf3c15 100644 --- a/src/templates/homepage.pug +++ b/src/templates/homepage.pug @@ -29,7 +29,7 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_ .container-fluid.dashboard-container.imgs-fluid .row .col-md-8.col-xl-9 - section.timeline + +timeline() .d-block.text-center a.d-inline-block.p-3.text-muted(href="{{ url_for('main.main_blog') }}") @@ -119,11 +119,6 @@ script. $(this).text($(this).text().replace(/\*|\@|\<(.*?)\>/g, '')); }); - $('.timeline') - .timeline({ - url: '/api/timeline' - }); - hopToTop(); // Display jump to top button }); | {% endblock %} diff --git a/src/templates/projects/view.pug b/src/templates/projects/view.pug index b3cb826..1ac030b 100644 --- a/src/templates/projects/view.pug +++ b/src/templates/projects/view.pug @@ -142,7 +142,7 @@ link(href="{{ url_for('static_cloud', filename='assets/css/project-main.css') }} #project_context-container | {% if project.has_method('PUT') %} - #project_context-header.position-fixed + #project_context-header.position-absolute ul.project-edit-tools.disabled.d-flex.list-unstyled.py-2.mb-0 li.dropdown( title="Create...",