Skip to content

Commit 0ccd385

Browse files
author
K.C. Hunter
committed
update
1 parent 77af912 commit 0ccd385

4 files changed

Lines changed: 16 additions & 15 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
bower_components/
22
node_modules/
33
docs/
4-
.sass-cache/
4+
.sass-cache/
5+
bin/

src/index.html

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<body data-ng-app="WebApp">
1414

1515
<header>
16-
<div class="navbar navbar-inverse">
16+
<div class="navbar navbar-inverse navbar-fixed-top">
1717
<div class="container-fluid">
1818
<div class="navbar-header">
1919
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -22,14 +22,14 @@
2222
<span class="icon-bar"></span>
2323
<span class="icon-bar"></span>
2424
</button>
25-
<a class="navbar-brand" href="#">MCU</a>
25+
<a class="navbar-brand" href="/">MCU</a>
2626
</div>
2727

2828
<div class="collpase navbar-collapse" id="bs-example-navbar-collapse-1">
2929
<ul class="nav navbar-nav">
30-
<li class="active"><a href="#">Home<span class="sr-only"></span></a></li>
31-
<li><a href="/movies" title="Films">Films</a></li>
32-
<li><a href="/characters" title="Characters">Characters</a></li>
30+
<li data-ng-class="{active: isActive('/')}"><a href="#">Home<span class="sr-only"></span></a></li>
31+
<li data-ng-class="{active: isActive('/')}"><a href="/movies" title="Films">Films</a></li>
32+
<li data-ng-class="{active: isActive('/')}"><a href="/characters" title="Characters">Characters</a></li>
3333
<li class="dropdown">
3434
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-exapnded="false">Phases</span class="caret"></span></a>
3535
<ul class="dropdown-menu" role="menu">
@@ -51,7 +51,9 @@
5151
</header>
5252

5353
<div class="mainContainer">
54-
54+
<div class="jumbotron">
55+
<h1>Marvel Cinematic Universe Fan Page</h1>
56+
</div>
5557
</div>
5658

5759
<footer>
@@ -63,10 +65,12 @@
6365

6466
<div class="col-sm-6 col-md-5">
6567
<div class="footerSearch">
66-
<form>
67-
<input type="text" name="searchWord" id="searchWord" placeholder="Search for ..." required />
68-
<input type="button" name="Search" id="search" value="Search" />
69-
</form>
68+
<div class="input-group">
69+
<input type="text" class="form-control" placeholder="Search for ...">
70+
<span class="input-group-btn">
71+
<button class="btn btn-default" type="button" role="button">Search</button>
72+
</span>
73+
</div>
7074
</div>
7175
</div>
7276
</div>

src/resources/js/a_module.js

Whitespace-only changes.

src/resources/js/annotate.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)