이승윤 / OpenSource-MyCookBook

Go to a project
Toggle navigation Toggle navigation pinning
이승윤
e170968d 2 parents 49101395 d2701c94

Merge branch 'style/header' into 'develop' 

style: header 스타일 변경



See merge request !10
Inline Side-by-side
Showing 2 changed files with 9 additions and 9 deletions
1 -</div> 1 +</div>
2 </body> 2 </body>
3 <script 3 <script
4 src="https://code.jquery.com/jquery-3.2.1.min.js" 4 src="https://code.jquery.com/jquery-3.2.1.min.js"
......
...@@ -15,9 +15,8 @@ ...@@ -15,9 +15,8 @@
15 <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> 15 <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
16 </head> 16 </head>
17 <body> 17 <body>
18 - <div class="container" style="padding-top: 10px;"> 18 + <div class="container" style="margin-top: 15px;">
19 - <nav class="navbar navbar-inverse"> 19 + <div>
20 - <div class="container-fluid">
21 <div class="navbar-header"> 20 <div class="navbar-header">
22 <!-- 오른쪽 메뉴바 --> 21 <!-- 오른쪽 메뉴바 -->
23 <button type="button" class="collapsed navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-9" aria-expanded="false"> 22 <button type="button" class="collapsed navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-9" aria-expanded="false">
...@@ -27,10 +26,10 @@ ...@@ -27,10 +26,10 @@
27 <span class="icon-bar"></span> 26 <span class="icon-bar"></span>
28 </button> 27 </button>
29 <a href="/" class="navbar-brand">MyCookBook</a> 28 <a href="/" class="navbar-brand">MyCookBook</a>
30 - </div> 29 + </div>
31 - <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-9"> 30 + <div class="collapse navbar-collapse">
32 <ul class="nav navbar-nav"> 31 <ul class="nav navbar-nav">
33 - <li> 32 + <li >
34 <a href="/">Home</a> 33 <a href="/">Home</a>
35 </li> 34 </li>
36 <li><a href="/categori/products">Categori</a></li> 35 <li><a href="/categori/products">Categori</a></li>
...@@ -42,5 +41,6 @@ ...@@ -42,5 +41,6 @@
42 <%}%> 41 <%}%>
43 </ul> 42 </ul>
44 </div> 43 </div>
45 - </div> 44 + </div>
46 - </nav> 45 + <hr style=" border: 2px solid #4dabf7" />
46 +
......