diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 3f23938715..7aaa066bb3 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -40,11 +40,11 @@ /************************** HTML ENTITIES */ a { - color: #ccc; + color: $colorA; cursor: pointer; text-decoration: none; &:hover { - color: #fff; + color: $colorAHov; } } diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 7e7a91207b..f8525e9daf 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -352,7 +352,10 @@ label.checkbox.custom { /******************************************************** DATETIME PICKER */ .l-datetime-picker { $r1H: 15px; + @include user-select(none); + font-size: 0.8rem; padding: $interiorMarginLg !important; + width: 230px; .l-month-year-pager { $pagerW: 20px; //@include test(); @@ -390,6 +393,57 @@ label.checkbox.custom { } } +/******************************************************** CALENDAR */ +.l-calendar { + $colorMuted: pushBack($colorMenuFg, 30%); + ul.l-cal-row { + @include display-flex; + @include flex-flow(row nowrap); + margin-top: 1px; + &:first-child { + margin-top: 0; + } + li { + @include flex(1 0); + //@include test(); + margin-left: 1px; + padding: $interiorMargin; + text-align: center; + &:first-child { + margin-left: 0; + } + } + &.l-header li { + color: $colorMuted; + } + &.l-body li { + @include trans-prop-nice(background-color, .25s); + cursor: pointer; + &.in-month { + background-color: $colorCalCellInMonthBg; + } + .sub { + color: $colorMuted; + font-size: 0.8em; + } + &.selected { + background: $colorCalCellSelectedBg; + color: $colorCalCellSelectedFg; + .sub { + color: inherit; + } + } + &:hover { + background-color: $colorCalCellHovBg; + color: $colorCalCellHovFg; + .sub { + color: inherit; + } + } + } + } +} + /******************************************************** BROWSER ELEMENTS */ @include desktop { diff --git a/platform/commonUI/general/res/templates/controls/datetime-picker.html b/platform/commonUI/general/res/templates/controls/datetime-picker.html index 24c46d6280..111d5b4201 100644 --- a/platform/commonUI/general/res/templates/controls/datetime-picker.html +++ b/platform/commonUI/general/res/templates/controls/datetime-picker.html @@ -28,7 +28,20 @@