From e309ba16f4e5ed2a51cd033b2bee18968e4c1cf2 Mon Sep 17 00:00:00 2001 From: Andrew Rowls Date: Sat, 19 Oct 2013 20:14:35 -0400 Subject: [PATCH] Minimize diff between datepicker.less and datepicker3.less --- less/datepicker3.less | 509 +++++++++++++++++++----------------------- 1 file changed, 227 insertions(+), 282 deletions(-) diff --git a/less/datepicker3.less b/less/datepicker3.less index 73933f0..210be81 100644 --- a/less/datepicker3.less +++ b/less/datepicker3.less @@ -16,265 +16,214 @@ Alexey Shirshov: you may want to use it separately, so uncomment below */ .datepicker { - padding: 4px; - border-radius: 4px; + padding: 4px; + border-radius: 4px; + &-inline { + width: 220px; + } + direction: ltr; + &&-rtl { + direction: rtl; + table tr td span { + float: right; + } + } + &-dropdown { + top: 0; + left: 0; + &:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-top: 0; + border-bottom-color: rgba(0,0,0,.2); + position: absolute; + } + &:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + border-top: 0; + position: absolute; + } + &.datepicker-orient-left:before { left: 6px; } + &.datepicker-orient-left:after { left: 7px; } + &.datepicker-orient-right:before { right: 6px; } + &.datepicker-orient-right:after { right: 7px; } + &.datepicker-orient-top:before { top: -7px; } + &.datepicker-orient-top:after { top: -6px; } + &.datepicker-orient-bottom:before { + bottom: -7px; + border-bottom: 0; + border-top: 7px solid #999; + } + &.datepicker-orient-bottom:after { + bottom: -6px; + border-bottom: 0; + border-top: 6px solid #fff; + } + } + >div { + display: none; + } + &.days div.datepicker-days { + display: block; + } + &.months div.datepicker-months { + display: block; + } + &.years div.datepicker-years { + display: block; + } + table{ + margin: 0; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + } + td, + th{ + text-align: center; + width: 20px; + height: 20px; + border-radius: 4px; - &-inline { - width: 220px; - } + border: none; + } + // Inline display inside a table presents some problems with + // border and background colors. + .table-striped & table tr { + td, th { + background-color:transparent; + } + } + table tr td { + &.day:hover { + background: @gray-lighter; + cursor: pointer; + } + &.old, + &.new { + color: @btn-link-disabled-color; + } + &.disabled, + &.disabled:hover { + background: none; + color: @btn-link-disabled-color; + cursor: default; + } + &.today, + &.today:hover, + &.today.disabled, + &.today.disabled:hover { + @todayBackground: lighten(orange, 30%); + .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); + color: #000; + } + &.today:hover:hover { // Thank bootstrap 2.0 for this selector... + // TODO: Bump min BS to 2.1, use @textColor in buttonBackground above + color: #000; + } + &.today.active:hover { + color: #fff; + } + &.range, + &.range:hover, + &.range.disabled, + &.range.disabled:hover { + background:@gray-lighter; + border-radius: 0; + } + &.range.today, + &.range.today:hover, + &.range.today.disabled, + &.range.today.disabled:hover { + @todayBackground: mix(orange, @gray-lighter, 50%); + .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); + border-radius: 0; + } + &.selected, + &.selected:hover, + &.selected.disabled, + &.selected.disabled:hover { + .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + } + &.active, + &.active:hover, + &.active.disabled, + &.active.disabled:hover { + .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + } + span { + display: block; + width: 23%; + height: 54px; + line-height: 54px; + float: left; + margin: 1%; + cursor: pointer; + border-radius: 4px; + &:hover { + background: @gray-lighter; + } + &.disabled, + &.disabled:hover { + background: none; + color: @btn-link-disabled-color; + cursor: default; + } + &.active, + &.active:hover, + &.active.disabled, + &.active.disabled:hover { + .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + } + &.old, + &.new { + color: @btn-link-disabled-color; + } + } + } - direction: ltr; + th.datepicker-switch { + width: 145px; + } - & &-rtl { - direction: rtl; - - table tr td span { - float: right; - } - } - - &-dropdown { - top: 0; - left: 0; - - &:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-top: 0; - border-bottom-color: rgba(0,0,0,.2); - position: absolute; - } - - &:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #fff; - border-top: 0; - position: absolute; - } - - &.datepicker-orient-left:before { - left: 6px; - } - - &.datepicker-orient-left:after { - left: 7px; - } - - &.datepicker-orient-right:before { - right: 6px; - } - - &.datepicker-orient-right:after { - right: 7px; - } - - &.datepicker-orient-top:before { - top: -7px; - } - - &.datepicker-orient-top:after { - top: -6px; - } - - &.datepicker-orient-bottom:before { - bottom: -7px; - border-bottom: 0; - border-top: 7px solid #999; - } - - &.datepicker-orient-bottom:after { - bottom: -6px; - border-bottom: 0; - border-top: 6px solid #fff; - } - } - - >div { - display: none; - } - - &.days div.datepicker-days { - display: block; - } - - &.months div.datepicker-months { - display: block; - } - - &.years div.datepicker-years { - display: block; - } - - table { - margin: 0; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - } - - td, - th { - text-align: center; - width: 20px; - height: 20px; - border-radius: 4px; - border: none; - } - // Inline display inside a table presents some problems with - // border and background colors. - .table-striped & table tr { - td, th { - background-color: transparent; - } - } - - table tr td { - &.day:hover { - background: @gray-lighter; - cursor: pointer; - } - - &.old, - &.new { - color: @btn-link-disabled-color; - } - - &.disabled, - &.disabled:hover { - background: none; - color: @btn-link-disabled-color; - cursor: default; - } - - &.today, - &.today:hover, - &.today.disabled, - &.today.disabled:hover { - @todayBackground: lighten(orange, 30%); - .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); - color: #000; - } - - &.today:hover:hover { // Thank bootstrap 2.0 for this selector... - // TODO: Bump min BS to 2.1, use @textColor in buttonBackground above - color: #000; - } - - &.today.active:hover { - color: #fff; - } - - &.range, - &.range:hover, - &.range.disabled, - &.range.disabled:hover { - background: @gray-lighter; - border-radius: 0; - } - - &.range.today, - &.range.today:hover, - &.range.today.disabled, - &.range.today.disabled:hover { - @todayBackground: mix(orange, @gray-lighter, 50%); - .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); - border-radius: 0; - } - - &.selected, - &.selected:hover, - &.selected.disabled, - &.selected.disabled:hover { - .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); - color: #fff; - -webkit-text-shadow: 0 -1px 0 rgba(0,0,0,.25); - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - } - - &.active, - &.active:hover, - &.active.disabled, - &.active.disabled:hover { - .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); - color: #fff; - -webkit-text-shadow: 0 -1px 0 rgba(0,0,0,.25); - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - } - - span { - display: block; - width: 23%; - height: 54px; - line-height: 54px; - float: left; - margin: 1%; - cursor: pointer; - border-radius: 4px; - - &:hover { - background: @gray-lighter; - } - - &.disabled, - &.disabled:hover { - background: none; - color: @btn-link-disabled-color; - cursor: default; - } - - &.active, - &.active:hover, - &.active.disabled, - &.active.disabled:hover { - .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border); - color: #fff; - -webkit-text-shadow: 0 -1px 0 rgba(0,0,0,.25); - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - } - - &.old, - &.new { - color: @btn-link-disabled-color; - } - } - } - - th.datepicker-switch { - width: 145px; - } - - thead tr:first-child th, - tfoot tr th { - cursor: pointer; - - &:hover { - background: @gray-lighter; - } - } - /*.dow { + thead tr:first-child th, + tfoot tr th { + cursor: pointer; + &:hover{ + background: @gray-lighter; + } + } + /*.dow { border-top: 1px solid #ddd !important; }*/ - // Basic styling for calendar-week cells - .cw { - font-size: 10px; - width: 12px; - padding: 0 2px 0 5px; - vertical-align: middle; - } - thead tr:first-child th.cw { - cursor: default; - background-color: transparent; - } + // Basic styling for calendar-week cells + .cw { + font-size: 10px; + width: 12px; + padding: 0 2px 0 5px; + vertical-align: middle; + } + thead tr:first-child th.cw { + cursor: default; + background-color: transparent; + } } .input-append, .input-prepend { @@ -288,33 +237,29 @@ Alexey Shirshov: you may want to use it separately, so uncomment below } } .input-daterange { - input { - text-align: center; - } - - input:first-child { - border-radius: 3px 0 0 3px; - } - - input:last-child { - border-radius: 0 3px 3px 0; - } - - .add-on { - display: inline-block; - width: auto; - min-width: 16px; - height: @line-height-base; - padding: 4px 5px; - font-weight: normal; - line-height: @line-height-base; - text-align: center; - -webkit-text-shadow: 0 1px 0 #fff; - text-shadow: 0 1px 0 #fff; - vertical-align: middle; - background-color: @input-group-addon-bg; - border: 1px solid @input-group-addon-border-color; - margin-left: -5px; - margin-right: -5px; - } + input { + text-align:center; + } + input:first-child { + border-radius: 3px 0 0 3px; + } + input:last-child { + border-radius: 0 3px 3px 0; + } + .add-on { + display: inline-block; + width: auto; + min-width: 16px; + height: @line-height-base; + padding: 4px 5px; + font-weight: normal; + line-height: @line-height-base; + text-align: center; + text-shadow: 0 1px 0 #fff; + vertical-align: middle; + background-color: @input-group-addon-bg; + border: 1px solid @input-group-addon-border-color; + margin-left:-5px; + margin-right:-5px; + } }