Skip to content

Commit d73ac2a

Browse files
dexteryydexteryy
committed
add ckd-opt, bugfix
1 parent 57682be commit d73ac2a

21 files changed

+110
-54
lines changed

‎css/cardkit/_unit.scss

+18-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
}
111111

112112
.ck-hdopt-wrap {
113-
top:-2px;
113+
bottom:-5px;
114114
background:$view_color;
115115
}
116116

@@ -190,6 +190,7 @@
190190
//padding:0 0 $space 0;
191191
line-height:1.6;
192192
margin-bottom:$space;
193+
position:relative;
193194

194195
.ck-hd {
195196
font-size: $headtitle_size;
@@ -203,6 +204,11 @@
203204

204205
}
205206

207+
.ck-hdopt-wrap {
208+
bottom:-4px;
209+
background:$view_color;
210+
}
211+
206212
.ck-unit-wrap > footer {
207213
border-color:$view_border_color;
208214
}
@@ -289,7 +295,7 @@
289295
.ck-hdopt-wrap {
290296
display:inline-block;
291297
position:absolute;
292-
top:$space/2 + 1px;
298+
bottom:$space/2 - 1px;
293299
right:0;
294300
z-index:$zindex_item + $zindex_step;
295301
font-size:$title_size;
@@ -406,6 +412,14 @@
406412
position:relative;
407413
}
408414

