diff --git a/less/style.less b/less/style.less index 43ba002..da5f86d 100644 --- a/less/style.less +++ b/less/style.less @@ -1,11 +1,9 @@ @import "bootstrap/bootstrap.less"; @import "jq-ui-bootstrap/jq-ui-bootstrap.less"; -/*@import "custom.less"; - // third parties @import "thirdParty/wijmo-theming.less"; @import "thirdParty/ui.daterangepicker.less"; @import "thirdParty/enhanced.less"; -@import "thirdParty/font-awesome.less";*/ +@import "thirdParty/font-awesome.less"; //@import "thirdParty/select2-bootstrap.less"; diff --git a/less/style.min.css b/less/style.min.css index 799df03..854e24f 100644 --- a/less/style.min.css +++ b/less/style.min.css @@ -1246,3 +1246,60 @@ button.ui-button::-moz-focus-inner{border:0;padding:0} .ui-datepicker td .ui-state-highlight{color:#fff;background:#5bc0de;border-color:#46b8da;text-shadow:0 -1px 0 rgba(0,0,0,0.25);border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;-khtml-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-bottomleft:4px;-webkit-border-bottom-left-radius:4px;-khtml-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-webkit-border-bottom-right-radius:4px;-khtml-border-bottom-right-radius:4px;border-bottom-right-radius:4px} .ui-datepicker td .ui-state-active{color:#333;background:#eee;border-color:#adadad;margin-bottom:0;font-size:normal;text-shadow:0;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;-khtml-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-bottomleft:4px;-webkit-border-bottom-left-radius:4px;-khtml-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-webkit-border-bottom-right-radius:4px;-khtml-border-bottom-right-radius:4px;border-bottom-right-radius:4px} .ui-datepicker td .ui-state-hover{color:#fff;background:#428bca;text-shadow:0 -1px 0 rgba(0,0,0,0.25);border-color:#357ebd;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;-khtml-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-bottomleft:4px;-webkit-border-bottom-left-radius:4px;-khtml-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-webkit-border-bottom-right-radius:4px;-khtml-border-bottom-right-radius:4px;border-bottom-right-radius:4px} +div.wijmo-wijmenu{padding:0 20px;background-image:-webkit-gradient(linear, left 0, left 100%, from(#333), to(#222));background-image:-webkit-linear-gradient(top, #333, 0, #222, 100%);background-image:-moz-linear-gradient(top, #333 0, #222 100%);background-image:linear-gradient(to bottom, #333 0, #222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff333333', endColorstr='#ff222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1)} +.wijmo-wijmenu .ui-state-default{box-shadow:none;color:#999} +.wijmo-wijmenu .ui-state-default .wijmo-wijmenu-text{color:#999} +.wijmo-wijmenu .ui-state-hover{background:#444;background:rgba(255,255,255,0.05)}.wijmo-wijmenu .ui-state-hover .wijmo-wijmenu-text{color:#fff} +div.wijmo-wijmenu .ui-widget-header h3{position:relative;margin-top:1px;padding:0} +.wijmo-wijmenu h3 a{color:#fff;display:block;float:left;font-size:20px;font-weight:200;line-height:1;margin-left:-20px;margin-top:1px;padding:8px 20px 12px}.wijmo-wijmenu h3 a:hover{background-color:rgba(255,255,255,0.05);color:#fff;text-decoration:none} +.wijmo-wijmenu .ui-widget-header{border:0} +.wijmo-wijmenu .wijmo-wijmenu-parent .wijmo-wijmenu-child{padding:.3em 0} +div.wijmo-wijmenu .wijmo-wijmenu-item{margin:0;border:0}div.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-child{background:#333;border:0;margin:0;padding:6px 0;width:160px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0,0,0,0.2);box-shadow:0 2px 4px rgba(0,0,0,0.2)} +.wijmo-wijmenu a.wijmo-wijmenu-link{margin:0;line-height:19px;padding:10px 10px 11px;border:0;-moz-border-radius-topleft:0;-webkit-border-top-left-radius:0;-khtml-border-top-left-radius:0;border-top-left-radius:0;-moz-border-radius-topright:0;-webkit-border-top-right-radius:0;-khtml-border-top-right-radius:0;border-top-right-radius:0;-moz-border-radius-bottomleft:0;-webkit-border-bottom-left-radius:0;-khtml-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomright:0;-webkit-border-bottom-right-radius:0;-khtml-border-bottom-right-radius:0;border-bottom-right-radius:0} +div.wijmo-wijmenu .wijmo-wijmenu-child .wijmo-wijmenu-link{display:block;float:none;padding:4px 15px;width:auto} +div.wijmo-wijmenu .wijmo-wijmenu-child .wijmo-wijmenu-child .wijmo-wijmenu-text{float:none} +.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-child .ui-state-hover{background:#191919} +.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-separator{padding:5px 0;background-image:none;background-color:#222;border-top:1px solid #444;border-bottom:0;border-left:0;border-right:0} +.wijmo-wijmenu .wijmo-wijmenu-item input{-webkit-transition:none 0 ease 0;transition:none 0 ease 0;background-color:rgba(255,255,255,0.3);border:1px solid #111;-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;-khtml-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-bottomleft:4px;-webkit-border-bottom-left-radius:4px;-khtml-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-webkit-border-bottom-right-radius:4px;-khtml-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.1) inset,0 1px 0 rgba(255,255,255,0.25);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.1) inset,0 1px 0 rgba(255,255,255,0.25);box-shadow:0 1px 2px rgba(0,0,0,0.1) inset,0 1px 0 rgba(255,255,255,0.25);color:rgba(255,255,255,0.75);font-family:sansFontFamily;line-height:1;margin:5px 10px 0 10px;padding:4px 9px;width:100px}.wijmo-wijmenu .wijmo-wijmenu-item input:hover{background-color:rgba(255,255,255,0.5);color:#fff} +.wijmo-wijmenu .wijmo-wijmenu-item input:focus{background-color:#fff;border:0 none;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15);color:#333;outline:0 none;padding:5px 10px;text-shadow:0 1px 0 #fff} +.wijmo-wijmenu .ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{text-shadow:none} +.wijmo-wijmenu .ui-state-default{-webkit-box-shadow:none;box-shadow:none;color:#999;filter:none} +.ui-daterangepickercontain{position:absolute;z-index:999}.ui-daterangepickercontain .ui-daterangepicker{float:left;padding:5px !important;width:auto;display:inline;background-image:none !important;clear:left} +.ui-daterangepicker ul,.ui-daterangepicker .ranges,.ui-daterangepicker .range-start,.ui-daterangepicker .range-end{float:left;padding:0;margin:0} +.ui-daterangepicker .ranges{width:auto;position:relative;padding:5px 5px 40px 0;margin-left:10px} +.ui-daterangepicker .range-start,.ui-daterangepicker .range-end{margin-left:5px} +.ui-daterangepicker button.btnDone{clear:both;position:absolute;bottom:0;right:0;cursor:pointer;display:inline-block;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), color-stop(25%, #fff), to(#eee));background-image:-webkit-linear-gradient(#fff, #fff 25%, #eee);background-image:-moz-linear-gradient(top, #fff, #fff 25%, #eee);background-image:linear-gradient(#fff, #fff 25%, #eee);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);padding:5px 14px 6px;margin:5px;text-shadow:0 1px 1px rgba(255,255,255,0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-webkit-transition:.1s linear background-image;transition:.1s linear background-image;overflow:visible} +.ui-daterangepicker ul{width:17.6em;background:none;border:0} +.ui-daterangepicker li{list-style:none;padding:1px;cursor:pointer;margin:1px 0} +.ui-daterangepicker .ui-widget-header{border:1px solid #ccc} +.ui-daterangepicker .ui-state-hover{background:#003f81;color:#fff}.ui-daterangepicker .ui-state-hover a{color:#fff} +.ui-daterangepicker .ui-widget{padding-right:4px} +.ui-daterangepicker li.preset_0{margin-top:1.5em !important} +.ui-daterangepicker .ui-widget-content a{text-decoration:none !important;font-weight:normal} +.ui-daterangepicker li a{font-weight:normal;margin:.3em .5em;display:block} +.ui-daterangepicker li span{float:right;margin:.3em .2em} +.ui-daterangepicker .title-start,.ui-daterangepicker .title-end{display:block;margin:0 0 .2em;font-size:1em;padding:0 4px 2px} +.ui-daterangepicker .ui-datepicker-inline{font-size:1em} +.ui-daterangepicker-arrows{padding:2px;width:204px;position:relative}.ui-daterangepicker-arrows input.ui-rangepicker-input{width:158px;margin:0 2px 0 20px;padding:2px;height:1.1em} +.ui-daterangepicker-arrows .ui-daterangepicker-prev,.ui-daterangepicker-arrows .ui-daterangepicker-next{position:absolute;top:2px;padding:1px} +.ui-daterangepicker-arrows .ui-daterangepicker-prev{left:2px} +.ui-daterangepicker-arrows .ui-daterangepicker-next{right:2px} +.ui-daterangepicker-arrows .ui-daterangepicker-prev:hover,.ui-daterangepicker-arrows .ui-daterangepicker-next:hover,.ui-daterangepicker-arrows .ui-daterangepicker-prev:focus,.ui-daterangepicker-arrows .ui-daterangepicker-next:focus{padding:0} +.customfile-input{position:absolute;left:-999em;background:transparent;border:0;opacity:0;filter:alpha(opacity=0)} +.customfile{cursor:pointer;width:auto;display:inline-block;position:relative} +.customfile.input-append .customfile-feedback{border-radius:3px 0 0 3px;padding-left:25px} +.customfile.input-prepend .customfile-feedback{border-radius:0 3px 3px 0} +.customfile.input-prepend .add-on,.customfile.input-append .add-on{color:#333;cursor:pointer;display:inline-block;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), color-stop(25%, #fff), to(#eee));background-image:-webkit-linear-gradient(#fff, #fff 25%, #eee);background-image:-moz-linear-gradient(top, #fff, #fff 25%, #eee);background-image:linear-gradient(#fff, #fff 25%, #eee);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0)} +.customfile-disabled{opacity:.5;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);cursor:default} +.customfile-feedback{border:1px solid #ccc;color:#555;display:inline-block;font-size:13px;line-height:18px;padding:4px;-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-ms-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.1)} +*+html .customfile-feedback{margin-top:1px} +.customfile-feedback-populated{padding-left:25px;background:url(../images/icon-generic.gif) 5px center no-repeat;white-space:nowrap;text-overflow:ellipsis;-o-text-overflow:ellipsis;overflow:hidden} +.customfile-button{*margin-top:-1px;} +.customfile:hover .customfile-button,.customfile-focus .customfile-button{background-position:0 -15px;color:#333;text-decoration:none} +.customfile-ext-jpg,.customfile-ext-gif,.customfile-ext-png,.customfile-ext-jpeg,.customfile-ext-bmp{background-image:url(../images/icon-image.gif)} +.customfile-ext-mp3,.customfile-ext-mp4,.customfile-ext-mov,.customfile-ext-swf,.customfile-ext-wav,.customfile-ext-m4v{background-image:url(../images/icon-media.gif)} +.customfile-ext-zip,.customfile-ext-tar,.customfile-ext-sit{background-image:url(../images/icon-zip.gif)} +.input-append.customfile,.input-prepend{font-size:0;margin-bottom:5px;white-space:normal} +.input-append.customfile .add-on{height:20px;font-size:14px;line-height:18px;min-width:70px} +.ui-button-icon-primary.ui-icon[class^="icon-"]:before,.ui-button-icon-primary.ui-icon[class*=" icon-"]:before,.ui-button-icon-secondary.ui-icon[class^="icon-"]:before,.ui-button-icon-secondary.ui-icon[class*=" icon-"]:before{font-size:inherit;margin-left:7px !important;margin-left:5px;display:inline;text-decoration:inherit;color:inherit} +.ui-state-default .ui-icon[class*=" icon-"]{background:none;margin-left:-12px;} diff --git a/less/style2.less b/less/style2.less index 18d68a0..861c0d4 100644 --- a/less/style2.less +++ b/less/style2.less @@ -8,9 +8,6 @@ @import "jq-ui-bootstrap/jq-ui-bootstrap.less"; -@import "custom.less"; - - // third parties @import "thirdParty/wijmo-theming.less"; @import "thirdParty/ui.daterangepicker.less"; diff --git a/theme/base/extra.html b/theme/base/extra.html index a437d2a..a59ac91 100644 --- a/theme/base/extra.html +++ b/theme/base/extra.html @@ -2,15 +2,15 @@ - Extra with jQuery UI Bootstrap + Download jQuery UI Bootstrap - + + --> @@ -19,23 +19,25 @@ - - + + - + + @@ -50,17 +52,18 @@ - - + -
+

jQuery UI Bootstrap

-

A Bootstrap-themed kickstart for jQuery UI widgets (v0.5).

+

A Bootstrap-themed kickstart for jQuery UI widgets (v1.0 alpha).

-
+
-
-
-
+
-
+

jQuery UI Bootstrap

-

A Bootstrap-themed kickstart for jQuery UI widgets (v0.5).

+

A Bootstrap-themed kickstart for jQuery UI widgets (v1.0 alpha).

-
+
-
- -
+ +
-
-
-
+
-
+

jQuery UI Bootstrap

-

A Bootstrap-themed kickstart for jQuery UI widgets (v0.5).

+

A Bootstrap-themed kickstart for jQuery UI widgets (v1.0 alpha).

-
+
-
-
-
+
-
+

jQuery UI Bootstrap

-

A Bootstrap-themed kickstart for jQuery UI widgets (v0.5).

+

A Bootstrap-themed kickstart for jQuery UI widgets (v1.0 alpha).

-
+
-
-