Skip to content

Commit

Permalink
add block btn
Browse files Browse the repository at this point in the history
  • Loading branch information
yy-dev7 committed Dec 25, 2015
1 parent 3b2b3ab commit 79ffbf2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion css/cake.css
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,7 @@ label {
width: 100%;
}

.button.large {
.button.lg {
padding: 1.375rem 2.6rem;
font-size: 1.8rem;
}
Expand Down
2 changes: 1 addition & 1 deletion css/cake.min.css

Large diffs are not rendered by default.

13 changes: 10 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<section id="cakecss-intro">
<h1>cakecss简介</h1>
<p>cakecss是基于移动端开发的轻量级material design的css库。压缩后只有15k不到。可通过bower安装。或者直接<a href="https://github.com/mervynyang/one-cake/zipball/master">下载zip文件</a></p>
<p>cakecss主要的样式定义为:<strong>类名 + 辅助样式 + 辅助样式</strong>,比如: <strong>&lt;button class=&quot;button success large&quot;&gt;button&lt;/button&gt;</strong>。可以多个辅助样式一起使用,也能单独使用。</p>
<p>cakecss主要的样式定义为:<strong>类名 + 辅助样式 + 辅助样式</strong>,比如: <strong>&lt;button class=&quot;button success lg&quot;&gt;button&lt;/button&gt;</strong>。可以多个辅助样式一起使用,也能单独使用。</p>
<br>
<p><strong>tips:</strong>在cakecss中,1rem约等于10px。建议所有单位都用rem,因为cakecss rem是根据媒体查询计算出来的。</p>
<pre>
Expand Down Expand Up @@ -173,12 +173,12 @@ <h3>形状类</h3>
<h3>大小类</h3>
<button class="button primary sm">sm</button>
<button class="button primary">default</button>
<button class="button primary large">large</button>
<button class="button primary lg">lg</button>
<pre>
<code class="html">
&lt;button class=&quot;button primary sm&quot;&gt;sm&lt;/button&gt;
&lt;button class=&quot;button primary&quot;&gt;default&lt;/button&gt;
&lt;button class=&quot;button primary large&quot;&gt;large&lt;/button&gt;
&lt;button class=&quot;button primary lg&quot;&gt;lg&lt;/button&gt;
</code>
</pre>
<h3>状态类</h3>
Expand All @@ -194,6 +194,13 @@ <h3>状态类</h3>
&lt;button class=&quot;button primary active&quot;&gt;active&lt;/button&gt;
</code>
</pre>
<h3>宽度100%的按钮</h3>
<button class="button success block">block</button>
<pre>
<code class="html">
&lt;button class=&quot;button success block&quot;&gt;block&lt;/button&gt;
</code>
</pre>
</section>
<section id="form">
<h1>表单</h1>
Expand Down
2 changes: 1 addition & 1 deletion sass/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ $button-fontsize-large: 1.8rem;
display: block;
width: 100%;
}
&.large {
&.lg {
@include button-size(large);
}
&.sm {
Expand Down

0 comments on commit 79ffbf2

Please sign in to comment.