diff --git a/web/admin/demo/demo_css.html b/web/admin/demo/demo_css.html index e1cdb6d..37e8450 100644 --- a/web/admin/demo/demo_css.html +++ b/web/admin/demo/demo_css.html @@ -7,10 +7,34 @@ +
css优先级
+
+
no fs
+
fs1 1.5em
+
fs2 2em
+
fs2 tw-txt 5em
+
tw-txt 5em
+
txt-lggg 0.5em
+
hr横线
diff --git a/web/admin/demo/demo_dom.html b/web/admin/demo/demo_dom.html index 9d52fba..354c93a 100644 --- a/web/admin/demo/demo_dom.html +++ b/web/admin/demo/demo_dom.html @@ -14,10 +14,6 @@ margin: 1em; transition: all 0.5s; } - - #class1.rad { - border-radius: 1em; - } diff --git a/web/admin/demo/form_selcas.html b/web/admin/demo/form_selcas.html index ed3ad4e..1b97c7f 100644 --- a/web/admin/demo/form_selcas.html +++ b/web/admin/demo/form_selcas.html @@ -65,7 +65,7 @@ console.log(postparam); } function chg() { - c.setvalue('2,4,5'); + c.setvalue('140215'); } function chgrange() { var rg = []; diff --git a/web/admin/demo/form_select.html b/web/admin/demo/form_select.html index a1885d8..f2bece4 100644 --- a/web/admin/demo/form_select.html +++ b/web/admin/demo/form_select.html @@ -64,7 +64,7 @@ console.log(postparam); } function chg() { - c.setvalue('2,4,5'); + c.setvalue('2'); } function chgrange() { var rg = []; diff --git a/web/admin/develop/note.html b/web/admin/develop/note.html index ce2645a..0af5804 100644 --- a/web/admin/develop/note.html +++ b/web/admin/develop/note.html @@ -12,7 +12,7 @@
- +
diff --git a/web/jscss/style.css b/web/jscss/style.css index f2591fc..f63b774 100644 --- a/web/jscss/style.css +++ b/web/jscss/style.css @@ -1230,6 +1230,7 @@ textarea[disabled], select[disabled], input[disabled], input[disabled]+i, .btn.d overflow-x: overlay; overflow-y: hidden; } + .search>ul::-webkit-scrollbar { width: 3px; height: 3px; @@ -1417,7 +1418,7 @@ textarea[disabled], select[disabled], input[disabled], input[disabled]+i, .btn.d .gridline .ciy-form>div:first-of-type { border-left: 1px solid var(--bg6); - padding-left:0.5em; + padding-left: 0.5em; } .gridline .ciy-form>div { @@ -1451,6 +1452,7 @@ textarea[disabled], select[disabled], input[disabled], input[disabled]+i, .btn.d position: relative; min-height: 2.4em; } + .ciy-form.top { align-items: flex-start; } @@ -1468,7 +1470,7 @@ textarea[disabled], select[disabled], input[disabled], input[disabled]+i, .btn.d .ciy-form.v>label { margin-left: 0.5em; text-align: left; - width: 100% !important; + width: 100%; justify-content: flex-start; height: auto; margin-bottom: 0.5em; @@ -2209,242 +2211,241 @@ fieldset.tips>div>ul>li { padding: 0.2em 0.4em; border-radius: 3px; } - .txt-smmm { - font-size: 0.7em!important; + font-size: 0.7em; } .txt-smm { - font-size: 0.8em!important; + font-size: 0.8em; } .txt-sm { - font-size: 0.9em!important; + font-size: 0.9em; } .txt-lg { - font-size: 1.2em!important; + font-size: 1.2em; } .txt-lgg { - font-size: 1.3em!important; + font-size: 1.3em; } .txt-lggg { - font-size: 1.5em!important; + font-size: 1.5em; } .txt-wb { - font-weight: bold!important; + font-weight: bold; } .txt-wl { - font-weight: lighter!important; + font-weight: lighter; } .txt1 { - color: var(--txt1)!important; + color: var(--txt1); } .txt2 { - color: var(--txt2)!important; + color: var(--txt2); } .txt3 { - color: var(--txt3)!important; + color: var(--txt3); } .txt4 { - color: var(--txt4)!important; + color: var(--txt4); } .txt5 { - color: var(--txt5)!important; + color: var(--txt5); } .txt6 { - color: var(--txt6)!important; + color: var(--txt6); } .txt7 { - color: var(--txt7)!important; + color: var(--txt7); } .txt8 { - color: var(--txt8)!important; + color: var(--txt8); } .txt9 { - color: var(--txt9)!important; + color: var(--txt9); } .bg1 { - background-color: var(--bg1)!important; + background-color: var(--bg1); } .bg2 { - background-color: var(--bg2)!important; + background-color: var(--bg2); } .bg3 { - background-color: var(--bg3)!important; + background-color: var(--bg3); } .bg4 { - background-color: var(--bg4)!important; + background-color: var(--bg4); } .bg5 { - background-color: var(--bg5)!important; + background-color: var(--bg5); } .bg6 { - background-color: var(--bg6)!important; + background-color: var(--bg6); } .bg7 { - background-color: var(--bg7)!important; + background-color: var(--bg7); } .bg8 { - background-color: var(--bg8)!important; + background-color: var(--bg8); } .bg9 { - background-color: var(--bg9)!important; + background-color: var(--bg9); } .px1 { - padding-left: 0.25em!important; - padding-right: 0.25em!important; + padding-left: 0.25em; + padding-right: 0.25em; } .px2 { - padding-left: 0.5em!important; - padding-right: 0.5em!important; + padding-left: 0.5em; + padding-right: 0.5em; } .px3 { - padding-left: 0.75em!important; - padding-right: 0.75em!important; + padding-left: 0.75em; + padding-right: 0.75em; } .px4 { - padding-left: 1em!important; - padding-right: 1em!important; + padding-left: 1em; + padding-right: 1em; } .py1 { - padding-top: 0.25em!important; - padding-bottom: 0.25em!important; + padding-top: 0.25em; + padding-bottom: 0.25em; } .py2 { - padding-top: 0.5em!important; - padding-bottom: 0.5em!important; + padding-top: 0.5em; + padding-bottom: 0.5em; } .py3 { - padding-top: 0.75em!important; - padding-bottom: 0.75em!important; + padding-top: 0.75em; + padding-bottom: 0.75em; } .py4 { - padding-top: 1em!important; - padding-bottom: 1em!important; + padding-top: 1em; + padding-bottom: 1em; } .r1 { - border-radius: 0.25em!important; + border-radius: 0.25em; } .r2 { - border-radius: 0.5em!important; + border-radius: 0.5em; } .r3 { - border-radius: 0.75em!important; + border-radius: 0.75em; } .r4 { - border-radius: 1em!important; + border-radius: 1em; } .r5 { - border-radius: 2em!important; + border-radius: 2em; } .txt-un, .target { - text-decoration: underline!important; + text-decoration: underline; } .txt-un-hover:hover { - text-decoration: underline!important; + text-decoration: underline; } .cursor-p { - cursor: pointer!important; + cursor: pointer; } .cursor-d { - cursor: default!important; + cursor: default; } .txt-left { - text-align: left!important; + text-align: left; } .txt-center { - text-align: center!important; + text-align: center; } .txt-right { - text-align: right!important; + text-align: right; } .txt-just { - text-align: justify!important; + text-align: justify; } .block { - display: block!important; + display: block; } .flex { - display: flex!important; + display: flex; } .flexcol { - display: flex!important; - flex-direction: column!important; + display: flex; + flex-direction: column; } .flex1 { - flex: 1!important; + flex: 1; } .flexnone { - flex: none!important; + flex: none; } .flex-center { - align-items: center!important; + align-items: center; } .flex-top { - align-items: flex-start!important; + align-items: flex-start; } .auto-w { - width: auto!important; + width: auto; } .auto-wmin { - min-width: auto!important; + min-width: auto; } .txt-nowrap { - white-space: nowrap!important; + white-space: nowrap; } .txt-over { @@ -2454,71 +2455,71 @@ fieldset.tips>div>ul>li { } .hide { - display: none!important; + display: none; } .noselect { - user-select: none!important; + user-select: none; } .tran5 { - transition: all .5s!important; - -webkit-transition: all .5s!important; + transition: all .5s; + -webkit-transition: all .5s; } .tran1 { - transition: all 1s!important; - -webkit-transition: all 1s!important; + transition: all 1s; + -webkit-transition: all 1s; } .sta { - position: static!important; + position: static; } .abs { - position: absolute!important; + position: absolute; } .fix { - position: fixed!important; + position: fixed; } .rel { - position: relative!important; + position: relative; } .sti { - position: sticky!important; + position: sticky; } .t0 { - top: 0!important; + top: 0; } .l0 { - left: 0!important; + left: 0; } .r0 { - right: 0!important; + right: 0; } .b0 { - bottom: 0!important; + bottom: 0; } .t1 { - top: 0.5em!important; + top: 0.5em; } .l1 { - left: 0.5em!important; + left: 0.5em; } .r1 { - right: 0.5em!important; + right: 0.5em; } .b1 { - bottom: 0.5em!important; + bottom: 0.5em; } \ No newline at end of file