Nav Toggle Bar 에러해결

k352ex · Nov 17, 2015 · 0f75b4e · 0f75b4e
1 parent 1f8a9c0
commit 0f75b4e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -17,9 +17,10 @@
 #navbarCustom {
   margin: 0px;
   position:relative;
-  height:50px;
+  z-index: 10000;
 }
 
+
  #footer {
    background-color: #2b2b2b;
    color: #fff;

diff --git a/app/controllers/notice_controller.rb b/app/controllers/notice_controller.rb
@@ -1,7 +1,7 @@
 class NoticeController < ApplicationController
 	def index
 		@post_new = Post.new
-		@post = Post.all.order('created_at DESC').page(params[:page]).per(5)
+		@post = Post.all.order('created_at DESC').page(params[:page]).per(10)
 	end
 
 	def new

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -6,11 +6,6 @@
   <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
 
-   <!-- 마테리얼라이즈 CDN -->
-   <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.3/css/materialize.min.css">
-   <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-   <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.3/js/materialize.min.js"></script> -->
-
    <!-- 부트스트랩 CDN -->
   <meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" integrity="sha512-dTfge/zgoMYpP7QbHy4gWMEGsbsdZeCXz7irItjcC3sPUFtf0kuFbDz/ixG7ArTxmDjLXDmezHubeNikyKGVyQ==" crossorigin="anonymous">

diff --git a/app/views/notice/index.html.erb b/app/views/notice/index.html.erb
@@ -1,7 +1,7 @@
-<div style="padding:10px;"> </div>
+<div style="padding:20px;"> </div>
+
 <div class="row">
   <div class="col-md-8 col-md-offset-2">
-
 	<table class="table">
 	  	<div class="panel panel-default">
   			<div class="panel-body">
@@ -33,3 +33,5 @@
     </div>
   </div>
 </div>
+
+<div style="padding:80px;"> </div>