From a5c7ec285d21c9c5ac8974954c4824a054bc44f9 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Mon, 17 Sep 2018 17:09:43 +0200 Subject: [PATCH] Style tweaks --- src/templates/_macros/_navigation.pug | 3 ++- src/templates/layout.pug | 17 +++++++++-------- src/templates/projects/home_layout.pug | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/templates/_macros/_navigation.pug b/src/templates/_macros/_navigation.pug index fc5a5ea..cec1822 100644 --- a/src/templates/_macros/_navigation.pug +++ b/src/templates/_macros/_navigation.pug @@ -17,6 +17,7 @@ include ../../../../pillar/src/templates/mixins/components span My Organizations | {% endif %} - +nav-secondary-link(href="{{ url_for('projects.home_project_shared_images')}}") + +nav-secondary-link(href="{{ url_for('projects.home_project_shared_images')}}", + class="{% if title == 'images' %}active{% endif %}") span Image Sharing | {% endmacro %} diff --git a/src/templates/layout.pug b/src/templates/layout.pug index 24dc585..8a6e0d8 100644 --- a/src/templates/layout.pug +++ b/src/templates/layout.pug @@ -93,7 +93,7 @@ html(lang="en") ul.dropdown-menu.nav-main +nav-secondary()( - class="nav-secondary-vertical float-left bg-light border-right border-left rounded-left") + class="nav-secondary-vertical float-left bg-light border-left rounded-left") +nav-secondary-link( href="{{ url_for('main.homepage') }}", data-toggle='dropdown-tab', @@ -125,13 +125,14 @@ html(lang="en") +nav-secondary-link( href="{{ url_for('cloud.services') }}", data-toggle='dropdown-tab', - data-tab-target='services') + data-tab-target='services', + class="{% if title == 'services' %}active{% endif %}") i.mr-2.pi-whoosh span Services .dropdown-menu-tab(data-tab='home') .dropdown-menu-column - +nav-secondary()(class="nav-secondary-vertical rounded-right overflow-hidden") + +nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden") +nav-secondary-link(href="{{ url_for('projects.index') }}") i.pi-star span My Projects @@ -156,7 +157,7 @@ html(lang="en") .dropdown-menu-tab(data-tab='films') .dropdown-menu-column - +nav-secondary()(class="nav-secondary-vertical rounded-right overflow-hidden") + +nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden") +nav-secondary-link( href="{{ url_for('cloud.open_projects') }}", class="nav-see-more border-bottom") @@ -182,7 +183,7 @@ html(lang="en") .dropdown-menu-tab(data-tab='training') .dropdown-menu-column - +nav-secondary('Training')(class="nav-secondary-vertical") + +nav-secondary('Training')(class="nav-secondary-vertical rounded-right border-left overflow-hidden") +nav-secondary-link( href="{{ url_for('cloud.courses') }}") i.pi-graduation-cap @@ -200,7 +201,7 @@ html(lang="en") .dropdown-menu-tab(data-tab='libraries') .dropdown-menu-column - +nav-secondary('Libraries')(class="nav-secondary-vertical rounded-right overflow-hidden") + +nav-secondary('Libraries')(class="nav-secondary-vertical rounded-right border-left overflow-hidden") +nav-secondary-link(href="{{ url_for('projects.view', project_url='textures') }}") i.pi-folder-texture span Textures @@ -219,7 +220,7 @@ html(lang="en") .dropdown-menu-tab(data-tab='services') .dropdown-menu-column - +nav-secondary()(class="nav-secondary-vertical rounded-right overflow-hidden") + +nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden") +nav-secondary-link( href="{{ url_for('cloud.services') }}", class="nav-see-more border-bottom") @@ -274,7 +275,7 @@ html(lang="en") | {% endblock navigation_user %} | {% if current_user.is_anonymous %} - li.pt-1 + li a.btn.btn-sm.btn-primary.px-3.mx-1( href="https://store.blender.org/product/membership/", title="Sign up") Sign up diff --git a/src/templates/projects/home_layout.pug b/src/templates/projects/home_layout.pug index 275bf70..9173261 100644 --- a/src/templates/projects/home_layout.pug +++ b/src/templates/projects/home_layout.pug @@ -29,10 +29,10 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba section#projects.bg-white +nav-secondary()(id='sub-nav-tabs__list') +nav-secondary-link(id="subtab-blender_sync", data-tab-url="{{ url_for('projects.home_project')}}") - | Blender Sync + span Blender Sync +nav-secondary-link(id="subtab-images", data-tab-url="{{ url_for('projects.home_project_shared_images')}}") - | Images + span Images | {% block currenttab %}{% endblock %} | {% endblock %}