415+
.ck-opt {
416+
float:right;
417+
width:40px;
418+
margin:2px 0 0 $space;
419+
position:relative;
420+
z-index:$zindex_item + $zindex_step;
421+
}
422+
409423
.ck-author-info-wrap,
410424
.ck-info-wrap {
411425
display:inline;
@@ -541,6 +555,7 @@
541555

542556
.ck-icon,
543557
.ck-desc-wrap,
558+
.ck-opt,
544559
.ck-info-wrap {
545560
display:none;
546561
}
@@ -572,6 +587,7 @@
572587
&[data-style="grid"] {
573588

574589
.ck-author-box,
590+
.ck-opt,
575591
.ck-info-wrap,
576592
.ck-meta-wrap,
577593
.ck-content-wrap {

‎dist/css/main.css

+16-2
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ body.no-overflowscroll [data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper
738738
color: #787878;
739739
}
740740
[data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper]) .ck-hd-wrap .ck-hdopt-wrap, [data-cfg-plainhd="true"].ck-list-unit:not([data-cfg-paper]):not([data-style="split"]) .ck-hd-wrap .ck-hdopt-wrap, [data-cfg-plainhd="true"].ck-form-unit .ck-hd-wrap .ck-hdopt-wrap, [data-cfg-plainhd="true"].ck-blank-unit .ck-hd-wrap .ck-hdopt-wrap, .ck-list-unit[data-style="split"] .ck-hd-wrap .ck-hdopt-wrap, .ck-mini-unit[data-style="slide"] .ck-hd-wrap .ck-hdopt-wrap, .ck-box-unit[data-cfg-plain] .ck-hd-wrap .ck-hdopt-wrap {
741-
top: -2px;
741+
bottom: -5px;
742742
background: #f2f2f2;
743743
}
744744
[data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper]) .ck-hd-wrap .ck-link-mask, [data-cfg-plainhd="true"].ck-list-unit:not([data-cfg-paper]):not([data-style="split"]) .ck-hd-wrap .ck-link-mask, [data-cfg-plainhd="true"].ck-form-unit .ck-hd-wrap .ck-link-mask, [data-cfg-plainhd="true"].ck-blank-unit .ck-hd-wrap .ck-link-mask, .ck-list-unit[data-style="split"] .ck-hd-wrap .ck-link-mask, .ck-mini-unit[data-style="slide"] .ck-hd-wrap .ck-link-mask, .ck-box-unit[data-cfg-plain] .ck-hd-wrap .ck-link-mask {
@@ -801,6 +801,7 @@ body.no-overflowscroll [data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper
801801
.ck-box-unit[data-cfg-paper] .ck-hd-wrap, .ck-list-unit[data-cfg-paper] .ck-hd-wrap {
802802
line-height: 1.6;
803803
margin-bottom: 10px;
804+
position: relative;
804805
}
805806
.ck-box-unit[data-cfg-paper] .ck-hd-wrap .ck-hd, .ck-list-unit[data-cfg-paper] .ck-hd-wrap .ck-hd {
806807
font-size: 20px;
@@ -810,6 +811,10 @@ body.no-overflowscroll [data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper
810811
.ck-box-unit[data-cfg-paper] .ck-hd-wrap:last-child, .ck-list-unit[data-cfg-paper] .ck-hd-wrap:last-child {
811812
margin-bottom: 0;
812813
}
814+
.ck-box-unit[data-cfg-paper] .ck-hdopt-wrap, .ck-list-unit[data-cfg-paper] .ck-hdopt-wrap {
815+
bottom: -4px;
816+
background: #f2f2f2;
817+
}
813818
.ck-box-unit[data-cfg-paper] .ck-unit-wrap > footer, .ck-list-unit[data-cfg-paper] .ck-unit-wrap > footer {
814819
border-color: #e6e6e6;
815820
}
@@ -881,7 +886,7 @@ body.no-overflowscroll .ck-unit-wrap {
881886
.ck-hdopt-wrap {
882887
display: inline-block;
883888
position: absolute;
884-
top: 6px;
889+
bottom: 4px;
885890
right: 0;
886891
z-index: 110;
887892
font-size: 13px;
@@ -960,6 +965,13 @@ body.no-overflowscroll .ck-unit-wrap {
960965
overflow: hidden;
961966
position: relative;
962967
}
968+
.ck-list-unit .ck-opt, .ck-mini-unit .ck-opt {
969+
float: right;
970+
width: 40px;
971+
margin: 2px 0 0 10px;
972+
position: relative;
973+
z-index: 110;
974+
}
963975
.ck-list-unit .ck-author-info-wrap, .ck-mini-unit .ck-author-info-wrap,
964976
.ck-list-unit .ck-info-wrap,
965977
.ck-mini-unit .ck-info-wrap {
@@ -1074,6 +1086,7 @@ body.no-overflowscroll .ck-unit-wrap {
10741086
}
10751087
.ck-list-unit[data-style="more"] .ck-icon,
10761088
.ck-list-unit[data-style="more"] .ck-desc-wrap,
1089+
.ck-list-unit[data-style="more"] .ck-opt,
10771090
.ck-list-unit[data-style="more"] .ck-info-wrap {
10781091
display: none;
10791092
}
@@ -1086,6 +1099,7 @@ body.no-overflowscroll .ck-unit-wrap {
10861099
color: #252525;
10871100
}
10881101
.ck-list-unit[data-style="grid"] .ck-author-box,
1102+
.ck-list-unit[data-style="grid"] .ck-opt,
10891103
.ck-list-unit[data-style="grid"] .ck-info-wrap,
10901104
.ck-list-unit[data-style="grid"] .ck-meta-wrap,
10911105
.ck-list-unit[data-style="grid"] .ck-content-wrap {

‎dist/css/main.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/main.js

+10-9
Large diffs are not rendered by default.

‎dist/js/main.min.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/mod/mo/console.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/data/form.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
3-
"html": "<form action='post_result.html' id='ajaxForm1'> <div class='ck-form-unit'> <div class='ckd-item'> <label class='ck-title'>章节名</label> <input type='text' value='' name='a' placeholder='章节名'> </div> <div class='ckd-item'> <label class='ck-title'>笔记内容</label> <textarea name='b' placeholder='笔记内容'></textarea> <label><em>注释</em></label> </div> </div><script>console.info('json loaded')</script>",
2+
"html": '<form action="index.html" id="jsonForm1"> <div class="ck-form-unit"> <div class="ckd-item"> <label class="ck-title">章节名</label> <input type="text" value="" name="a" placeholder="章节名"> </div> <div class="ckd-item"> <label class="ck-title">笔记内容</label> <textarea name="b" placeholder="笔记内容"></textarea> <label><em><a href="index.html" target="_self">测试链接</a></em></label> </div> </div> </form>'
3+
+ '<script>console.info("json loaded");require(["dollar", "cardkit/app"], function($, ck){ ck.modalCard.event.bind("confirmOnThis", function(modal){ $("#jsonForm1").trigger("submit"); }); });</script>',
44
"extra_data": {
55
"name": "test"
66
}

‎examples/dist/css/main.css

+16-2
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ body.no-overflowscroll [data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper
738738
color: #787878;
739739
}
740740
[data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper]) .ck-hd-wrap .ck-hdopt-wrap, [data-cfg-plainhd="true"].ck-list-unit:not([data-cfg-paper]):not([data-style="split"]) .ck-hd-wrap .ck-hdopt-wrap, [data-cfg-plainhd="true"].ck-form-unit .ck-hd-wrap .ck-hdopt-wrap, [data-cfg-plainhd="true"].ck-blank-unit .ck-hd-wrap .ck-hdopt-wrap, .ck-list-unit[data-style="split"] .ck-hd-wrap .ck-hdopt-wrap, .ck-mini-unit[data-style="slide"] .ck-hd-wrap .ck-hdopt-wrap, .ck-box-unit[data-cfg-plain] .ck-hd-wrap .ck-hdopt-wrap {
741-
top: -2px;
741+
bottom: -5px;
742742
background: #f2f2f2;
743743
}
744744
[data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper]) .ck-hd-wrap .ck-link-mask, [data-cfg-plainhd="true"].ck-list-unit:not([data-cfg-paper]):not([data-style="split"]) .ck-hd-wrap .ck-link-mask, [data-cfg-plainhd="true"].ck-form-unit .ck-hd-wrap .ck-link-mask, [data-cfg-plainhd="true"].ck-blank-unit .ck-hd-wrap .ck-link-mask, .ck-list-unit[data-style="split"] .ck-hd-wrap .ck-link-mask, .ck-mini-unit[data-style="slide"] .ck-hd-wrap .ck-link-mask, .ck-box-unit[data-cfg-plain] .ck-hd-wrap .ck-link-mask {
@@ -801,6 +801,7 @@ body.no-overflowscroll [data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper
801801
.ck-box-unit[data-cfg-paper] .ck-hd-wrap, .ck-list-unit[data-cfg-paper] .ck-hd-wrap {
802802
line-height: 1.6;
803803
margin-bottom: 10px;
804+
position: relative;
804805
}
805806
.ck-box-unit[data-cfg-paper] .ck-hd-wrap .ck-hd, .ck-list-unit[data-cfg-paper] .ck-hd-wrap .ck-hd {
806807
font-size: 20px;
@@ -810,6 +811,10 @@ body.no-overflowscroll [data-cfg-plainhd="true"].ck-box-unit:not([data-cfg-paper
810811
.ck-box-unit[data-cfg-paper] .ck-hd-wrap:last-child, .ck-list-unit[data-cfg-paper] .ck-hd-wrap:last-child {
811812
margin-bottom: 0;
812813
}
814+
.ck-box-unit[data-cfg-paper] .ck-hdopt-wrap, .ck-list-unit[data-cfg-paper] .ck-hdopt-wrap {
815+
bottom: -4px;
816+
background: #f2f2f2;
817+
}
813818
.ck-box-unit[data-cfg-paper] .ck-unit-wrap > footer, .ck-list-unit[data-cfg-paper] .ck-unit-wrap > footer {
814819
border-color: #e6e6e6;
815820
}
@@ -881,7 +886,7 @@ body.no-overflowscroll .ck-unit-wrap {
881886
.ck-hdopt-wrap {
882887
display: inline-block;
883888
position: absolute;
884-
top: 6px;
889+
bottom: 4px;
885890
right: 0;
886891
z-index: 110;
887892
font-size: 13px;
@@ -960,6 +965,13 @@ body.no-overflowscroll .ck-unit-wrap {
960965
overflow: hidden;
961966
position: relative;
962967
}
968+
.ck-list-unit .ck-opt, .ck-mini-unit .ck-opt {
969+
float: right;
970+
width: 40px;
971+
margin: 2px 0 0 10px;
972+
position: relative;
973+
z-index: 110;
974+
}
963975
.ck-list-unit .ck-author-info-wrap, .ck-mini-unit .ck-author-info-wrap,
964976
.ck-list-unit .ck-info-wrap,
965977
.ck-mini-unit .ck-info-wrap {
@@ -1074,6 +1086,7 @@ body.no-overflowscroll .ck-unit-wrap {
10741086
}
10751087
.ck-list-unit[data-style="more"] .ck-icon,
10761088
.ck-list-unit[data-style="more"] .ck-desc-wrap,
1089+
.ck-list-unit[data-style="more"] .ck-opt,
10771090
.ck-list-unit[data-style="more"] .ck-info-wrap {
10781091
display: none;
10791092
}
@@ -1086,6 +1099,7 @@ body.no-overflowscroll .ck-unit-wrap {
10861099
color: #252525;
10871100
}
10881101
.ck-list-unit[data-style="grid"] .ck-author-box,
1102+
.ck-list-unit[data-style="grid"] .ck-opt,
10891103
.ck-list-unit[data-style="grid"] .ck-info-wrap,
10901104
.ck-list-unit[data-style="grid"] .ck-meta-wrap,
10911105
.ck-list-unit[data-style="grid"] .ck-content-wrap {

‎examples/dist/css/main.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)