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

navbar-container: cleanup

Browse Source
This commit is contained in:
Pablo Vazquez
2018-08-28 15:55:32 +02:00
parent f48a4883ae
commit 169a7f51f0
3 changed files with 120 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/styles/_welcome.sass
View File

@@ -10,9 +10,6 @@
li a.navbar-item li a.navbar-item
color: $color-text color: $color-text
.navbar-container
+container-behavior
.navbar-toggle .navbar-toggle
border: 2px solid $color-text-dark-primary border: 2px solid $color-text-dark-primary
color: $color-text color: $color-text

5
src/styles/project-landing.sass
View File

@@ -39,8 +39,6 @@ nav.navbar
&:hover &:hover
color: black color: black
background-color: white background-color: white
.navbar-container
+container-behavior
.navbar-toggle .navbar-toggle
border: none border: none
@@ -117,9 +115,6 @@ a.btn
max-width: 620px max-width: 620px
margin: 0 auto margin: 0 auto
.navbar-container
border-bottom: 1px solid #dddddd
.navbar-collapse .navbar-collapse
padding-left: 0 padding-left: 0

242
src/templates/layout.pug
View File

@@ -72,151 +72,149 @@ html(lang="en")
| {% endif %} | {% endif %}
| {% endwith %} | {% endwith %}
nav.navbar.navbar-expand-md nav.navbar.navbar-expand-md.fixed-top
.navbar-container a.navbar-brand(
//- header.navbar-header href="{{ url_for('main.homepage') }}",
a.navbar-brand( title="Blender Cloud")
href="{{ url_for('main.homepage') }}", span.app-logo
title="Blender Cloud") i.pi-blender-cloud-logo
span.app-logo
i.pi-blender-cloud-logo
button.navbar-toggler.text-light( button.navbar-toggler.text-light(
data-target=".navbar-collapse", data-target=".navbar-collapse",
data-toggle="collapse", data-toggle="collapse",
type="button") type="button")
span.sr-only Toggle navigation span.sr-only Toggle navigation
span.navbar-toggler-icon.d-flex.align-items-center span.navbar-toggler-icon.d-flex.align-items-center
i.pi-menu i.pi-menu
| {% block navigation_search %} | {% block navigation_search %}
.search-input .search-input
input#cloud-search( input#cloud-search(
type="text", type="text",
placeholder="Search assets, tutorials...") placeholder="Search assets, tutorials...")
i.search-icon.pi-search i.search-icon.pi-search
| {% endblock navigation_search %} | {% endblock navigation_search %}
.collapse.navbar-collapse .collapse.navbar-collapse
ul.nav.navbar-nav.ml-auto ul.navbar-nav.ml-auto
| {% if node and node.properties and node.properties.category %} | {% if node and node.properties and node.properties.category %}
| {% set category = node.properties.category %} | {% set category = node.properties.category %}
| {% else %} | {% else %}
| {% set category = title %} | {% set category = title %}
| {% endif %} | {% endif %}
| {% block navigation_sections %} | {% block navigation_sections %}
li li
a.navbar-item( a.navbar-item(
href="{{ url_for('main.main_blog') }}", href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog", title="Blender Cloud Blog",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="bottom", data-placement="bottom",
class="{% if category == 'blog' %}active{% endif %}") class="{% if category == 'blog' %}active{% endif %}")
span Blog span Blog
li(class="dropdown libraries") li.dropdown
a.navbar-item.dropdown-toggle( a.navbar-item.dropdown-toggle(
href="",
data-toggle="dropdown",
title="Libraries")
span Libraries
i.pi-angle-down
ul.dropdown-menu
li
a.navbar-item(
href="{{ url_for('projects.view', project_url='hdri') }}",
title="HDRI Library",
data-toggle="tooltip",
data-placement="left")
i.pi-globe
| HDRI
li
a.navbar-item(
href="{{ url_for('projects.view', project_url='textures') }}",
title="Textures Library",
data-toggle="tooltip",
data-placement="left")
i.pi-folder-texture
| Textures
li
a.navbar-item(
href="{{ url_for('projects.view', project_url='characters') }}",
title="Character Library",
data-toggle="tooltip",
data-placement="left")
i.pi-character
| Characters
li(class="dropdown libraries")
a.navbar-item.dropdown-toggle(
href="", href="",
data-toggle="dropdown", data-toggle="dropdown",
title="Training") title="Libraries")
span Training span Libraries
i.pi-angle-down i.pi-angle-down
ul.dropdown-menu ul.dropdown-menu.p-0
li li
a.navbar-item( a.navbar-item(
href="{{ url_for('cloud.courses') }}", href="{{ url_for('projects.view', project_url='hdri') }}",
title="Courses", title="HDRI Library",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="left") data-placement="left")
i.pi-graduation-cap i.pi-globe
| Courses | HDRI
li li
a.navbar-item( a.navbar-item(
href="{{ url_for('cloud.workshops') }}", href="{{ url_for('projects.view', project_url='textures') }}",
title="Workshops", title="Textures Library",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="left") data-placement="left")
i.pi-lightbulb i.pi-folder-texture
| Workshops | Textures
li li
a.navbar-item( a.navbar-item(
href="{{ url_for('projects.view', project_url='gallery') }}", href="{{ url_for('projects.view', project_url='characters') }}",
title="Curated artwork collection", title="Character Library",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="left") data-placement="left")
i.pi-image i.pi-character
| Art Gallery | Characters
li
a.navbar-item( li(class="dropdown libraries")
href="{{ url_for('cloud.open_projects') }}", a.navbar-item.dropdown-toggle(
title="Browse all the Open Projects", href="",
data-toggle="dropdown",
title="Training")
span Training
i.pi-angle-down
ul.dropdown-menu
li
a.navbar-item(
href="{{ url_for('cloud.courses') }}",
title="Courses",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="bottom", data-placement="left")
class="{% if category in ['open-projects', 'film'] %}active{% endif %}") i.pi-graduation-cap
span Open Projects | Courses
li li
a.navbar-item( a.navbar-item(
href="{{ url_for('cloud.services') }}", href="{{ url_for('cloud.workshops') }}",
title="Blender Cloud Services", title="Workshops",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="bottom", data-placement="left")
class="{% if category == 'services' %}active{% endif %}") i.pi-lightbulb
span Services | Workshops
| {% endblock navigation_sections %} li
a.navbar-item(
href="{{ url_for('projects.view', project_url='gallery') }}",
title="Curated artwork collection",
data-toggle="tooltip",
data-placement="left")
i.pi-image
| Art Gallery
li
a.navbar-item(
href="{{ url_for('cloud.open_projects') }}",
title="Browse all the Open Projects",
data-toggle="tooltip",
data-placement="bottom",
class="{% if category in ['open-projects', 'film'] %}active{% endif %}")
span Open Projects
li
a.navbar-item(
href="{{ url_for('cloud.services') }}",
title="Blender Cloud Services",
data-toggle="tooltip",
data-placement="bottom",
class="{% if category == 'services' %}active{% endif %}")
span Services
| {% endblock navigation_sections %}
| {% if current_user.is_anonymous %} | {% if current_user.is_anonymous %}
li li
a.navbar-item( a.navbar-item(
href="https://store.blender.org/product/membership/", href="https://store.blender.org/product/membership/",
title="Sign up") Sign up title="Sign up") Sign up
| {% endif %} | {% endif %}
| {% block navigation_user %} | {% block navigation_user %}
| {% include 'menus/notifications.html' %} | {% include 'menus/notifications.html' %}
| {% include 'menus/user.html' %} | {% include 'menus/user.html' %}
| {% endblock navigation_user %} | {% endblock navigation_user %}
.page-content .page-content