Commit 0a7420426eaf6fd446476636fb9f306b94e9e199
Merge branch 'branch' of http://192.168.1.195:9998/web_developers/javaplatform into branch
Showing
2 changed files
with
43 additions
and
35 deletions
css/libCss/common.css
| @@ -56,6 +56,11 @@ header{ | @@ -56,6 +56,11 @@ header{ | ||
| 56 | margin-right: 32px; | 56 | margin-right: 32px; |
| 57 | } | 57 | } |
| 58 | /*左侧栏--------------------------------------------------*/ | 58 | /*左侧栏--------------------------------------------------*/ |
| 59 | +.main-wrap{ | ||
| 60 | + min-width: 1400px; | ||
| 61 | + overflow-x: scroll; | ||
| 62 | + height: calc(100% - 80px); | ||
| 63 | +} | ||
| 59 | nav{ | 64 | nav{ |
| 60 | width: 200px; | 65 | width: 200px; |
| 61 | height: 100%; | 66 | height: 100%; |
index.html
| @@ -26,45 +26,48 @@ | @@ -26,45 +26,48 @@ | ||
| 26 | <!--<span class="java-loginout"></span>--> | 26 | <!--<span class="java-loginout"></span>--> |
| 27 | </div> | 27 | </div> |
| 28 | </header> | 28 | </header> |
| 29 | -<nav class="float-left"> | ||
| 30 | - <ul class="nav-ul"> | ||
| 31 | - <li class="visitActive"> | ||
| 32 | - 任你停 | ||
| 33 | - </li> | ||
| 34 | - <li> | ||
| 35 | - PDA | ||
| 36 | - </li> | ||
| 37 | - <li> | ||
| 38 | - 微信服务号 | ||
| 39 | - </li> | ||
| 40 | - <li> | ||
| 41 | - 第三方 | ||
| 42 | - </li> | ||
| 43 | - </ul> | ||
| 44 | -</nav> | ||
| 45 | -<section class="float-left"> | ||
| 46 | - <div class="section-wrap"> | ||
| 47 | - <div class="link-div"> | ||
| 48 | - <span>总体概况</span> | ||
| 49 | - <span>API 列表</span> | ||
| 50 | - </div> | ||
| 51 | - <div class="link-con"> | ||
| 52 | - <div class="link-con-1"> | ||
| 53 | - <div class="link-con-left float-left"> | ||
| 54 | - <div class="link-con-left-wrap marginright32"></div> | ||
| 55 | - <div class="link-con-left-wrap"></div> | ||
| 56 | - <div class="clearfix"></div> | ||
| 57 | - <div></div> | ||
| 58 | - </div> | ||
| 59 | - <div class="link-con-right float-left">2</div> | 29 | +<div class="main-wrap"> |
| 30 | + <nav class="float-left"> | ||
| 31 | + <ul class="nav-ul"> | ||
| 32 | + <li class="visitActive"> | ||
| 33 | + 任你停 | ||
| 34 | + </li> | ||
| 35 | + <li> | ||
| 36 | + PDA | ||
| 37 | + </li> | ||
| 38 | + <li> | ||
| 39 | + 微信服务号 | ||
| 40 | + </li> | ||
| 41 | + <li> | ||
| 42 | + 第三方 | ||
| 43 | + </li> | ||
| 44 | + </ul> | ||
| 45 | + </nav> | ||
| 46 | + <section class="float-left"> | ||
| 47 | + <div class="section-wrap"> | ||
| 48 | + <div class="link-div"> | ||
| 49 | + <span>总体概况</span> | ||
| 50 | + <span>API 列表</span> | ||
| 60 | </div> | 51 | </div> |
| 52 | + <div class="link-con"> | ||
| 53 | + <div class="link-con-1"> | ||
| 54 | + <div class="link-con-left float-left"> | ||
| 55 | + <div class="link-con-left-wrap marginright32"></div> | ||
| 56 | + <div class="link-con-left-wrap"></div> | ||
| 57 | + <div class="clearfix"></div> | ||
| 58 | + <div></div> | ||
| 59 | + </div> | ||
| 60 | + <div class="link-con-right float-left">2</div> | ||
| 61 | + </div> | ||
| 61 | 62 | ||
| 62 | 63 | ||
| 63 | - <!--API别表--> | ||
| 64 | - <div class="link-con-1 display-none">display-none</div> | 64 | + <!--API别表--> |
| 65 | + <div class="link-con-1 display-none">display-none</div> | ||
| 66 | + </div> | ||
| 65 | </div> | 67 | </div> |
| 66 | - </div> | ||
| 67 | -</section> | 68 | + </section> |
| 69 | +</div> | ||
| 70 | + | ||
| 68 | 71 | ||
| 69 | <script type="text/javascript" src="js/libJs/jquery.min.js"></script> | 72 | <script type="text/javascript" src="js/libJs/jquery.min.js"></script> |
| 70 | <script type="text/javascript" src="js/libJs/bootstrap.min.js"></script> | 73 | <script type="text/javascript" src="js/libJs/bootstrap.min.js"></script> |