Merge branch 'master' of github.com:ant-design/ant-design into step

This commit is contained in:
羽航 2015-06-25 16:33:46 +08:00
commit 7f4c2bfde0
2 changed files with 18 additions and 4 deletions

View File

@ -10,16 +10,25 @@
</h2> </h2>
<div class="code-boxes clearfix"> <div class="code-boxes clearfix">
{%- set items = resource.pages|find_demo_in_component(post.meta.directory) %} {%- set items = resource.pages|find_demo_in_component(post.meta.directory) %}
<div class="code-boxes-col"> {%- if post.meta.cols == 1 %}
<div class="code-boxes-col-1-1">
{%- for item in items %}
{%- set post = item.meta.filepath|parsePost %}
{%- include "code.html" %}
{%- endfor %}
</div>
{%- else %}
<div class="code-boxes-col-2-1">
{%- for item in items|odd %} {%- for item in items|odd %}
{%- set post = item.meta.filepath|parsePost %} {%- set post = item.meta.filepath|parsePost %}
{%- include "code.html" %} {%- include "code.html" %}
{%- endfor %} {%- endfor %}
</div> </div>
<div class="code-boxes-col"> <div class="code-boxes-col-2-1">
{%- for item in items|even %} {%- for item in items|even %}
{%- set post = item.meta.filepath|parsePost %} {%- set post = item.meta.filepath|parsePost %}
{%- include "code.html" %} {%- include "code.html" %}
{%- endfor %} {%- endfor %}
</div> </div>
{%- endif %}
</div> </div>

View File

@ -518,6 +518,7 @@ footer ul li > a {
.main-container { .main-container {
width: 100%; width: 100%;
width: calc(100% - 260px);
margin-left: 260px; margin-left: 260px;
padding: 30px 40px 120px; padding: 30px 40px 120px;
-webkit-animation: xRightMatrix .5s ease-out; -webkit-animation: xRightMatrix .5s ease-out;
@ -1642,13 +1643,17 @@ footer ul li > a {
color: #3B4357; color: #3B4357;
} }
.code-boxes-col { .code-boxes-col-1-1 {
width: 75%;
}
.code-boxes-col-2-1 {
width: 50%; width: 50%;
float: left; float: left;
padding-right: 15px; padding-right: 15px;
} }
.code-boxes-col:last-child { .code-boxes-col-2-1:last-child {
padding-right: 0; padding-right: 0;
} }