From 75a2504fd95eb3af8b5f40d2a458667e134b1ac9 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 9 Sep 2023 22:38:19 +0800 Subject: [PATCH] chore(colors): adapt to Bootstrap 5.3 --- _sass/addon/commons.scss | 64 +++++++++++++++++++++++++++------------- _sass/addon/module.scss | 6 +++- _sass/layout/home.scss | 1 + 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index d4e23ef..53c85fb 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -946,9 +946,44 @@ $btn-mb: 0.5rem; } } /* #topbar */ -#sidebar-trigger, -#search-trigger { - display: none; +::-webkit-input-placeholder { + @include placeholder; +} + +::-moz-placeholder { + @include placeholder; +} + +:-ms-input-placeholder { + @include placeholder; +} + +::-ms-input-placeholder { + @include placeholder; +} + +::placeholder { + @include placeholder; +} + +:focus::-webkit-input-placeholder { + @include placeholder-focus; +} + +:focus::-moz-placeholder { + @include placeholder-focus; +} + +:focus:-ms-input-placeholder { + @include placeholder-focus; +} + +:focus::-ms-input-placeholder { + @include placeholder-focus; +} + +:focus::placeholder { + @include placeholder-focus; } search { @@ -966,6 +1001,11 @@ search { } } +#sidebar-trigger, +#search-trigger { + display: none; +} + /* 'Cancel' link */ #search-cancel { color: var(--link-color); @@ -985,24 +1025,6 @@ search { &:focus { box-shadow: none; - - &.form-control { - &::-moz-placeholder { - @include input-placeholder; - } - &::-webkit-input-placeholder { - @include input-placeholder; - } - &:-ms-input-placeholder { - @include input-placeholder; - } - &::-ms-input-placeholder { - @include input-placeholder; - } - &::placeholder { - @include input-placeholder; - } - } } } diff --git a/_sass/addon/module.scss b/_sass/addon/module.scss index e7a0dec..8e16050 100644 --- a/_sass/addon/module.scss +++ b/_sass/addon/module.scss @@ -149,7 +149,11 @@ padding-right: $val; } -@mixin input-placeholder { +@mixin placeholder { + color: var(--text-muted-color) !important; +} + +@mixin placeholder-focus { opacity: 0.6; } diff --git a/_sass/layout/home.scss b/_sass/layout/home.scss index c094683..5b43261 100644 --- a/_sass/layout/home.scss +++ b/_sass/layout/home.scss @@ -44,6 +44,7 @@ .card-title { @extend %text-clip; + color: var(--heading-color) !important; font-size: 1.25rem; }