vendor/assets/javascripts/webshims/shims/styles/scss/shim.scss in webshims-rails-1.10.10 vs vendor/assets/javascripts/webshims/shims/styles/scss/shim.scss in webshims-rails-1.10.11

- old
+ new

@@ -42,25 +42,10 @@ article, aside, canvas, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary { display: block; } -dialog { - display: none; - postion: absolute; - left: 0; - right: 0; - border: solid; - background: #fff; - color: #000; - padding: 1em; - - &[open] { - display: block; - } -} - audio { display: none; height: 0; width: 0; overflow: hidden; @@ -88,11 +73,11 @@ } .flashblocker-assumed { min-height: 20px; min-width: 20px; - z-index: 2147483647; + z-index: 99999; } .cue-display { position: absolute !important; margin: 0; @@ -201,19 +186,10 @@ /* placeholder */ .placeholder-box { position: relative; display: inline-block; zoom: 1; - - .polyfill-important & { - position: relative !important; - display: inline-block !important; - margin: 0 !important; - padding: 0 !important; - width: auto !important; - height: auto !important; - } } .placeholder-box-input { vertical-align: bottom; } @@ -234,17 +210,10 @@ overflow: hidden; color: #999; line-height: 1; cursor: text; - .polyfill-important & { - margin: 0 !important; - padding-right: 0 !important; - padding-bottom: 0 !important; - display: none !important; - } - .placeholder-visible &, &.placeholder-visible { display: inline-block; } @@ -259,24 +228,15 @@ .placeholder-focused.placeholder-visible { color: #ccc; } -.polyfill-important { - .placeholder-visible .placeholder-text, .placeholder-text.placeholder-visible { - display: inline-block !important; - } -} - /* spinner control for time, number (usable for date, datetime-local) */ .has-input-buttons { display: inline-block; } -.polyfill-important .has-input-buttons { - display: inline-block !important; -} .input-buttons, .step-controls, .ws-popover-opener { zoom: 1; @@ -320,10 +280,14 @@ .color-input-buttons & { background-position: -348px 0; } + .time-input-buttons & { + background-position: -377px 1px; + } + &.ws-color-indicator-bg { background: url(../jpicker/images/preview-opacity.png) no-repeat 0; } &.ws-color-indicator { background: none; @@ -334,15 +298,11 @@ input[type="color"] { width: 6.5em; } .input-buttons { - .polyfill-important & { - display: inline-block !important; - padding: 0 !important; - vertical-align: middle !important; - } + &.color-input-buttons { margin-left: 2px; } &.input-button-size-1 { &.month-input-buttons, @@ -375,17 +335,10 @@ cursor: pointer; font-size: 0; line-height: 0; background: url(forms.png) no-repeat 0 0; - .polyfill-important & { - display: inline-block !important; - margin: 0 !important; - padding: 0 !important; - font-size: 0 !important; - } - &.step-up { top: 0; background-position: -80px 0; &:hover { background-position: -105px 0; @@ -440,13 +393,10 @@ -moz-box-sizing: border-box; box-sizing: border-box; text-align: center; display: inline-block; - .polyfill-important & { - display: inline-block !important; - } } } @@ -465,10 +415,31 @@ .no-boxsizing & { width: 40%; } } + &.ws-month-select { + + .dd { + width: 22%; + + .no-boxsizing & { + width: 13%; + } + } + .mm { + width: 38%; + } + + .yy { + width: 36%; + + .no-boxsizing & { + width: 30%; + } + } + } } .ws-month { .mm, .yy { @@ -494,16 +465,10 @@ background: url(range-track.png) 0 center no-repeat; cursor: pointer; font-size: 0; line-height: 0; - .polyfill-important & { - display: inline-block !important; - padding: 0 !important; - font-size: 0 !important; - } - .ws-range-thumb { top: 0; position: absolute; display: block; z-index: 4; @@ -649,44 +614,17 @@ position: absolute; top: 0; left: 0; padding: 0 6px 0; margin: 0 0 0 -6px; - z-index: 1000; + z-index: 1100; min-width: 90px; transition: visibility 400ms ease-in-out; &.no-transition { display: none; } - - button { - display: inline-block; - overflow: visible; - position: relative; - margin: 0; - border: 0; - padding: 0; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: none; - appearance: none; - box-sizing: content-box; - font-family: arial, sans-serif; - background: transparent; - cursor: pointer; - - &::-moz-focus-inner { - border: 0; - padding: 0; - } - - &[disabled] { - cursor: default; - color: #888; - } - } &.ws-po-visible { visibility: visible; display: block; } @@ -722,10 +660,38 @@ .ws-po-box { border: 1px solid #ccc; background: #fefefe; padding: 5px; box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5); + + + button { + display: inline-block; + overflow: visible; + position: relative; + margin: 0; + border: 0; + padding: 0; + -moz-box-sizing: content-box; + box-sizing: content-box; + -webkit-appearance: none; + appearance: none; + box-sizing: content-box; + font-family: arial, sans-serif; + background: transparent; + cursor: pointer; + + &::-moz-focus-inner { + border: 0; + padding: 0; + } + + &[disabled] { + cursor: default; + color: #888; + } + } } .ws-po-arrow { position: absolute; top: 4px; @@ -765,19 +731,10 @@ border-left-color: transparent; border-right-color: transparent; } } - .polyfill-important & { - border-left-color: transparent !important; - border-right-color: transparent !important; - - .ws-po-arrowbox { - border-left-color: transparent !important; - border-right-color: transparent !important; - } - } [data-vertical="middle"] &, * html & { display: none; } @@ -819,10 +776,26 @@ outline: none; text-align: center; font-family: sans-serif; width: 330px; + &.time-popover, + &.datetime-local-popover { + width: 415px; + } + + &.time-popover { + + .ws-prev, + .ws-next, + .ws-super-prev, + .ws-super-next { + display: none; + } + } + + &.ws-size-2 { width: 645px; } &.ws-size-3 { @@ -857,11 +830,13 @@ border-radius: 5px; box-shadow: 0 0 2px rgba(0, 0, 0, .3); } .ws-prev, - .ws-next { + .ws-next, + .ws-super-prev, + .ws-super-next { @extend %ws-button; position: absolute; top: 10px; border: 1px solid #ccc; border-radius: 5px; @@ -873,35 +848,63 @@ span { display: none; } } + + + &.time-popover .ws-picker-body { + padding-top: 36px; + } .ws-picker-body { @extend %clearfix; position: relative; padding: 46px 0 0; zoom: 1; margin: 0 -10px; } - .ws-prev { + .ws-prev, + .ws-super-prev { left: 20px; background-position: -243px 5px; } - .ws-next { + + .ws-super-prev { + background-position: -243px -12px; + } + + &.ws-year-buttons .ws-prev { + left: 50px; + } + + .ws-next, + .ws-super-next { right: 20px; background-position: -275px 5px; } + .ws-super-next { + background-position: -275px -12px; + } + + &.ws-year-buttons .ws-next { + right: 50px; + } + .ws-prev:hover, - .ws-next:hover { + .ws-next:hover, + .ws-super-prev:hover, + .ws-super-next:hover { border-color: #666; } .ws-prev[disabled], - .ws-next[disabled] { + .ws-next[disabled], + .ws-super-prev[disabled], + .ws-super-next[disabled]{ opacity: 0.4; border-color: #eee; } .ws-button-row { @@ -940,11 +943,24 @@ } &[data-currentview="setDayList"] .ws-picker-header select.month-select { max-width: 55%; } - + + &.time-popover .ws-picker-header { + top: -30px; + + button { + font-size: 15px; + } + } + + &.ws-year-buttons .ws-picker-header { + margin: 0 65px; + } + + .ws-picker-header { position: absolute; top: -44px; right: 0; left: 0; @@ -1000,15 +1016,19 @@ } &.day-list td { padding: 2px 1px; } + + &.day-list td button { + padding: 4px 0; + } td button { display: block; - padding: 4px 0; + padding: 9px 0; width: 100%; border-radius: 5px; color: #000; background-color: #fff; @@ -1292,24 +1312,9 @@ background: url(details-arrows.png) no-repeat 0 0; vertical-align: middle; .closed-details-summary & { background-position: 0 -20px; - } - - .polyfill-important & { - margin: -1px 0 0 !important; - padding: 0 !important; - border: 0 !important; - display: inline-block !important; - width: 16px !important; - height: 11px !important; - background: url(details-arrows.png) no-repeat 0 0 !important; - vertical-align: middle !important; - } - - .polyfill-important .closed-details-summary & { - background-position: 0 -20px !important; } } summary.summary-has-focus { outline: 1px dotted #aaa;