From b4acfb89fa3c6082f977e6e4ea86c46e77bb10d2 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Fri, 31 Aug 2018 19:31:36 +0200 Subject: [PATCH] Layout: use bootstrap classes --- src/templates/_macros/_add_new_menu.pug | 15 +++-- src/templates/_macros/_file_uploader_form.pug | 10 +-- .../_macros/_file_uploader_javascript.pug | 6 +- src/templates/_modal.pug | 2 +- src/templates/layout.pug | 7 +- src/templates/menus/user_base.pug | 15 +++-- .../nodes/custom/_node_preview_forbidden.pug | 8 +-- .../nodes/custom/asset/video/view_embed.pug | 2 +- src/templates/nodes/custom/blog/_macros.pug | 12 ++-- .../nodes/custom/comment/list_embed_base.pug | 1 - .../nodes/custom/hdri/view_embed.pug | 2 +- src/templates/nodes/custom/post/create.pug | 4 +- .../nodes/custom/post/view_embed.pug | 2 +- .../nodes/custom/texture/view_embed.pug | 4 +- src/templates/nodes/edit_embed.pug | 14 ++-- src/templates/organizations/index.pug | 2 +- src/templates/organizations/view_embed.pug | 2 +- src/templates/projects/edit.pug | 23 ++++--- src/templates/projects/edit_layout.pug | 15 ++--- .../projects/edit_node_type_embed.pug | 4 +- src/templates/projects/home_images.pug | 2 +- src/templates/projects/home_layout.pug | 34 ++++++---- src/templates/projects/index_dashboard.pug | 48 ++++++++------ src/templates/projects/view.pug | 64 +++++++++---------- src/templates/projects/view_embed.pug | 5 +- src/templates/stats.pug | 2 +- src/templates/users/edit_embed_base.pug | 4 +- src/templates/users/login.pug | 4 +- src/templates/users/settings/base.pug | 2 +- src/templates/users/settings/profile.pug | 2 +- src/templates/users/tasks.pug | 2 +- 31 files changed, 170 insertions(+), 149 deletions(-) diff --git a/src/templates/_macros/_add_new_menu.pug b/src/templates/_macros/_add_new_menu.pug index 3e02de91..96d3bb6e 100644 --- a/src/templates/_macros/_add_new_menu.pug +++ b/src/templates/_macros/_add_new_menu.pug @@ -6,20 +6,21 @@ | {% if node_type_name == 'group' %} | {% set node_type_name = 'folder' %} | {% endif %} -li(class="button-{{ node_type['name'] }}") +li.dropdown-item(class="button-{{ node_type['name'] }}") a.item_add_node( - href="#", - title="{{ node_type['description'] }}", - data-node-type-name="{{ node_type['name'] }}", - data-toggle="tooltip", - data-placement="left") + href="#", + title="{{ node_type['description'] }}", + data-node-type-name="{{ node_type['name'] }}", + data-toggle="tooltip", + data-placement="left") i.pi(class="icon-{{ node_type['name'] }}") | {% if node_type_name == 'group_texture' %} | Texture Folder | {% elif node_type_name == 'group_hdri' %} | HDRi Folder | {% else %} - | {{ node_type_name }} + span.text-capitalize + |{{ node_type_name }} | {% endif %} | {% endif %} | {% endfor %} diff --git a/src/templates/_macros/_file_uploader_form.pug b/src/templates/_macros/_file_uploader_form.pug index d31f6b61..ad92c518 100644 --- a/src/templates/_macros/_file_uploader_form.pug +++ b/src/templates/_macros/_file_uploader_form.pug @@ -28,15 +28,15 @@ span Add files... input(type='file', name='file', multiple='') - button.btn.btn-primary.start(type='submit') + button.btn.btn-outline-primary.start(type='submit') i.pi-upload - span Start upload + span Start Upload - button.btn.btn-warning.cancel(type='reset') + button.btn.btn-outline-warning.cancel(type='reset') i.pi-cancel - span Cancel upload + span Cancel Upload - button.btn.btn-danger.delete(type='button') + button.btn.btn-outline-danger.delete(type='button') i.pi-trash span Delete diff --git a/src/templates/_macros/_file_uploader_javascript.pug b/src/templates/_macros/_file_uploader_javascript.pug index 53418c59..81e25f7f 100644 --- a/src/templates/_macros/_file_uploader_javascript.pug +++ b/src/templates/_macros/_file_uploader_javascript.pug @@ -23,7 +23,7 @@ script#template-upload(type="text/x-tmpl"). {% } %} {% if (!i) { %} - @@ -61,7 +61,7 @@ script#template-download(type="text/x-tmpl"). {% if (file.deleteUrl) { %} - @@ -71,7 +71,7 @@ script#template-download(type="text/x-tmpl"). Create {% } else { %} - diff --git a/src/templates/_modal.pug b/src/templates/_modal.pug index dd46e675..e66c1ccd 100644 --- a/src/templates/_modal.pug +++ b/src/templates/_modal.pug @@ -9,5 +9,5 @@ .modal-body | ... .modal-footer - button.btn.btn-default(type='button', data-dismiss='modal') Close + button.btn.btn-outline-secondary(type='button', data-dismiss='modal') Close button.btn.btn-primary(type='button') Save changes diff --git a/src/templates/layout.pug b/src/templates/layout.pug index 2c9e727c..fdfd8d52 100644 --- a/src/templates/layout.pug +++ b/src/templates/layout.pug @@ -66,10 +66,9 @@ html(lang="en") | {% if not title %}{% set title="default" %}{% endif %} body(class="{{ title }}") - .container-page - .page-content - .page-body - | {% block body %}{% endblock %} + .page-content + .page-body + | {% block body %}{% endblock %} | {% block footer_container %} #footer-container diff --git a/src/templates/menus/user_base.pug b/src/templates/menus/user_base.pug index a3fa6520..3cbebd77 100644 --- a/src/templates/menus/user_base.pug +++ b/src/templates/menus/user_base.pug @@ -16,27 +16,27 @@ li.dropdown a.navbar-item( href="{{ url_for('projects.home_project') }}" title="Home") - #[i.pi-home] Home + | #[i.pi-home] Home li a.navbar-item( href="{{ url_for('projects.index') }}" title="My Projects") - #[i.pi-star] My Projects + | #[i.pi-star] My Projects | {% if current_user.has_organizations() %} li a.navbar-item( href="{{ url_for('pillar.web.organizations.index') }}" title="My Organizations") - #[i.pi-users] My Organizations + | #[i.pi-users] My Organizations | {% endif %} li a.navbar-item( href="{{ url_for('settings.profile') }}" title="Settings") - #[i.pi-cog] Settings + | #[i.pi-cog] Settings | {% endblock menu_list %} @@ -55,8 +55,9 @@ li.dropdown | {% else %} -li.nav-item-sign-in - a.navbar-item(href="{{ url_for('users.login') }}") - | Log in +li.pt-1.pr-1 + a.btn.btn-sm.btn-outline-primary.px-3( + href="{{ url_for('users.login') }}") + | Log In | {% endif %} | {% endblock menu_body %} diff --git a/src/templates/nodes/custom/_node_preview_forbidden.pug b/src/templates/nodes/custom/_node_preview_forbidden.pug index 6dc22129..676a5b29 100644 --- a/src/templates/nodes/custom/_node_preview_forbidden.pug +++ b/src/templates/nodes/custom/_node_preview_forbidden.pug @@ -5,21 +5,21 @@ section.node-preview-forbidden div p Available to Blender Cloud subscribers - hr + hr.bg-white | {% if current_user.has_cap('can-renew-subscription') %} p small You have a subscription, it just needs to be renewed. - a.btn(href="/renew") + a.btn.btn-light(href="/renew") | #[i.pi-heart] Renew Subscription | {% else %} p small Support Blender and get awesome stuff! - a.btn(href="{{ url_for('cloud.join') }}") + a.btn.btn-light(href="{{ url_for('cloud.join') }}") | #[i.pi-heart] Get a Subscription | {% endif %} | {% if current_user.is_anonymous %} p(style="margin-top: 15px") small - a(href="{{ url_for('users.login') }}") Already a subscriber? Log in + a.text-white(href="{{ url_for('users.login') }}") Already a subscriber? Log in | {% endif %} diff --git a/src/templates/nodes/custom/asset/video/view_embed.pug b/src/templates/nodes/custom/asset/video/view_embed.pug index 72cd5a73..ea587f74 100644 --- a/src/templates/nodes/custom/asset/video/view_embed.pug +++ b/src/templates/nodes/custom/asset/video/view_embed.pug @@ -23,7 +23,7 @@ section.node-preview.video | {% block node_download %} | {% if node.file_variations %} -button.btn.btn-default.dropdown-toggle( +button.btn.btn-outline-secondary.dropdown-toggle( type="button", data-toggle="dropdown", aria-haspopup="true", diff --git a/src/templates/nodes/custom/blog/_macros.pug b/src/templates/nodes/custom/blog/_macros.pug index 1fc29fe3..8d9791f9 100644 --- a/src/templates/nodes/custom/blog/_macros.pug +++ b/src/templates/nodes/custom/blog/_macros.pug @@ -8,10 +8,10 @@ a.blog_index-header(href="{{ node.url }}") | {% if project and project._id != config.MAIN_PROJECT_ID %} | {{ projectmacros.render_secondary_navigation(project, pages=pages) }} | {% endif %} -.blog_index-item - a.item-title( - href="{{ node.url }}") - | {{ node.name }} +.blog_index-item.mx-auto + h2.pt-4.px-4 + a.text-muted(href="{{ node.url }}") + | {{ node.name }} ul.meta | {% if node.project.name %} li {{ node.project.name }} @@ -46,7 +46,7 @@ a.blog_index-header(href="{{ node.url }}") i.pi-document-text | {% endif %} - a.item-title( + a.item-title.text-muted( href="{{ node.url }}") | {{node.name}} @@ -66,7 +66,7 @@ a.blog_index-header(href="{{ node.url }}") | {% macro render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta, pages=None) %} | {% if can_create_blog_posts %} .blog-action - a.btn.btn-default.button-create(href="{{url_for('nodes.posts_create', project_id=project._id)}}") + a.btn.btn-outline-primary.button-create(href="{{url_for('nodes.posts_create', project_id=project._id)}}") i.pi-plus | Create New Post | {% endif %} diff --git a/src/templates/nodes/custom/comment/list_embed_base.pug b/src/templates/nodes/custom/comment/list_embed_base.pug index 143faa7a..90ddf312 100644 --- a/src/templates/nodes/custom/comment/list_embed_base.pug +++ b/src/templates/nodes/custom/comment/list_embed_base.pug @@ -32,7 +32,6 @@ .comment-reply-preview-md .comment-reply-info .comment-action-cancel( - type="button", title="{{ _('cancel') }}") span {{ _('cancel') }} diff --git a/src/templates/nodes/custom/hdri/view_embed.pug b/src/templates/nodes/custom/hdri/view_embed.pug index 2fc00288..5c3a856a 100644 --- a/src/templates/nodes/custom/hdri/view_embed.pug +++ b/src/templates/nodes/custom/hdri/view_embed.pug @@ -28,7 +28,7 @@ li.node-details-meta-list-item | {% block node_download %} | {% if node.properties.files %} -button.btn.btn-default.dropdown-toggle( +button.btn.btn-outline-secondary.dropdown-toggle( title="Download HDRI", type="button", data-toggle="dropdown", diff --git a/src/templates/nodes/custom/post/create.pug b/src/templates/nodes/custom/post/create.pug index 1e17dd61..10414e29 100644 --- a/src/templates/nodes/custom/post/create.pug +++ b/src/templates/nodes/custom/post/create.pug @@ -68,9 +68,9 @@ | {% endif %} | {% endfor %} - input.btn.btn-default.button-create(type='submit', value='Create {{ node_type.name }}') + input.btn.btn-outline-secondary.button-create(type='submit', value='Create {{ node_type.name }}') - a.btn.btn-default.button-back(href="{{ url_for('projects.view', project_url=project.url) }}blog") + a.btn.btn-link.button-back(href="{{ url_for('projects.view', project_url=project.url) }}blog") | Back to Blog #blog_post-create-container diff --git a/src/templates/nodes/custom/post/view_embed.pug b/src/templates/nodes/custom/post/view_embed.pug index 3922fab9..4924162e 100644 --- a/src/templates/nodes/custom/post/view_embed.pug +++ b/src/templates/nodes/custom/post/view_embed.pug @@ -5,7 +5,7 @@ #blog_index-container.expand-image-links .blog-action | {% if node.has_method('PUT') %} - a.btn.btn-default.button-edit(href="{{url_for('nodes.edit', node_id=node._id)}}") + a.btn.btn-outline-secondary.button-edit(href="{{url_for('nodes.edit', node_id=node._id)}}") i.pi-edit | Edit Post | {% endif %} diff --git a/src/templates/nodes/custom/texture/view_embed.pug b/src/templates/nodes/custom/texture/view_embed.pug index e6d90184..654cc5db 100644 --- a/src/templates/nodes/custom/texture/view_embed.pug +++ b/src/templates/nodes/custom/texture/view_embed.pug @@ -91,11 +91,11 @@ a(href="{{ f.file.link }}",, title="Download texture", download="{{ f.file.filename }}") - button.btn.btn-default(type="button") + button.btn.btn-outline-secondary(type="button") i.pi-download | Download | {% else %} - button.btn.btn-default.disabled.sorry(type="button") + button.btn.btn-outline-secondary.disabled.sorry(type="button") i.pi-lock | Download | {% endif %} diff --git a/src/templates/nodes/edit_embed.pug b/src/templates/nodes/edit_embed.pug index cfe935b3..bd78fdf8 100644 --- a/src/templates/nodes/edit_embed.pug +++ b/src/templates/nodes/edit_embed.pug @@ -38,18 +38,21 @@ | {% elif field.type == 'HiddenField' %} | {{ field }} + | {% elif field.name == 'attachments' %} + hr #attachments-actions .btn.btn-info#attachments-action-add i.pi-plus | Add New Attachment - p.text-muted + p.text-muted.mt-3 | Attachments can be included in any MarkDown field by using the #[code {attachment slug}] shortcode | (#[a(href='https://pillarframework.org/shortcodes/#attachments', target='_blank') help]). | This shortcode is placed on your copy-paste buffer by clicking "Copy to clipboard". | {{ render_field(field, field.name) }} + hr | {% elif field.name == 'files' %} #files-actions @@ -66,20 +69,23 @@ | {% endfor %} - ul.project-edit-tools.bottom + hr + + ul.project-edit-tools.justify-content-end.h-auto li.button-cancel - a#item_cancel.item-cancel.project-mode-edit( + a#item_cancel.item-cancel.project-mode-edit.btn.btn-outline-secondary( href="javascript:void(0);", title="Cancel changes") i.button-cancel-icon.pi-cancel | Cancel li.button-save - a#item_save.item-save.project-mode-edit( + a#item_save.item-save.project-mode-edit.btn.btn-outline-success.ml-2( href="javascript:void(0);", title="Save changes") i.button-save-icon.pi-check | Save Changes + script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.ui.widget.min.js') }}") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.iframe-transport.min.js') }}") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.fileupload.min.js') }}") diff --git a/src/templates/organizations/index.pug b/src/templates/organizations/index.pug index 511aa935..53c222c4 100644 --- a/src/templates/organizations/index.pug +++ b/src/templates/organizations/index.pug @@ -27,7 +27,7 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba ul#sub-nav-tabs__list li.result#create_organization_result_panel li.create - button.btn.btn-success(onclick='createNewOrganization(this)') + button.btn.btn-outline-success(onclick='createNewOrganization(this)') i.pi-plus | Create Organization | {% endif %} diff --git a/src/templates/organizations/view_embed.pug b/src/templates/organizations/view_embed.pug index a9ab4564..9bc2a31b 100644 --- a/src/templates/organizations/view_embed.pug +++ b/src/templates/organizations/view_embed.pug @@ -75,7 +75,7 @@ script $('#admin-picker').hide(); .input-group - button#item-save.btn.btn-success.btn-block(type='submit') + button#item-save.btn.btn-outline-success.btn-block(type='submit') i.pi-check | Save Changes | {% else %} diff --git a/src/templates/projects/edit.pug b/src/templates/projects/edit.pug index 77d40c6d..9132251e 100644 --- a/src/templates/projects/edit.pug +++ b/src/templates/projects/edit.pug @@ -7,17 +7,16 @@ span#project-edit-title | Edit Project ul.project-edit-tools - // Edit Mode li.button-cancel - a#item_cancel.project-mode-edit( + a#item_cancel.project-mode-edit.btn.btn-sm.btn-link( href="{{url_for('projects.view', project_url=project.url, _external=True)}}", title="Cancel changes") - i.button-cancel-icon.pi-back + i.button-cancel-icon.pi-angle-left | Go to Project li.button-save - a#item_save.project-mode-edit( + a#item_save.project-mode-edit.btn.btn-sm.btn-outline-success.mx-2( href="#", title="Save changes") i.button-save-icon.pi-check @@ -80,16 +79,18 @@ ul.project-edit-tools | {% endfor %} - ul.project-edit-tools.bottom + hr + + ul.project-edit-tools.justify-content-end.h-auto li.button-cancel - a#item_cancel.project-mode-edit( + a#item_cancel.project-mode-edit.btn.btn-link( href="{{url_for('projects.view', project_url=project.url, _external=True)}}", title="Cancel changes") - i.button-cancel-icon.pi-back + i.button-cancel-icon.pi-angle-left | Go to Project li.button-save - a#item_save.project-mode-edit( + a#item_save.project-mode-edit.btn.btn-outline-success.ml-2( href="#", title="Save changes") i.button-save-icon.pi-check @@ -97,6 +98,8 @@ ul.project-edit-tools | {% endblock %} +| {% block footer_container %}{% endblock %} + | {% block footer_scripts %} script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.ui.widget.min.js') }}") script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.iframe-transport.min.js') }}") @@ -105,8 +108,8 @@ script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets script(type="text/javascript"). - // Show view mode buttons. - $('.project-mode-view').displayAs('inline-block'); + // Show edit mode buttons (save, cancel). + $('.project-mode-edit').displayAs('inline-block'); ProjectUtils.setProjectAttributes({projectId: "{{project._id}}", isProject: true, nodeId: ''}); var convert = new Markdown.getSanitizingConverter().makeHtml; diff --git a/src/templates/projects/edit_layout.pug b/src/templates/projects/edit_layout.pug index 4c0bd38a..1809f4bc 100644 --- a/src/templates/projects/edit_layout.pug +++ b/src/templates/projects/edit_layout.pug @@ -5,7 +5,7 @@ #project-container #project-side-container #project_sidebar - ul.project-tabs + ul.project-tabs.p-0 li.tabs-thumbnail( title="About", data-toggle="tooltip", @@ -51,13 +51,13 @@ #project_nav #project_nav-container - #project_nav-header - .project-title - a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}") - | {{ project.name }} + #project_nav-header.bg-white + a.project-title.p-2.font-weight-bold.text-dark( + href="{{url_for('projects.view', project_url=project.url, _external=True)}}") + | {{ project.name }} // TODO - make list a macro - #project_tree.edit + #project_tree.edit.bg-white ul.project_nav-edit-list li(class="{% if title == 'edit' %}active{% endif %}") a(href="{{ url_for('projects.edit', project_url=project.url) }}") @@ -77,10 +77,9 @@ i(class="pi-{{ext.icon}}") | {{ext.name | title}} | {% endfor %} - .project_split(title="Toggle Navigation [T]") #project_context-container - #project_context-header + #project_context-header.bg-white span#status-bar | {% block project_context_header %} | {% endblock %} diff --git a/src/templates/projects/edit_node_type_embed.pug b/src/templates/projects/edit_node_type_embed.pug index ca1fd4d7..aff9e8b4 100644 --- a/src/templates/projects/edit_node_type_embed.pug +++ b/src/templates/projects/edit_node_type_embed.pug @@ -19,7 +19,7 @@ form( .col-md-9 h3 Editing: {{ node_type['name'] }} .col-md-3 - button.js-form-save.btn.btn-success.pull-right(style="margin-top: 15px;") + button.js-form-save.btn.btn-outline-success.pull-right(style="margin-top: 15px;") | Save Changes .row @@ -46,7 +46,7 @@ form( | {% endif %} | {% endfor %} - button.js-form-save.btn.btn-success.pull-right + button.js-form-save.btn.btn-outline-success.pull-right | Save Changes diff --git a/src/templates/projects/home_images.pug b/src/templates/projects/home_images.pug index 7399d796..274a9dfc 100644 --- a/src/templates/projects/home_images.pug +++ b/src/templates/projects/home_images.pug @@ -80,7 +80,7 @@ section.nav-tabs__tab.active#tab-images Image Sharing requires a Blender Cloud subscription. .buttons - a.btn.btn-default.btn-outline.green(href="https://store.blender.org/product/membership/") + a.btn.btn-outline-primary(href="https://store.blender.org/product/membership/") | Join Now | {% endif %} | {% endblock %} diff --git a/src/templates/projects/home_layout.pug b/src/templates/projects/home_layout.pug index 733f6ae7..58111965 100644 --- a/src/templates/projects/home_layout.pug +++ b/src/templates/projects/home_layout.pug @@ -38,29 +38,35 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba section.dashboard-secondary section.announcement - img.header( - src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}") + a(href="https://cloud.blender.org/blog/introducing-blender-sync") + img.header( + src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}") .text | {% block side_announcement %} - .title - a(href="https://cloud.blender.org/blog/introducing-blender-sync") Blender Sync + h5 + a.text-muted(href="https://cloud.blender.org/blog/introducing-blender-sync") + | Blender Sync .lead - span. + p. Save your settings once. Use them anywhere. Carry your Blender configuration with you, use our free add-on to sync your keymaps and preferences. -
+ #[hr] Syncing is free for everyone. No subscription required. | {% endblock %} + | {% if show_addon_download_buttons %} - .buttons - a.btn.btn-default.btn-outline.orange( - href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip") - i.pi-download - | Download v{{ config.BLENDER_CLOUD_ADDON_VERSION }} - a.btn.btn-default.btn-outline.blue( - href="{{ learn_more_btn_url }}") - | Learn More + .row + .col-md-8 + a.btn.btn-block.btn-outline-success( + href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip") + i.pi-download + | Download v{{ config.BLENDER_CLOUD_ADDON_VERSION }} + .col-md-4 + a.btn.btn-link( + href="{{ learn_more_btn_url }}") + | Learn More + i.pi-angle-right | {% endif %} | {% endblock %} diff --git a/src/templates/projects/index_dashboard.pug b/src/templates/projects/index_dashboard.pug index bb198864..fcc50df2 100644 --- a/src/templates/projects/index_dashboard.pug +++ b/src/templates/projects/index_dashboard.pug @@ -59,15 +59,15 @@ style. | {% endif %} | {% if current_user.has_cap('subscriber') %} - li.create#project-create( + li#project-create( data-url="{{ url_for('projects.create') }}") a.btn.btn-success( href="{{ url_for('projects.create') }}") i.pi-plus | Create Project | {% elif current_user.has_cap('can-renew-subscription') %} - li.create - a.btn(href="/renew", target="_blank") + li + a.btn.btn-outline-success(href="/renew", target="_blank") i.pi-heart | Renew subscription to create a project | {% endif %} @@ -210,44 +210,52 @@ style. section.dashboard-secondary section.announcement - img.header( - src="{{ url_for('static', filename='assets/img/backgrounds/services_projects.jpg')}}") + a(href="https://cloud.blender.org/blog/introducing-private-projects") + img.header( + src="{{ url_for('static', filename='assets/img/backgrounds/services_projects.jpg')}}") .text - h5 Projects + h5 + a.text-muted(href="https://cloud.blender.org/blog/introducing-private-projects") + | Projects .lead - span. + p. Create and manage your own personal projects. Upload assets and collaborate with other Blender Cloud members. - .buttons - a.btn.btn-default.btn-outline.blue( + + a.btn.btn-link.btn-block( href="https://cloud.blender.org/blog/introducing-private-projects") | Learn More + i.pi-angle-right section.announcement.mt-3 a(href="https://cloud.blender.org/blog/introducing-blender-sync") - img.header( - src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}") + img.header( + src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}") .text h5 a.text-muted(href="https://cloud.blender.org/blog/introducing-blender-sync") | Textures Browser & Settings Sync .lead - span. + p. Get the official Blender Cloud add-on: + ul li Save your Blender settings online, use them anywhere li Browse over 800 textures & HDRIs within Blender li Share Screenshots & Renders directly to Blender Cloud - .buttons - a.btn.btn-default.btn-outline.orange( - href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip") - i.pi-download - | Download Add-on v {{ config.BLENDER_CLOUD_ADDON_VERSION }} - a.btn.btn-default.btn-outline.blue( - href="https://cloud.blender.org/blog/introducing-blender-sync") - | Learn More + .row + .col-md-8 + a.btn.btn-outline-success.btn-block( + href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip") + i.pi-download + | Download Add-on v {{ config.BLENDER_CLOUD_ADDON_VERSION }} + .col-md-4 + a.btn.btn-link( + href="https://cloud.blender.org/blog/introducing-blender-sync") + | Learn More + i.pi-angle-right | {% endblock %} diff --git a/src/templates/projects/view.pug b/src/templates/projects/view.pug index f4669381..8151fbe6 100644 --- a/src/templates/projects/view.pug +++ b/src/templates/projects/view.pug @@ -2,6 +2,7 @@ | {% from '_macros/_add_new_menu.html' import add_new_menu %} | {% block page_title %}{{ project.name }}{% endblock%} +| {% set title = 'project' %} | {% block og %} meta(property="og:type", content="website") @@ -78,15 +79,14 @@ script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-hotke | {% block css %} link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css') }}", rel="stylesheet") -link(href="{{ url_for('static_pillar', filename='assets/css/base.css') }}", rel="stylesheet") link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }}", rel="stylesheet") | {% endblock %} | {% block body %} #project-container #project-side-container - #project_sidebar - ul.project-tabs + #project_sidebar.bg-white + ul.project-tabs.p-0 li.tabs-thumbnail(class="{% if project.picture_square %}image{% endif %}") a(href="{{url_for('projects.view', project_url=project.url)}}") #project-loading @@ -96,6 +96,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') } | {% else %} i.pi-home | {% endif %} + li.tabs-browse( title="Browse", data-toggle="tooltip", @@ -103,6 +104,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') } class="active") a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}") i.pi-folder + | {% if not project.is_private %} | {% if current_user_is_subscriber %} li.tabs-search( @@ -135,29 +137,29 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') } #project_nav(class="{{ title }}") #project_nav-container | {% if title != 'about' %} - #project_nav-header - .project-title - a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}") - | {{ project.name }} + #project_nav-header.bg-white + a.project-title.p-2.font-weight-bold.text-dark( + href="{{url_for('projects.view', project_url=project.url, _external=True)}}") + | {{ project.name }} | {% block project_tree %} - #project_tree + #project_tree.bg-white | {% endblock project_tree %} | {% endif %} #project_context-container | {% if project.has_method('PUT') %} - #project_context-header + #project_context-header.bg-white span#status-bar ul.project-edit-tools.disabled - li.button-dropdown - a#item_add.dropdown-toggle.project-mode-view( - type="button", - data-toggle="dropdown", - aria-haspopup="true", - aria-expanded="false") + li.dropdown + button#item_add.project-mode-view.btn.btn-sm.btn-outline-secondary.dropdown-toggle( + type="button", + data-toggle="dropdown", + aria-haspopup="true", + aria-expanded="false") i.button-add-icon.pi-collection-plus | New... @@ -165,52 +167,52 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') } | {{ add_new_menu(project.node_types) }} li.button-edit - a#item_edit.project-mode-view( + a#item_edit.project-mode-view.btn.btn-sm.btn-outline-secondary.ml-2( href="javascript:void(0);", title="Edit", data-project_id="{{project._id}}") i.button-edit-icon.pi-edit | Edit Project - li.button-dropdown - a.dropdown-toggle.project-mode-view( + li.dropdown + button.dropdown-toggle.project-mode-view.btn.btn-sm.btn-outline-secondary.mx-2( type="button", data-toggle="dropdown", aria-haspopup="true", aria-expanded="false") - i.pi-more-vertical + i.pi-more-vertical.p-0 ul.dropdown-menu | {% if current_user.has_cap('admin') %} - li.button-featured + li.dropdown-item a#item_featured( href="javascript:void(0);", title="Feature on project's homepage", data-toggle="tooltip", data-placement="left") - i.button-featured-icon.pi-star + i.pi-star | Toggle Featured - li.button-toggle-public + li.dropdown-item a#item_toggle_public( href="javascript:void(0);", title="Make it accessible to anyone", data-toggle="tooltip", data-placement="left") i.pi-lock-open - | Toggle public + | Toggle Public | {% endif %} - li.button-toggle-projheader + li.dropdown-item a#item_toggle_projheader( href="javascript:void(0);", title="Feature as project's header", data-toggle="tooltip", data-placement="left") - i.button-featured-icon.pi-star + i.pi-star | Toggle Project Header video - li.button-move + li.dropdown-item.button-move a#item_move( href="javascript:void(0);", title="Move into a folder...", @@ -219,7 +221,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') } i.button-move-icon.pi-move | Move - li.button-delete + li.dropdown-item.button-delete a#item_delete( href="javascript:void(0);", title="Can be undone within a month", @@ -230,14 +232,14 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') } // Edit Mode li.button-cancel - a#item_cancel.project-mode-edit( + a#item_cancel.project-mode-edit.btn.btn-outline-secondary( href="javascript:void(0);", title="Cancel changes") i.button-cancel-icon.pi-cancel | Cancel li.button-save - a#item_save.project-mode-edit( + a#item_save.project-mode-edit.btn.btn-outline-success.mx-2( href="javascript:void(0);", title="Save changes") i.button-save-icon.pi-check @@ -272,9 +274,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') } | {% endblock %} -| {% block footer_navigation %}{% endblock %} -| {% block footer %}{% endblock %} - +| {% block footer_container %}{% endblock %} | {% block footer_scripts_pre %} diff --git a/src/templates/projects/view_embed.pug b/src/templates/projects/view_embed.pug index ffa2ac30..e14a2999 100644 --- a/src/templates/projects/view_embed.pug +++ b/src/templates/projects/view_embed.pug @@ -22,9 +22,8 @@ | {% endif %} section.node-details-container.project - .node-details-title - h1 - a(href="{{ url_for( 'projects.view', project_url=project.url) }}") {{ project.name }} + h2.px-3.pt-3 + a(href="{{ url_for( 'projects.view', project_url=project.url) }}") {{ project.name }} | {% if project.description %} .node-details-description diff --git a/src/templates/stats.pug b/src/templates/stats.pug index 2ae14414..e43d1974 100644 --- a/src/templates/stats.pug +++ b/src/templates/stats.pug @@ -49,7 +49,7 @@ h3. Now only $10 per month - .btn.btn-default + .btn.btn-outline-primary | Join the Cloud hr diff --git a/src/templates/users/edit_embed_base.pug b/src/templates/users/edit_embed_base.pug index 52743002..aa66e199 100644 --- a/src/templates/users/edit_embed_base.pug +++ b/src/templates/users/edit_embed_base.pug @@ -72,9 +72,9 @@ | none | {% endif %} - a.btn.btn-default(href="javascript:update_from_bid()") Update from Blender ID + a.btn.btn-outline-secondary(href="javascript:update_from_bid()") Update from Blender ID - input#submit_edit_user.btn.btn-default( + input#submit_edit_user.btn.btn-outline-success( data-user-id="{{user.user_id}}", type="submit" value="Submit") diff --git a/src/templates/users/login.pug b/src/templates/users/login.pug index f01f2868..e0c91e1b 100644 --- a/src/templates/users/login.pug +++ b/src/templates/users/login.pug @@ -18,11 +18,11 @@ .buttons .login-button-container //a.forgot(href="https://blender.org/id/reset") forgot your password? - button.btn.btn-success.btn-block.button-login(type="submit") + button.btn.btn-outline-success.btn-block.button-login(type="submit") i.pi-log-in | Login - //a.btn.btn-default.button-register(href="https://blender.org/id/register", target="_blank") + //a.btn.btn-outline-secondary.button-register(href="https://blender.org/id/register", target="_blank") // i.pi-star-outline // | Create Account diff --git a/src/templates/users/settings/base.pug b/src/templates/users/settings/base.pug index 5b6ad086..5cf350b3 100644 --- a/src/templates/users/settings/base.pug +++ b/src/templates/users/settings/base.pug @@ -3,7 +3,7 @@ //- can provide overrides. | {% block body %} .container - #settings + #settings.d-flex.py-4.flex-xs-column #settings-sidebar | {% block settings_sidebar %} .settings-header diff --git a/src/templates/users/settings/profile.pug b/src/templates/users/settings/profile.pug index ce9c5627..427727dd 100644 --- a/src/templates/users/settings/profile.pug +++ b/src/templates/users/settings/profile.pug @@ -28,7 +28,7 @@ span {{ _("Change Gravatar") }} .buttons - button.btn.btn-default.button-submit(type='submit') + button.btn.btn-outline-success.button-submit(type='submit') i.pi-check | {{ _("Save Changes") }} | {% endblock %} diff --git a/src/templates/users/tasks.pug b/src/templates/users/tasks.pug index 3110ffba..96c76ec9 100644 --- a/src/templates/users/tasks.pug +++ b/src/templates/users/tasks.pug @@ -137,7 +137,7 @@ script(). $('td', row).eq(4).html(render_timing(data.timing)); $('td', row).eq(5).html(render_status_label(data, data.name)); - var view_tag = ' View'; + var view_tag = ' View'; $('td', row).eq(6).html(view_tag); } });