김재현

Merge를 위한 커밋

...@@ -5,3 +5,8 @@ body { ...@@ -5,3 +5,8 @@ body {
5 a { 5 a {
6 color: #00b7ff; 6 color: #00b7ff;
7 } 7 }
8 +#map {
9 + width: 100%;
10 + height: 400px;
11 + background-color: grey;
12 +}
......
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <head> 3 <head>
4 + <meta charset="utf-8">
5 + <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 + <meta name="viewport" content="width=device-width, initial-scale=1">
4 <title><%= title %></title> 7 <title><%= title %></title>
8 + <link rel='stylesheet' href='/stylesheets/bootstrap.css'/>
5 <link rel='stylesheet' href='/stylesheets/style.css'/> 9 <link rel='stylesheet' href='/stylesheets/style.css'/>
10 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
11 + <script src="/javascripts/bootstrap.js"></script>
6 </head> 12 </head>
7 <body> 13 <body>
8 - <h1><%= title %></h1> 14 + <nav class="navbar navbar-inverse navbar-fixed-top">
9 - <p>Welcome to <%= title %></p> 15 + <div class="container">
16 + <div class="navbar-header">
17 + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
18 + <span class="sr-only">Toggle navigation</span>
19 + <span class="icon-bar"></span>
20 + <span class="icon-bar"></span>
21 + <span class="icon-bar"></span>
22 + </button>
23 + <a class="navbar-brand" href="#">Project name</a>
24 + </div>
25 + <div id="navbar" class="collapse navbar-collapse">
26 + <ul class="nav navbar-nav">
27 + <li class="active"><a href="#">Home</a></li>
28 + <li><a href="#about">About</a></li>
29 + <li><a href="#contact">Contact</a></li>
30 + </ul>
31 + </div><!--/.nav-collapse -->
32 + </div>
33 + </nav>
34 +
35 + <div class="container">
36 + <div class="starter-template">
37 + <h1>Welcome to <%= title %></h1>
38 + <p class="lead">Use this document as a way to quickly start any new project.<br> All you get is this text and a mostly barebones HTML document.</p>
39 + </div>
40 + </div><!-- /.container -->
10 </body> 41 </body>
11 </html> 42 </html>
......