From 32c7ffbc99881f4138908bb1f27e702c1312f339 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Fri, 14 Sep 2018 16:56:35 +0200 Subject: [PATCH] Move project-main to Blender Cloud Also remove calls to project-landing, it is now part of project-main. It was just a few lines of code not worth having a different CSS file. --- src/styles/project-main.sass | 82 ------------------- .../nodes/custom/blog/index_main_project.pug | 5 -- .../nodes/custom/page/view_embed.pug | 4 +- .../nodes/custom/post/view_main_project.pug | 5 -- 4 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 src/styles/project-main.sass diff --git a/src/styles/project-main.sass b/src/styles/project-main.sass deleted file mode 100644 index 8cacdd06..00000000 --- a/src/styles/project-main.sass +++ /dev/null @@ -1,82 +0,0 @@ -// Bootstrap variables and utilities. -@import "../../node_modules/bootstrap/scss/functions" -@import "../../node_modules/bootstrap/scss/variables" -@import "../../node_modules/bootstrap/scss/mixins" - -@import _config -@import _utils - -// Bootstrap components. -@import "../../node_modules/bootstrap/scss/root" -@import "../../node_modules/bootstrap/scss/reboot" - -@import "../../node_modules/bootstrap/scss/type" -@import "../../node_modules/bootstrap/scss/images" - -@import "../../node_modules/bootstrap/scss/code" -@import "../../node_modules/bootstrap/scss/grid" -@import "../../node_modules/bootstrap/scss/tables" -@import "../../node_modules/bootstrap/scss/forms" -@import "../../node_modules/bootstrap/scss/buttons" -@import "../../node_modules/bootstrap/scss/transitions" -@import "../../node_modules/bootstrap/scss/dropdown" -@import "../../node_modules/bootstrap/scss/button-group" -@import "../../node_modules/bootstrap/scss/input-group" -@import "../../node_modules/bootstrap/scss/custom-forms" - -@import "../../node_modules/bootstrap/scss/nav" -@import "../../node_modules/bootstrap/scss/navbar" - -@import "../../node_modules/bootstrap/scss/card" -@import "../../node_modules/bootstrap/scss/breadcrumb" -@import "../../node_modules/bootstrap/scss/pagination" -@import "../../node_modules/bootstrap/scss/badge" -@import "../../node_modules/bootstrap/scss/jumbotron" -@import "../../node_modules/bootstrap/scss/alert" -@import "../../node_modules/bootstrap/scss/progress" -@import "../../node_modules/bootstrap/scss/media" -@import "../../node_modules/bootstrap/scss/list-group" -@import "../../node_modules/bootstrap/scss/close" -@import "../../node_modules/bootstrap/scss/modal" -@import "../../node_modules/bootstrap/scss/tooltip" -@import "../../node_modules/bootstrap/scss/popover" -@import "../../node_modules/bootstrap/scss/carousel" - -@import "../../node_modules/bootstrap/scss/utilities" -@import "../../node_modules/bootstrap/scss/print" - -// Pillar components. -@import "apps_base" -@import "components/base" - -@import "components/jumbotron" -@import "components/alerts" -@import "components/navbar" -@import "components/dropdown" -@import "components/footer" -@import "components/shortcode" -@import "components/statusbar" -@import "components/search" - -@import "components/flyout" -@import "components/forms" -@import "components/inputs" -@import "components/buttons" -@import "components/popover" -@import "components/tooltip" -@import "components/checkbox" -@import "components/overlay" -@import "components/card" - -@import _notifications -@import _comments - -@import _project -@import _project-sharing -@import _project-dashboard -@import _error - -@import _search - -@import plugins/_jstree -@import plugins/_js_select2 diff --git a/src/templates/nodes/custom/blog/index_main_project.pug b/src/templates/nodes/custom/blog/index_main_project.pug index 6f809bff..5a9a46b5 100644 --- a/src/templates/nodes/custom/blog/index_main_project.pug +++ b/src/templates/nodes/custom/blog/index_main_project.pug @@ -4,11 +4,6 @@ | {% block page_title %}Blog{% endblock%} -| {% block css %} -| {{ super() }} -link(href="{{ url_for('static_cloud', filename='assets/css/project-landing.css') }}", rel="stylesheet") -| {% endblock css %} - | {% block body %} | {{ blogmacros.render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta, pages=pages) }} | {% endblock %} diff --git a/src/templates/nodes/custom/page/view_embed.pug b/src/templates/nodes/custom/page/view_embed.pug index 8753750b..b0cb38e2 100644 --- a/src/templates/nodes/custom/page/view_embed.pug +++ b/src/templates/nodes/custom/page/view_embed.pug @@ -5,9 +5,7 @@ header img.header(src="{{ node.picture.thumbnail('h', api=api) }}") | {% endif %} -| {% block navbar_secondary %} -| {{ super() }} -| {% endblock navbar_secondary %} + #node-container #node-overlay diff --git a/src/templates/nodes/custom/post/view_main_project.pug b/src/templates/nodes/custom/post/view_main_project.pug index 26ece6ec..a81ca77d 100644 --- a/src/templates/nodes/custom/post/view_main_project.pug +++ b/src/templates/nodes/custom/post/view_main_project.pug @@ -18,11 +18,6 @@ meta(property="og:image", content="{{ node.picture.thumbnail('l', api=api) }}") | {% block page_title %}{{node.name}} - Blog{% endblock%} -| {% block css %} -| {{ super() }} -link(href="{{ url_for('static_cloud', filename='assets/css/project-landing.css') }}", rel="stylesheet") -| {% endblock css %} - | {% set title = 'blog' %} | {% block body %}