diff options
Merge pull request #451 from picturepan2/0.5.2
0.5.2
11 files changed, 83 insertions, 39 deletions
| -rw-r--r-- | src/_asian.scss | 9 | ||||
| -rw-r--r-- | src/_base.scss | 4 | ||||
| -rw-r--r-- | src/_calendars.scss | 33 | ||||
| -rw-r--r-- | src/_codes.scss | 2 | ||||
| -rw-r--r-- | src/_forms.scss | 1 | ||||
| -rw-r--r-- | src/_modals.scss | 14 | ||||
| -rw-r--r-- | src/_off-canvas.scss | 4 | ||||
| -rw-r--r-- | src/_variables.scss | 10 | ||||
| -rw-r--r-- | src/mixins/_color.scss | 3 | ||||
| -rw-r--r-- | src/mixins/_position.scss | 36 | ||||
| -rw-r--r-- | src/utilities/_position.scss | 6 |
diff --git a/src/_asian.scss b/src/_asian.scss index 5f7533e..38dc77e 100644 --- a/src/_asian.scss +++ b/src/_asian.scss @@ -1,6 +1,11 @@ // Optimized for East Asian CJK -:lang(zh) { - font-family: $cjk-zh-font-family; +:lang(zh), +:lang(zh-Hans) { + font-family: $cjk-zh-hans-font-family; +} + +:lang(zh-Hant) { + font-family: $cjk-zh-hant-font-family; } :lang(ja) { diff --git a/src/_base.scss b/src/_base.scss index 5f5a8d0..4e01b20 100644 --- a/src/_base.scss +++ b/src/_base.scss @@ -37,4 +37,8 @@ a { color: $link-color-dark; text-decoration: underline; } + + &:visited { + color: $link-color-light; + } } diff --git a/src/_calendars.scss b/src/_calendars.scss index a05621f..ff00145 100644 --- a/src/_calendars.scss +++ b/src/_calendars.scss @@ -98,13 +98,22 @@ } } - &.disabled .date-item, - &.disabled .calendar-event, - .date-item:disabled, - .calendar-event:disabled { - cursor: default; - opacity: .25; - pointer-events: none; + .date-item, + .calendar-event { + &:disabled, + &.disabled { + cursor: default; + opacity: .25; + pointer-events: none; + } + } + + &.prev-month, + &.next-month { + .date-item, + .calendar-event { + opacity: .25; + } } } @@ -132,11 +141,21 @@ } } + &.range-start, + &.range-end { + .date-item { + background: $primary-color-dark; + border-color: darken($primary-color-dark, 5%); + color: $light-color; + } + } + .date-item { color: $primary-color; } } + // Calendars size &.calendar-lg { .calendar-body { padding: 0; diff --git a/src/_codes.scss b/src/_codes.scss index 5b3580f..817452b 100644 --- a/src/_codes.scss +++ b/src/_codes.scss @@ -1,7 +1,7 @@ // Codes code { @include label-base(); - @include label-variant($code-color, lighten($code-color, 33%)); + @include label-variant($code-color, lighten($code-color, 42.5%)); font-size: 85%; } diff --git a/src/_forms.scss b/src/_forms.scss index a0b6ee1..cd3fc5e 100644 --- a/src/_forms.scss +++ b/src/_forms.scss @@ -381,6 +381,7 @@ textarea.form-input { .form-input, .form-select { flex: 1 1 auto; + width: 1%; } .input-group-btn { diff --git a/src/_modals.scss b/src/_modals.scss index 59a7e4e..a7b3f10 100644 --- a/src/_modals.scss +++ b/src/_modals.scss @@ -31,8 +31,6 @@ .modal-container { animation: slide-down .2s ease 1; - max-width: $control-width-md; - width: 100%; z-index: $zindex-0; } } @@ -60,15 +58,23 @@ @include shadow-variant(.2rem); background: $bg-color-light; border-radius: $border-radius; - display: block; + display: flex; + flex-direction: column; + max-height: 75vh; + max-width: $control-width-md; padding: 0 $unit-4; + width: 100%; + + &.modal-fullheight { + max-height: 100vh; + } .modal-header { + color: $dark-color; padding: $unit-4; } .modal-body { - max-height: 50vh; overflow-y: auto; padding: $unit-4; position: relative; diff --git a/src/_off-canvas.scss b/src/_off-canvas.scss index 27dd7cd..32cefb6 100644 --- a/src/_off-canvas.scss +++ b/src/_off-canvas.scss @@ -86,6 +86,10 @@ $off-canvas-breakpoint: $size-lg !default; position: relative; transform: none; } + + .off-canvas-overlay { + display: none !important; + } } } } diff --git a/src/_variables.scss b/src/_variables.scss index 87fd981..1162aab 100644 --- a/src/_variables.scss +++ b/src/_variables.scss @@ -1,5 +1,5 @@ // Core variables -$version: "0.5.1"; +$version: "0.5.2"; // Core features $rtl: false !default; @@ -31,19 +31,21 @@ $warning-color: #ffb700 !default; $error-color: #e85600 !default; // Other colors -$code-color: #e06870 !default; +$code-color: #d73e48 !default; $highlight-color: #ffe9b3 !default; $body-bg: $bg-color-light !default; $body-font-color: lighten($dark-color, 5%) !default; $link-color: $primary-color !default; -$link-color-dark: darken($link-color, 5%) !default; +$link-color-dark: darken($link-color, 10%) !default; +$link-color-light: lighten($link-color, 10%) !default; // Fonts // Credit: https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practical-guide/ $base-font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto !default; $mono-font-family: "SF Mono", "Segoe UI Mono", "Roboto Mono", Menlo, Courier, monospace !default; $fallback-font-family: "Helvetica Neue", sans-serif !default; -$cjk-zh-font-family: $base-font-family, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", $fallback-font-family !default; +$cjk-zh-hans-font-family: $base-font-family, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", $fallback-font-family !default; +$cjk-zh-hant-font-family: $base-font-family, "PingFang TC", "Hiragino Sans CNS", "Microsoft JhengHei", $fallback-font-family !default; $cjk-jp-font-family: $base-font-family, "Hiragino Sans", "Hiragino Kaku Gothic Pro", "Yu Gothic", YuGothic, Meiryo, $fallback-font-family !default; $cjk-ko-font-family: $base-font-family, "Malgun Gothic", $fallback-font-family !default; $body-font-family: $base-font-family, $fallback-font-family !default; diff --git a/src/mixins/_color.scss b/src/mixins/_color.scss index f2e2e5c..3ac9041 100644 --- a/src/mixins/_color.scss +++ b/src/mixins/_color.scss @@ -20,5 +20,8 @@ &:hover { color: darken($color, 5%); } + &:visited { + color: lighten($color, 5%); + } } } diff --git a/src/mixins/_position.scss b/src/mixins/_position.scss index 0943469..98b5cfc 100644 --- a/src/mixins/_position.scss +++ b/src/mixins/_position.scss @@ -1,65 +1,65 @@ // Margin utility mixin @mixin margin-variant($id: 1, $size: $unit-1) { .m-#{$id} { - margin: $size; + margin: $size !important; } .mb-#{$id} { - margin-bottom: $size; + margin-bottom: $size !important; } .ml-#{$id} { - margin-left: $size; + margin-left: $size !important; } .mr-#{$id} { - margin-right: $size; + margin-right: $size !important; } .mt-#{$id} { - margin-top: $size; + margin-top: $size !important; } .mx-#{$id} { - margin-left: $size; - margin-right: $size; + margin-left: $size !important; + margin-right: $size !important; } .my-#{$id} { - margin-bottom: $size; - margin-top: $size; + margin-bottom: $size !important; + margin-top: $size !important; } } // Padding utility mixin @mixin padding-variant($id: 1, $size: $unit-1) { .p-#{$id} { - padding: $size; + padding: $size !important; } .pb-#{$id} { - padding-bottom: $size; + padding-bottom: $size !important; } .pl-#{$id} { - padding-left: $size; + padding-left: $size !important; } .pr-#{$id} { - padding-right: $size; + padding-right: $size !important; } .pt-#{$id} { - padding-top: $size; + padding-top: $size !important; } .px-#{$id} { - padding-left: $size; - padding-right: $size; + padding-left: $size !important; + padding-right: $size !important; } .py-#{$id} { - padding-bottom: $size; - padding-top: $size; + padding-bottom: $size !important; + padding-top: $size !important; } } diff --git a/src/utilities/_position.scss b/src/utilities/_position.scss index 97407d8..229bd34 100644 --- a/src/utilities/_position.scss +++ b/src/utilities/_position.scss @@ -12,15 +12,15 @@ } .relative { - position: relative; + position: relative !important; } .absolute { - position: absolute; + position: absolute !important; } .fixed { - position: fixed; + position: fixed !important; } .centered { |