Revert "load bootstrap (doh)"

This reverts commit 7d8cea1.
meanjs · Jul 7, 2015 · 73b5fa3 · 73b5fa3
1 parent 73be794
commit 73b5fa3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/config/assets/default.js b/config/assets/default.js
@@ -8,8 +8,6 @@ module.exports = {
 				'public/lib/bootstrap/dist/css/bootstrap-theme.css'
 			],
 			js: [
-				'public/lib/jquery/dist/jquery.js',
-				'public/lib/bootstrap/dist/js/bootstrap.js',
 				'public/lib/angular/angular.js',
 				'public/lib/angular-resource/angular-resource.js',
 				'public/lib/angular-animate/angular-animate.js',

diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
@@ -10,8 +10,8 @@
 	</div>
 	<nav class="collapse navbar-collapse" collapse="!isCollapsed" role="navigation">
 		<ul class="nav navbar-nav" data-ng-if="menu.shouldRender(authentication.user);">
-			<li data-ng-repeat="item in menu.items | orderBy: 'position'" data-ng-if="item.shouldRender(authentication.user);" ng-switch="item.type" data-ng-class="{ active: $state.includes(item.state), dropdown: item.type === 'dropdown' }" class="{{item.class}}">
-				<a ng-switch-when="dropdown" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{::item.title}}&nbsp;<span class="caret"></span></a>
+			<li data-ng-repeat="item in menu.items | orderBy: 'position'" data-ng-if="item.shouldRender(authentication.user);" ng-switch="item.type" data-ng-class="{ active: $state.includes(item.state), dropdown: item.type === 'dropdown' }" class="{{item.class}}" dropdown="item.type === 'dropdown'">
+				<a ng-switch-when="dropdown" href="#" class="dropdown-toggle" dropdown-toggle role="button">{{::item.title}}&nbsp;<span class="caret"></span></a>
 				<ul ng-switch-when="dropdown" class="dropdown-menu">
 					<li data-ng-repeat="subitem in item.items | orderBy: 'position'" data-ng-if="subitem.shouldRender(authentication.user);" data-ui-sref-active="active">
 						<a data-ui-sref="{{subitem.state}}" data-ng-bind="subitem.title"></a>
@@ -30,12 +30,12 @@
 			</li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right" data-ng-show="authentication.user">
-			<li class="dropdown">
-				<a href="#" class="dropdown-toggle user-header-dropdown-toggle" data-toggle="dropdown">
+			<li class="dropdown" dropdown>
+				<a href="#" class="dropdown-toggle user-header-dropdown-toggle" dropdown-toggle role="button">
 					<img data-ng-src="{{authentication.user.profileImageURL}}" alt="{{authentication.user.displayName}}" class="header-profile-image"/>
 					<span data-ng-bind="authentication.user.displayName"></span> <b class="caret"></b>
 				</a>
-				<ul class="dropdown-menu">
+				<ul class="dropdown-menu" role="menu">
 					<li data-ui-sref-active="active">
 						<a data-ui-sref="settings.profile">Edit Profile</a>
 					</li>