Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project

This commit is contained in:
daiao 2017-03-21 12:38:21 +08:00
commit 6a9684937e
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@
</div>
</div>
<div class="content-editor col-width2 fl">
<div class="panel-header2 clearfix">
<div class="panel-header-border clearfix">
<h3 class="fl">
<%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
</h3>

View File

@ -102,7 +102,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:245px; margin-top
.content-info{ width:49%; min-width:450px;}
.content-editor{ width:49%; min-width:450px; margin-left:15px; }
.panel-header{ border-bottom:1px solid #eee; padding:10px 15px;}
.panel-header2{padding:10px 15px;}
.panel-header-border{ border:1px solid #eee; padding:10px 15px; border-bottom:none;}
/* tab */
.tab_content{ width: 100%; margin: 0 auto; background:#fff; }
#tab_nav {height:40px;background: #eff0f4; }