archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Style tweaks

Browse Source
This commit is contained in:
Pablo Vazquez
2018-09-17 17:09:43 +02:00
parent 7fff47c5c5
commit a5c7ec285d
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/templates/_macros/_navigation.pug
View File

@@ -17,6 +17,7 @@ include ../../../../pillar/src/templates/mixins/components
span My Organizations span My Organizations
| {% endif %} | {% 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 span Image Sharing
| {% endmacro %} | {% endmacro %}

17
src/templates/layout.pug
View File

@@ -93,7 +93,7 @@ html(lang="en")
ul.dropdown-menu.nav-main ul.dropdown-menu.nav-main
+nav-secondary()( +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( +nav-secondary-link(
href="{{ url_for('main.homepage') }}", href="{{ url_for('main.homepage') }}",
data-toggle='dropdown-tab', data-toggle='dropdown-tab',
@@ -125,13 +125,14 @@ html(lang="en")
+nav-secondary-link( +nav-secondary-link(
href="{{ url_for('cloud.services') }}", href="{{ url_for('cloud.services') }}",
data-toggle='dropdown-tab', data-toggle='dropdown-tab',
data-tab-target='services') data-tab-target='services',
class="{% if title == 'services' %}active{% endif %}")
i.mr-2.pi-whoosh i.mr-2.pi-whoosh
span Services span Services
.dropdown-menu-tab(data-tab='home') .dropdown-menu-tab(data-tab='home')
.dropdown-menu-column .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') }}") +nav-secondary-link(href="{{ url_for('projects.index') }}")
i.pi-star i.pi-star
span My Projects span My Projects
@@ -156,7 +157,7 @@ html(lang="en")
.dropdown-menu-tab(data-tab='films') .dropdown-menu-tab(data-tab='films')
.dropdown-menu-column .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( +nav-secondary-link(
href="{{ url_for('cloud.open_projects') }}", href="{{ url_for('cloud.open_projects') }}",
class="nav-see-more border-bottom") class="nav-see-more border-bottom")
@@ -182,7 +183,7 @@ html(lang="en")
.dropdown-menu-tab(data-tab='training') .dropdown-menu-tab(data-tab='training')
.dropdown-menu-column .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( +nav-secondary-link(
href="{{ url_for('cloud.courses') }}") href="{{ url_for('cloud.courses') }}")
i.pi-graduation-cap i.pi-graduation-cap
@@ -200,7 +201,7 @@ html(lang="en")
.dropdown-menu-tab(data-tab='libraries') .dropdown-menu-tab(data-tab='libraries')
.dropdown-menu-column .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') }}") +nav-secondary-link(href="{{ url_for('projects.view', project_url='textures') }}")
i.pi-folder-texture i.pi-folder-texture
span Textures span Textures
@@ -219,7 +220,7 @@ html(lang="en")
.dropdown-menu-tab(data-tab='services') .dropdown-menu-tab(data-tab='services')
.dropdown-menu-column .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( +nav-secondary-link(
href="{{ url_for('cloud.services') }}", href="{{ url_for('cloud.services') }}",
class="nav-see-more border-bottom") class="nav-see-more border-bottom")
@@ -274,7 +275,7 @@ html(lang="en")
| {% endblock navigation_user %} | {% endblock navigation_user %}
| {% if current_user.is_anonymous %} | {% if current_user.is_anonymous %}
li.pt-1 li
a.btn.btn-sm.btn-primary.px-3.mx-1( a.btn.btn-sm.btn-primary.px-3.mx-1(
href="https://store.blender.org/product/membership/", href="https://store.blender.org/product/membership/",
title="Sign up") Sign up title="Sign up") Sign up

4
src/templates/projects/home_layout.pug
View File

@@ -29,10 +29,10 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
section#projects.bg-white section#projects.bg-white
+nav-secondary()(id='sub-nav-tabs__list') +nav-secondary()(id='sub-nav-tabs__list')
+nav-secondary-link(id="subtab-blender_sync", data-tab-url="{{ url_for('projects.home_project')}}") +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')}}") +nav-secondary-link(id="subtab-images", data-tab-url="{{ url_for('projects.home_project_shared_images')}}")
| Images span Images
| {% block currenttab %}{% endblock %} | {% block currenttab %}{% endblock %}
| {% endblock %} | {% endblock %}