fix height; add some example in form.html

rlog · Jun 28, 2013 · 15ac94c · 15ac94c
1 parent 5bf4c8d
commit 15ac94c
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 6 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -249,7 +249,7 @@ module.exports = function(grunt) {
                 tasks: [
                     'dev', 
                     'devtest',
-                    'copy:target2pub'
+                    //'copy:target2pub'
                 ]
             }
         }

diff --git a/css/cardkit/_unit.scss b/css/cardkit/_unit.scss
@@ -860,8 +860,8 @@
       font-size:$title_size;
       color:$text_color;
       width:100%;
-      height:20px;
       line-height:20px;
+      height:20px+2*$space;
       padding:$space;
       border:1px solid rgb(185,185,185);
       @include box-sizing(border-box);

diff --git a/dist/css/main.css b/dist/css/main.css
@@ -1393,8 +1393,8 @@ body.no-overflowscroll .ck-mini-unit[data-style="slide"] .ck-list-wrap {
   font-size: 13px;
   color: #252525;
   width: 100%;
-  height: 20px;
   line-height: 20px;
+  height: 40px;
   padding: 10px;
   border: 1px solid #b9b9b9;
   -webkit-box-sizing: border-box;

diff --git a/dist/css/main.min.css b/dist/css/main.min.css
diff --git a/examples/dist/css/main.css b/examples/dist/css/main.css
@@ -1393,8 +1393,8 @@ body.no-overflowscroll .ck-mini-unit[data-style="slide"] .ck-list-wrap {
   font-size: 13px;
   color: #252525;
   width: 100%;
-  height: 20px;
   line-height: 20px;
+  height: 40px;
   padding: 10px;
   border: 1px solid #b9b9b9;
   -webkit-box-sizing: border-box;

diff --git a/examples/dist/css/main.min.css b/examples/dist/css/main.min.css
diff --git a/examples/form.html b/examples/form.html
@@ -85,6 +85,35 @@ <h2>CardKit / Unit</h2>
             <header class="ckd-hd">Source code</header>
         </div>
 
+        <div class="ck-form-unit">
+            <div class="ckd-item item-accounts">
+                <label>帐号</label>
+                <input type="text" name="form_email" placeholder="邮箱/手机号" value="" tabindex="1"/>
+            </div>
+
+            <div class="ckd-item">
+                <label>密码</label>
+                <input type="password" name="form_password" tabindex="2">
+            </div>
+
+            <div class="ckd-item item-remember">
+                <input type="hidden" name="source" value="simple"/>
+                <input id="remember" type="checkbox" name="remember">
+                <label for="remember">下次自动登录</label>
+                <a class="reg_link" id="reg_link" href="" target="_self">注册帐号</a>
+            </div>
+        </div>
+        <div class="ck-form-unit">
+            <div class="ckd-item">
+                <label for="feedback-username">姓名</label>
+                <input id="feedback-username" type="text" name="username" placeholder="你的名号" value="" />
+            </div>
+            <div class="ckd-item">
+                <label for="feedback-comment">反馈内容</label>
+                <textarea id="feedback-comment" name="comment" placeholder="描述你所遇到的问题" maxlength="800"></textarea>
+                <label><em>如有任何意见或建议，也可在此提出</em></label>
+            </div>
+        </div>
     </div>
 
     <div class="ck-card" id="consoleCard">