Skip to content

Commit

Permalink
made bootstrap ui work with dropdowns
Browse files Browse the repository at this point in the history
  • Loading branch information
aredfox committed Mar 29, 2017
1 parent 20fc93a commit a2967df
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 14 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -56,4 +56,4 @@
"angular-ui-router": "^0.4.2",
"bootstrap": "^3.3.7"
}
}
}
2 changes: 0 additions & 2 deletions src/app/app.module.ts
Expand Up @@ -3,12 +3,10 @@ import * as angular from 'angular';

// application modules
import { moduleName as coreModule } from './core/core.module';
// import { moduleName as contactsModule } from './contacts/contacts.module';
import { moduleName as todosModule } from './todos/todos.module';

export const moduleName =
angular.module('application', [
coreModule,
// contactsModule,
todosModule
]).name;
41 changes: 41 additions & 0 deletions src/app/core/components/root/root.component.html
@@ -0,0 +1,41 @@
<nav class="navbar navbar-default" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" ng-click="isNavCollapsed = !isNavCollapsed">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">ToDoSth</a>
</div>
<div class="collapse navbar-collapse" uib-collapse="isNavCollapsed">
<ul class="nav navbar-nav">
<li><a href="#">Link 1</a></li>
<li><a href="#">Link 2</a></li>
<li uib-dropdown on-toggle="toggled(open)">
<a href id="simple-dropdown" uib-dropdown-toggle>Link 3 <span class="caret"></span></a>
<ul class="dropdown-menu" uib-dropdown-menu aria-labelledby="simple-dropdown">
<li><a href="#">SubItem 1</a></li>
<li><a href="#">SubItem 2</a></li>
<li><a href="#">SubItem 3</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">SubItem 4</a></li>
</ul>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li uib-dropdown on-toggle="toggled(open)">
<a href id="simple-dropdown" class="nav-text" uib-dropdown-toggle>Signed in as John Doe <span class="caret"></span></a>
<ul class="dropdown-menu" uib-dropdown-menu aria-labelledby="simple-dropdown">
<li><a href="#">Profile</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">Sign Out</a></li>
</ul>
</li>
</ul>
</div>
</nav>

<div class="container-fluid">
<div ui-view></div>
</div>
5 changes: 1 addition & 4 deletions src/app/core/components/root/root.component.ts
Expand Up @@ -5,9 +5,6 @@ export class Root implements angular.IComponentOptions {
template: string;

constructor() {
this.template = `
<h1>TODO</h1>
<div ui-view></div>
`;
this.template = require('./root.component.html');
}
}
16 changes: 10 additions & 6 deletions src/index.html
@@ -1,15 +1,19 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

<title><%= htmlWebpackPlugin.options.title %></title>
<title>
<%= htmlWebpackPlugin.options.title %>
</title>
</head>


<body>
<root>Loading</root>
<root>Loading...</root>
</body>
</html>

</html>
1 change: 1 addition & 0 deletions src/vendor.ts
@@ -1,4 +1,5 @@
import 'angular';
import 'angular-ui-router';

import 'angular-ui-bootstrap';
import 'bootstrap/dist/css/bootstrap.css';
2 changes: 1 addition & 1 deletion webpack.config.js
Expand Up @@ -51,7 +51,7 @@ module.exports = {

plugins: [
new HtmlWebpackPlugin({
title: 'AngularJS - Webpack',
title: 'ToDoSth',
template: 'index.html',
inject: true
}),
Expand Down

0 comments on commit a2967df

Please sign in to comment.