diff --git a/src/editable-form/editable-form.css b/src/editable-form/editable-form.css index 63bb0c4..9810a18 100644 --- a/src/editable-form/editable-form.css +++ b/src/editable-form/editable-form.css @@ -28,16 +28,4 @@ .editableform textarea { vertical-align: top; display: inline-block; -} - - - -/* for inline datepicker do not to inherit from table (bootstrap) */ -.table-striped .editableform table td, .editableform table th { - border: none !important; -} - -.table-striped .editableform table tr:nth-child(2n+1) td, -.table-striped .editableform table tr:nth-child(2n+1) th { - background-color: transparent; -} +} \ No newline at end of file diff --git a/src/inputs/date/bootstrap-datepicker/css/datepicker.css b/src/inputs/date/bootstrap-datepicker/css/datepicker.css index 2a9ec49..abf3886 100644 --- a/src/inputs/date/bootstrap-datepicker/css/datepicker.css +++ b/src/inputs/date/bootstrap-datepicker/css/datepicker.css @@ -72,9 +72,12 @@ -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + /* vitalets: required to disable css inheritance when display inline inside table */ + border: none !important; + background-color: transparent !important; } .datepicker td.day:hover { - background: #eeeeee; + background: #eeeeee !important; /* disable inheritance for inline */ cursor: pointer; } .datepicker td.old, @@ -87,11 +90,60 @@ color: #999999; cursor: default; } +.datepicker td.today, +.datepicker td.today:hover, +.datepicker td.today.disabled, +.datepicker td.today.disabled:hover { + background-color: #fde19a !important; /* disable inheritance for inline */ + background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a); + background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a)); + background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a); + background-image: -o-linear-gradient(top, #fdd49a, #fdf59a); + background-image: linear-gradient(top, #fdd49a, #fdf59a); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0); + border-color: #fdf59a #fdf59a #fbed50; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); +} +.datepicker td.today:hover, +.datepicker td.today:hover:hover, +.datepicker td.today.disabled:hover, +.datepicker td.today.disabled:hover:hover, +.datepicker td.today:active, +.datepicker td.today:hover:active, +.datepicker td.today.disabled:active, +.datepicker td.today.disabled:hover:active, +.datepicker td.today.active, +.datepicker td.today:hover.active, +.datepicker td.today.disabled.active, +.datepicker td.today.disabled:hover.active, +.datepicker td.today.disabled, +.datepicker td.today:hover.disabled, +.datepicker td.today.disabled.disabled, +.datepicker td.today.disabled:hover.disabled, +.datepicker td.today[disabled], +.datepicker td.today:hover[disabled], +.datepicker td.today.disabled[disabled], +.datepicker td.today.disabled:hover[disabled] { + background-color: #fdf59a !important; /* disable inheritance for inline */ +} +.datepicker td.today:active, +.datepicker td.today:hover:active, +.datepicker td.today.disabled:active, +.datepicker td.today.disabled:hover:active, +.datepicker td.today.active, +.datepicker td.today:hover.active, +.datepicker td.today.disabled.active, +.datepicker td.today.disabled:hover.active { + background-color: #fbf069 \9; +} .datepicker td.active, .datepicker td.active:hover, .datepicker td.active.disabled, .datepicker td.active.disabled:hover { - background-color: #006dcc; + background-color: #006dcc !important; /* disable inheritance for inline */ background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-image: -ms-linear-gradient(top, #0088cc, #0044cc); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); @@ -216,10 +268,12 @@ .datepicker th.switch { width: 145px; } -.datepicker thead tr:first-child th { +.datepicker thead tr:first-child th, +.datepicker tfoot tr:first-child th { cursor: pointer; } -.datepicker thead tr:first-child th:hover { +.datepicker thead tr:first-child th:hover, +.datepicker tfoot tr:first-child th:hover { background: #eeeeee; } .input-append.date .add-on i,