Layout and style for new global menu.

src/templates/menus/notifications.pug

@@ -1,10 +1,11 @@
 | {% if current_user.is_authenticated %}
 
-li.nav-notifications
-	a.navbar-item#notifications-toggle.px-0(
-	title="Notifications",
-	data-toggle="tooltip",
-	data-placement="bottom")
+li.nav-notifications.nav-item
+	a.nav-link.px-2(
+		id="notifications-toggle",
+		title="Notifications",
+		data-toggle="tooltip",
+		data-placement="bottom")
 		i.pi-notifications-none.nav-notifications-icon
 		span#notifications-count
 			span

src/templates/menus/user_base.pug

@@ -12,25 +12,6 @@ li.dropdown
 	ul.dropdown-menu.dropdown-menu-right
 		| {% if not current_user.has_role('protected') %}
 		| {% block menu_list %}
-		li
-			a.navbar-item.px-2(
-				href="{{ url_for('projects.home_project') }}"
-				title="Home")
-				| #[i.pi-home] Home
-
-		li
-			a.navbar-item.px-2(
-				href="{{ url_for('projects.index') }}"
-				title="My Projects")
-				| #[i.pi-star] My Projects
-
-		| {% if current_user.has_organizations() %}
-		li
-			a.navbar-item.px-2(
-				href="{{ url_for('pillar.web.organizations.index') }}"
-				title="My Organizations")
-				| #[i.pi-users] My Organizations
-		| {% endif %}
 
 		li
 			a.navbar-item.px-2(

src/templates/mixins/components.pug

@@ -35,8 +35,8 @@ mixin jumbotron(title, text, image, url)
 mixin nav-secondary(title)
 	ul.nav.nav-secondary&attributes(attributes)
 		if title
-			li.font-weight-bold.px-2
-				=title
+			li.nav-item
+				span.nav-link.font-weight-bold.pointer-events-none= title
 
 		if block
 			block

src/templates/projects/_macros.pug

@@ -13,18 +13,20 @@ include ../mixins/components
 | {% endif %}
 
 +nav-secondary()
+	| {% if project.url != 'blender-cloud' %}
 	li.text-capitalize
 		a.nav-link.text-muted.px-0(href="{{ category_url }}")
-			| {{ project.category }}
+			span {{ project.category }}
 	li.px-1
 		i.pi-angle-right
 
 	+nav-secondary-link(
-		class="px-0 font-weight-bold",
+		class="px-1 font-weight-bold",
 		href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
-		| {{ project.name }}
+		span {{ project.name }}
+	| {% endif %}
 
-	| {% if project.nodes_featured %}
+	| {% if project.nodes_featured and (title !='project') %}
 	| {# In some cases featured_nodes might might be embedded #}
 	| {% if '_id' in project.nodes_featured[0] %}
 	| {% set featured_node_id=project.nodes_featured[0]._id %}
@@ -35,7 +37,7 @@ include ../mixins/components
 			href="{{ url_for('projects.view_node', project_url=project.url, node_id=featured_node_id) }}",
 			title="Explore {{ project.name }}",
 			class="{% if title == 'project' %}active{% endif %}")
-			| Explore
+			span Explore
 	| {% endif %}
 
 	| {% for link in navigation_links %}