Merge branch 'master' of git.blender.org:pillar into elastic

This commit is contained in:
2017-12-01 16:24:56 +01:00
26 changed files with 202 additions and 352 deletions

View File

@@ -20,23 +20,23 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
| {% block body %}
.dashboard-container
section#main
section.dashboard-main
| {{ navigation_tabs(title) }}
section#projects
section#sub-nav-tabs.home
nav#sub-nav-tabs.home
ul#sub-nav-tabs__list
li.nav-tabs__list-tab#subtab-blender_sync(data-tab-url='.')
li.nav-tabs__list-tab#subtab-blender_sync(data-tab-url="{{ url_for('projects.home_project')}}")
i.pi-blender
| Blender Sync
li.nav-tabs__list-tab#subtab-images(data-tab-url='images')
li.nav-tabs__list-tab#subtab-images(data-tab-url="{{ url_for('projects.home_project_shared_images')}}")
i.pi-picture
| Images
| {% block currenttab %}{% endblock %}
section#side
section.dashboard-secondary
section.announcement
img.header(
src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}")

View File

@@ -20,12 +20,12 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
| {% block body %}
.dashboard-container
section#main
section.dashboard-main
| {{ navigation_tabs(title) }}
section#projects
section#sub-nav-tabs.projects
nav#sub-nav-tabs.projects
ul#sub-nav-tabs__list
li.nav-tabs__list-tab.active(data-tab-toggle='own_projects')
| Own Projects
@@ -48,7 +48,7 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
| Create Project
| {% endif %}
section.nav-tabs__tab.active#own_projects
nav.nav-tabs__tab.active#own_projects
ul.projects__list
| {% for project in projects_user %}
li.projects__list-item(
@@ -148,7 +148,7 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
| No projects shared with you... yet!
| {% endif %}
section#side
section.dashboard-secondary
section.announcement
img.header(
src="{{ url_for('static', filename='assets/img/backgrounds/services_projects.jpg')}}")

View File

@@ -131,11 +131,6 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css', v
i.pi-cog
| {% endif %}
.project_nav-toggle-btn(
title="Toggle navigation [T]",
data-toggle="tooltip",
data-placement="right")
i.pi-angle-double-left
#project_nav(class="{{ title }}")
#project_nav-container
@@ -150,7 +145,6 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css', v
| {% endblock project_tree %}
| {% endif %}
.project_split(title="Toggle Navigation [T]")
#project_context-container
| {% if project.has_method('PUT') %}

View File

@@ -39,7 +39,7 @@
| {% if project.description %}
.node-details-description
| {{ project.description }}
| {{ project.description | markdown }}
| {% endif %}
| {# Until we implement urls for pages