From cf0a308d06ff39279dc6302f525c60cce3b7597c Mon Sep 17 00:00:00 2001 From: Nikolay Date: Tue, 8 Nov 2022 10:41:44 +0300 Subject: [PATCH] configure navbar and sidebar for dash app --- pyquac/assets/bootstrap.css | 1780 +++++++++++++++++++++-------------- pyquac/jupyter_app copy.py | 233 +++++ pyquac/jupyter_app.py | 3 +- 3 files changed, 1284 insertions(+), 732 deletions(-) create mode 100644 pyquac/jupyter_app copy.py diff --git a/pyquac/assets/bootstrap.css b/pyquac/assets/bootstrap.css index 4e8b1c1..43cc881 100644 --- a/pyquac/assets/bootstrap.css +++ b/pyquac/assets/bootstrap.css @@ -1,74 +1,74 @@ @charset "UTF-8"; /*! - * Bootswatch v5.2.1 (https://bootswatch.com) - * Theme: lux + * Bootswatch v5.2.2 (https://bootswatch.com) + * Theme: zephyr * Copyright 2012-2022 Thomas Park * Licensed under MIT * Based on Bootstrap */ /*! - * Bootstrap v5.2.1 (https://getbootstrap.com/) + * Bootstrap v5.2.2 (https://getbootstrap.com/) * Copyright 2011-2022 The Bootstrap Authors * Copyright 2011-2022 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ -@import url("https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600&display=swap"); +@import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;700&display=swap"); :root { - --bs-blue: #007bff; + --bs-blue: #3459e6; --bs-indigo: #6610f2; --bs-purple: #6f42c1; - --bs-pink: #e83e8c; - --bs-red: #d9534f; - --bs-orange: #fd7e14; - --bs-yellow: #f0ad4e; - --bs-green: #4bbf73; + --bs-pink: #d63384; + --bs-red: #da292e; + --bs-orange: #f8765f; + --bs-yellow: #f4bd61; + --bs-green: #2fb380; --bs-teal: #20c997; - --bs-cyan: #1f9bcf; + --bs-cyan: #287bb5; --bs-black: #000; --bs-white: #fff; - --bs-gray: #919aa1; + --bs-gray: #6c757d; --bs-gray-dark: #343a40; --bs-gray-100: #f8f9fa; - --bs-gray-200: #f7f7f9; - --bs-gray-300: #eceeef; + --bs-gray-200: #e9ecef; + --bs-gray-300: #dee2e6; --bs-gray-400: #ced4da; --bs-gray-500: #adb5bd; - --bs-gray-600: #919aa1; - --bs-gray-700: #55595c; + --bs-gray-600: #6c757d; + --bs-gray-700: #495057; --bs-gray-800: #343a40; - --bs-gray-900: #1a1a1a; - --bs-primary: #1a1a1a; + --bs-gray-900: #212529; + --bs-primary: #3459e6; --bs-secondary: #fff; - --bs-success: #4bbf73; - --bs-info: #1f9bcf; - --bs-warning: #f0ad4e; - --bs-danger: #d9534f; - --bs-light: #fff; - --bs-dark: #343a40; - --bs-primary-rgb: 26, 26, 26; + --bs-success: #2fb380; + --bs-info: #287bb5; + --bs-warning: #f4bd61; + --bs-danger: #da292e; + --bs-light: #f8f9fa; + --bs-dark: #212529; + --bs-primary-rgb: 52, 89, 230; --bs-secondary-rgb: 255, 255, 255; - --bs-success-rgb: 75, 191, 115; - --bs-info-rgb: 31, 155, 207; - --bs-warning-rgb: 240, 173, 78; - --bs-danger-rgb: 217, 83, 79; - --bs-light-rgb: 255, 255, 255; - --bs-dark-rgb: 52, 58, 64; + --bs-success-rgb: 47, 179, 128; + --bs-info-rgb: 40, 123, 181; + --bs-warning-rgb: 244, 189, 97; + --bs-danger-rgb: 218, 41, 46; + --bs-light-rgb: 248, 249, 250; + --bs-dark-rgb: 33, 37, 41; --bs-white-rgb: 255, 255, 255; --bs-black-rgb: 0, 0, 0; - --bs-body-color-rgb: 85, 89, 92; + --bs-body-color-rgb: 73, 80, 87; --bs-body-bg-rgb: 255, 255, 255; - --bs-font-sans-serif: "Nunito Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + --bs-font-sans-serif: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --bs-body-font-family: var(--bs-font-sans-serif); --bs-body-font-size: 1rem; --bs-body-font-weight: 400; --bs-body-line-height: 1.5; - --bs-body-color: #55595c; + --bs-body-color: #495057; --bs-body-bg: #fff; --bs-border-width: 1px; --bs-border-style: solid; - --bs-border-color: #eceeef; + --bs-border-color: #dee2e6; --bs-border-color-translucent: rgba(0, 0, 0, 0.175); --bs-border-radius: 0.375rem; --bs-border-radius-sm: 0.25rem; @@ -76,10 +76,10 @@ --bs-border-radius-xl: 1rem; --bs-border-radius-2xl: 2rem; --bs-border-radius-pill: 50rem; - --bs-link-color: #1a1a1a; - --bs-link-hover-color: #151515; - --bs-code-color: #e83e8c; - --bs-highlight-bg: #fcefdc; + --bs-link-color: #3459e6; + --bs-link-hover-color: #2a47b8; + --bs-code-color: #d63384; + --bs-highlight-bg: #fdf2df; } *, @@ -118,48 +118,53 @@ hr { h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 { margin-top: 0; margin-bottom: 0.5rem; - font-weight: 600; + font-weight: 500; line-height: 1.2; - color: #1a1a1a; + color: #212529; } h1, .h1 { - font-size: calc(1.325rem + 0.9vw); + font-size: calc(1.375rem + 1.5vw); } @media (min-width: 1200px) { h1, .h1 { - font-size: 2rem; + font-size: 2.5rem; } } h2, .h2 { - font-size: calc(1.3rem + 0.6vw); + font-size: calc(1.325rem + 0.9vw); } @media (min-width: 1200px) { h2, .h2 { - font-size: 1.75rem; + font-size: 2rem; } } h3, .h3 { - font-size: calc(1.275rem + 0.3vw); + font-size: calc(1.3rem + 0.6vw); } @media (min-width: 1200px) { h3, .h3 { - font-size: 1.5rem; + font-size: 1.75rem; } } h4, .h4 { - font-size: 1.25rem; + font-size: calc(1.275rem + 0.3vw); +} +@media (min-width: 1200px) { + h4, .h4 { + font-size: 1.5rem; + } } h5, .h5 { - font-size: 1rem; + font-size: 1.25rem; } h6, .h6 { - font-size: 0.75rem; + font-size: 1rem; } p { @@ -291,6 +296,7 @@ kbd { font-size: 0.875em; color: var(--bs-body-bg); background-color: var(--bs-body-color); + border-radius: 0.25rem; } kbd kbd { padding: 0; @@ -312,13 +318,14 @@ table { } caption { - padding-top: 0.5rem; - padding-bottom: 0.5rem; - color: #919aa1; + padding-top: 1rem; + padding-bottom: 1rem; + color: #6c757d; text-align: left; } th { + font-weight: 500; text-align: inherit; text-align: -webkit-match-parent; } @@ -594,7 +601,7 @@ progress { margin-top: -1rem; margin-bottom: 1rem; font-size: 0.875em; - color: #919aa1; + color: #6c757d; } .blockquote-footer::before { content: "— "; @@ -609,6 +616,8 @@ progress { padding: 0.25rem; background-color: #fff; border: 1px solid var(--bs-border-color); + border-radius: 0.375rem; + box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075); max-width: 100%; height: auto; } @@ -624,7 +633,7 @@ progress { .figure-caption { font-size: 0.875em; - color: #919aa1; + color: #6c757d; } .container, @@ -1742,7 +1751,7 @@ progress { .table { --bs-table-color: var(--bs-body-color); --bs-table-bg: transparent; - --bs-table-border-color: rgba(0, 0, 0, 0.05); + --bs-table-border-color: var(--bs-border-color); --bs-table-accent-bg: transparent; --bs-table-striped-color: var(--bs-body-color); --bs-table-striped-bg: rgba(0, 0, 0, 0.05); @@ -1757,7 +1766,7 @@ progress { border-color: var(--bs-table-border-color); } .table > :not(caption) > * > * { - padding: 0.5rem 0.5rem; + padding: 1rem 1rem; background-color: var(--bs-table-bg); border-bottom-width: 1px; box-shadow: inset 0 0 0 9999px var(--bs-table-accent-bg); @@ -1778,7 +1787,7 @@ progress { } .table-sm > :not(caption) > * > * { - padding: 0.25rem 0.25rem; + padding: 0.5rem 0.5rem; } .table-bordered > :not(caption) > * { @@ -1817,13 +1826,13 @@ progress { .table-primary { --bs-table-color: #000; - --bs-table-bg: #d1d1d1; - --bs-table-border-color: #bcbcbc; - --bs-table-striped-bg: #c7c7c7; + --bs-table-bg: #d6defa; + --bs-table-border-color: #c1c8e1; + --bs-table-striped-bg: #cbd3ee; --bs-table-striped-color: #000; - --bs-table-active-bg: #bcbcbc; - --bs-table-active-color: #000; - --bs-table-hover-bg: #c1c1c1; + --bs-table-active-bg: #c1c8e1; + --bs-table-active-color: #fff; + --bs-table-hover-bg: #c6cde7; --bs-table-hover-color: #000; color: var(--bs-table-color); border-color: var(--bs-table-border-color); @@ -1845,13 +1854,13 @@ progress { .table-success { --bs-table-color: #000; - --bs-table-bg: #dbf2e3; - --bs-table-border-color: #c5dacc; - --bs-table-striped-bg: #d0e6d8; + --bs-table-bg: #d5f0e6; + --bs-table-border-color: #c0d8cf; + --bs-table-striped-bg: #cae4db; --bs-table-striped-color: #000; - --bs-table-active-bg: #c5dacc; + --bs-table-active-bg: #c0d8cf; --bs-table-active-color: #000; - --bs-table-hover-bg: #cbe0d2; + --bs-table-hover-bg: #c5ded5; --bs-table-hover-color: #000; color: var(--bs-table-color); border-color: var(--bs-table-border-color); @@ -1859,13 +1868,13 @@ progress { .table-info { --bs-table-color: #000; - --bs-table-bg: #d2ebf5; - --bs-table-border-color: #bdd4dd; - --bs-table-striped-bg: #c8dfe9; + --bs-table-bg: #d4e5f0; + --bs-table-border-color: #bfced8; + --bs-table-striped-bg: #c9dae4; --bs-table-striped-color: #000; - --bs-table-active-bg: #bdd4dd; + --bs-table-active-bg: #bfced8; --bs-table-active-color: #000; - --bs-table-hover-bg: #c2d9e3; + --bs-table-hover-bg: #c4d4de; --bs-table-hover-color: #000; color: var(--bs-table-color); border-color: var(--bs-table-border-color); @@ -1873,13 +1882,13 @@ progress { .table-warning { --bs-table-color: #000; - --bs-table-bg: #fcefdc; - --bs-table-border-color: #e3d7c6; - --bs-table-striped-bg: #efe3d1; + --bs-table-bg: #fdf2df; + --bs-table-border-color: #e4dac9; + --bs-table-striped-bg: #f0e6d4; --bs-table-striped-color: #000; - --bs-table-active-bg: #e3d7c6; + --bs-table-active-bg: #e4dac9; --bs-table-active-color: #000; - --bs-table-hover-bg: #e9ddcc; + --bs-table-hover-bg: #eae0ce; --bs-table-hover-color: #000; color: var(--bs-table-color); border-color: var(--bs-table-border-color); @@ -1887,13 +1896,13 @@ progress { .table-danger { --bs-table-color: #000; - --bs-table-bg: #f7dddc; - --bs-table-border-color: #dec7c6; - --bs-table-striped-bg: #ebd2d1; + --bs-table-bg: #f8d4d5; + --bs-table-border-color: #dfbfc0; + --bs-table-striped-bg: #ecc9ca; --bs-table-striped-color: #000; - --bs-table-active-bg: #dec7c6; - --bs-table-active-color: #000; - --bs-table-hover-bg: #e4cccc; + --bs-table-active-bg: #dfbfc0; + --bs-table-active-color: #fff; + --bs-table-hover-bg: #e5c4c5; --bs-table-hover-color: #000; color: var(--bs-table-color); border-color: var(--bs-table-border-color); @@ -1901,13 +1910,13 @@ progress { .table-light { --bs-table-color: #000; - --bs-table-bg: #fff; - --bs-table-border-color: #e6e6e6; - --bs-table-striped-bg: #f2f2f2; + --bs-table-bg: #f8f9fa; + --bs-table-border-color: #dfe0e1; + --bs-table-striped-bg: #ecedee; --bs-table-striped-color: #000; - --bs-table-active-bg: #e6e6e6; + --bs-table-active-bg: #dfe0e1; --bs-table-active-color: #000; - --bs-table-hover-bg: #ececec; + --bs-table-hover-bg: #e5e6e7; --bs-table-hover-color: #000; color: var(--bs-table-color); border-color: var(--bs-table-border-color); @@ -1915,13 +1924,13 @@ progress { .table-dark { --bs-table-color: #fff; - --bs-table-bg: #343a40; - --bs-table-border-color: #484e53; - --bs-table-striped-bg: #3e444a; + --bs-table-bg: #212529; + --bs-table-border-color: #373b3e; + --bs-table-striped-bg: #2c3034; --bs-table-striped-color: #fff; - --bs-table-active-bg: #484e53; + --bs-table-active-bg: #373b3e; --bs-table-active-color: #fff; - --bs-table-hover-bg: #43494e; + --bs-table-hover-bg: #323539; --bs-table-hover-color: #fff; color: var(--bs-table-color); border-color: var(--bs-table-border-color); @@ -1964,49 +1973,52 @@ progress { } .form-label { margin-bottom: 0.5rem; + font-weight: 500; } .col-form-label { - padding-top: 0.75rem; - padding-bottom: 0.75rem; + padding-top: calc(0.5rem + 1px); + padding-bottom: calc(0.5rem + 1px); margin-bottom: 0; font-size: inherit; + font-weight: 500; line-height: 1.5; } .col-form-label-lg { - padding-top: 2rem; - padding-bottom: 2rem; + padding-top: calc(0.5rem + 1px); + padding-bottom: calc(0.5rem + 1px); font-size: 1.25rem; } .col-form-label-sm { - padding-top: 0.5rem; - padding-bottom: 0.5rem; + padding-top: calc(0.25rem + 1px); + padding-bottom: calc(0.25rem + 1px); font-size: 0.875rem; } .form-text { margin-top: 0.25rem; font-size: 0.875em; - color: #919aa1; + color: #6c757d; } .form-control { display: block; width: 100%; - padding: 0.75rem 1.5rem; - font-size: 1rem; + padding: 0.5rem 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; - color: #55595c; - background-color: #f7f7f9; + color: #495057; + background-color: #fff; background-clip: padding-box; - border: 0 solid #ced4da; + border: 1px solid #ced4da; -webkit-appearance: none; -moz-appearance: none; appearance: none; - border-radius: 0; + border-radius: 0.375rem; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { @@ -2021,55 +2033,55 @@ progress { cursor: pointer; } .form-control:focus { - color: #55595c; - background-color: #f7f7f9; - border-color: #8d8d8d; + color: #495057; + background-color: #fff; + border-color: #9aacf3; outline: 0; - box-shadow: 0 0 0 0.25rem rgba(26, 26, 26, 0.25); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05), 0 0 0 0.25rem rgba(52, 89, 230, 0.25); } .form-control::-webkit-date-and-time-value { height: 1.5em; } .form-control::-moz-placeholder { - color: #919aa1; + color: #6c757d; opacity: 1; } .form-control::placeholder { - color: #919aa1; + color: #6c757d; opacity: 1; } .form-control:disabled { - background-color: #eceeef; + background-color: #e9ecef; opacity: 1; } .form-control::-webkit-file-upload-button { - padding: 0.75rem 1.5rem; - margin: -0.75rem -1.5rem; - -webkit-margin-end: 1.5rem; - margin-inline-end: 1.5rem; - color: #55595c; - background-color: #eceeef; + padding: 0.5rem 1rem; + margin: -0.5rem -1rem; + -webkit-margin-end: 1rem; + margin-inline-end: 1rem; + color: #495057; + background-color: #f8f9fa; pointer-events: none; border-color: inherit; border-style: solid; border-width: 0; - border-inline-end-width: 0; + border-inline-end-width: 1px; border-radius: 0; -webkit-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } .form-control::file-selector-button { - padding: 0.75rem 1.5rem; - margin: -0.75rem -1.5rem; - -webkit-margin-end: 1.5rem; - margin-inline-end: 1.5rem; - color: #55595c; - background-color: #eceeef; + padding: 0.5rem 1rem; + margin: -0.5rem -1rem; + -webkit-margin-end: 1rem; + margin-inline-end: 1rem; + color: #495057; + background-color: #f8f9fa; pointer-events: none; border-color: inherit; border-style: solid; border-width: 0; - border-inline-end-width: 0; + border-inline-end-width: 1px; border-radius: 0; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } @@ -2083,22 +2095,22 @@ progress { } } .form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button { - background-color: #e0e2e3; + background-color: #ecedee; } .form-control:hover:not(:disabled):not([readonly])::file-selector-button { - background-color: #e0e2e3; + background-color: #ecedee; } .form-control-plaintext { display: block; width: 100%; - padding: 0.75rem 0; + padding: 0.5rem 0; margin-bottom: 0; line-height: 1.5; - color: #55595c; + color: #495057; background-color: transparent; border: solid transparent; - border-width: 0 0; + border-width: 1px 0; } .form-control-plaintext:focus { outline: 0; @@ -2109,85 +2121,92 @@ progress { } .form-control-sm { - min-height: calc(1.5em + 1rem); - padding: 0.5rem 1rem; + min-height: calc(1.5em + 0.5rem + 2px); + padding: 0.25rem 0.5rem; font-size: 0.875rem; + border-radius: 0.25rem; } .form-control-sm::-webkit-file-upload-button { - padding: 0.5rem 1rem; - margin: -0.5rem -1rem; - -webkit-margin-end: 1rem; - margin-inline-end: 1rem; + padding: 0.25rem 0.5rem; + margin: -0.25rem -0.5rem; + -webkit-margin-end: 0.5rem; + margin-inline-end: 0.5rem; } .form-control-sm::file-selector-button { - padding: 0.5rem 1rem; - margin: -0.5rem -1rem; - -webkit-margin-end: 1rem; - margin-inline-end: 1rem; + padding: 0.25rem 0.5rem; + margin: -0.25rem -0.5rem; + -webkit-margin-end: 0.5rem; + margin-inline-end: 0.5rem; } .form-control-lg { - min-height: calc(1.5em + 4rem); - padding: 2rem 2rem; + min-height: calc(1.5em + 1rem + 2px); + padding: 0.5rem 1rem; font-size: 1.25rem; + border-radius: 0.5rem; } .form-control-lg::-webkit-file-upload-button { - padding: 2rem 2rem; - margin: -2rem -2rem; - -webkit-margin-end: 2rem; - margin-inline-end: 2rem; + padding: 0.5rem 1rem; + margin: -0.5rem -1rem; + -webkit-margin-end: 1rem; + margin-inline-end: 1rem; } .form-control-lg::file-selector-button { - padding: 2rem 2rem; - margin: -2rem -2rem; - -webkit-margin-end: 2rem; - margin-inline-end: 2rem; + padding: 0.5rem 1rem; + margin: -0.5rem -1rem; + -webkit-margin-end: 1rem; + margin-inline-end: 1rem; } textarea.form-control { - min-height: calc(1.5em + 1.5rem); + min-height: calc(1.5em + 1rem + 2px); } textarea.form-control-sm { - min-height: calc(1.5em + 1rem); + min-height: calc(1.5em + 0.5rem + 2px); } textarea.form-control-lg { - min-height: calc(1.5em + 4rem); + min-height: calc(1.5em + 1rem + 2px); } .form-control-color { width: 3rem; - height: calc(1.5em + 1.5rem); - padding: 0.75rem; + height: calc(1.5em + 1rem + 2px); + padding: 0.5rem; } .form-control-color:not(:disabled):not([readonly]) { cursor: pointer; } .form-control-color::-moz-color-swatch { border: 0 !important; + border-radius: 0.375rem; +} +.form-control-color::-webkit-color-swatch { + border-radius: 0.375rem; } .form-control-color.form-control-sm { - height: calc(1.5em + 1rem); + height: calc(1.5em + 0.5rem + 2px); } .form-control-color.form-control-lg { - height: calc(1.5em + 4rem); + height: calc(1.5em + 1rem + 2px); } .form-select { display: block; width: 100%; - padding: 0.75rem 4.5rem 0.75rem 1.5rem; - -moz-padding-start: calc(1.5rem - 3px); - font-size: 1rem; + padding: 0.5rem 3rem 0.5rem 1rem; + -moz-padding-start: calc(1rem - 3px); + font-size: 0.875rem; font-weight: 400; line-height: 1.5; - color: #55595c; - background-color: #f7f7f9; + color: #495057; + background-color: #fff; background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"); background-repeat: no-repeat; - background-position: right 1.5rem center; + background-position: right 1rem center; background-size: 16px 12px; - border: 0 solid #ced4da; - border-radius: 0; + border: 1px solid #ced4da; + border-radius: 0.375rem; + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; -webkit-appearance: none; -moz-appearance: none; @@ -2199,34 +2218,36 @@ textarea.form-control-lg { } } .form-select:focus { - border-color: #8d8d8d; + border-color: #9aacf3; outline: 0; - box-shadow: 0 0 0 0.25rem rgba(26, 26, 26, 0.25); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 0 0.25rem rgba(52, 89, 230, 0.25); } .form-select[multiple], .form-select[size]:not([size="1"]) { - padding-right: 1.5rem; + padding-right: 1rem; background-image: none; } .form-select:disabled { - background-color: #f7f7f9; + background-color: #e9ecef; } .form-select:-moz-focusring { color: transparent; - text-shadow: 0 0 0 #55595c; + text-shadow: 0 0 0 #495057; } .form-select-sm { - padding-top: 0.5rem; - padding-bottom: 0.5rem; - padding-left: 1rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; + padding-left: 0.5rem; font-size: 0.875rem; + border-radius: 0.25rem; } .form-select-lg { - padding-top: 2rem; - padding-bottom: 2rem; - padding-left: 2rem; + padding-top: 0.5rem; + padding-bottom: 0.5rem; + padding-left: 1rem; font-size: 1.25rem; + border-radius: 0.5rem; } .form-check { @@ -2256,7 +2277,7 @@ textarea.form-control-lg { height: 1em; margin-top: 0.25em; vertical-align: top; - background-color: #f7f7f9; + background-color: #fff; background-repeat: no-repeat; background-position: center; background-size: contain; @@ -2268,6 +2289,9 @@ textarea.form-control-lg { color-adjust: exact; print-color-adjust: exact; } +.form-check-input[type=checkbox] { + border-radius: 0.25em; +} .form-check-input[type=radio] { border-radius: 50%; } @@ -2275,13 +2299,13 @@ textarea.form-control-lg { filter: brightness(90%); } .form-check-input:focus { - border-color: #8d8d8d; + border-color: #9aacf3; outline: 0; - box-shadow: 0 0 0 0.25rem rgba(26, 26, 26, 0.25); + box-shadow: 0 0 0 0.25rem rgba(52, 89, 230, 0.25); } .form-check-input:checked { - background-color: #1a1a1a; - border-color: #1a1a1a; + background-color: #3459e6; + border-color: #3459e6; } .form-check-input:checked[type=checkbox] { background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e"); @@ -2290,8 +2314,8 @@ textarea.form-control-lg { background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='2' fill='%23fff'/%3e%3c/svg%3e"); } .form-check-input[type=checkbox]:indeterminate { - background-color: #1a1a1a; - border-color: #1a1a1a; + background-color: #3459e6; + border-color: #3459e6; background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10h8'/%3e%3c/svg%3e"); } .form-check-input:disabled { @@ -2312,6 +2336,7 @@ textarea.form-control-lg { margin-left: -2.5em; background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='rgba%280, 0, 0, 0.25%29'/%3e%3c/svg%3e"); background-position: left center; + border-radius: 2em; transition: background-position 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { @@ -2320,7 +2345,7 @@ textarea.form-control-lg { } } .form-switch .form-check-input:focus { - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%238d8d8d'/%3e%3c/svg%3e"); + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%239aacf3'/%3e%3c/svg%3e"); } .form-switch .form-check-input:checked { background-position: right center; @@ -2364,10 +2389,10 @@ textarea.form-control-lg { outline: 0; } .form-range:focus::-webkit-slider-thumb { - box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(26, 26, 26, 0.25); + box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(52, 89, 230, 0.25); } .form-range:focus::-moz-range-thumb { - box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(26, 26, 26, 0.25); + box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(52, 89, 230, 0.25); } .form-range::-moz-focus-outer { border: 0; @@ -2376,8 +2401,10 @@ textarea.form-control-lg { width: 1rem; height: 1rem; margin-top: -0.25rem; - background-color: #1a1a1a; + background-color: #3459e6; border: 0; + border-radius: 1rem; + box-shadow: 0 0.1rem 0.25rem rgba(0, 0, 0, 0.1); -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; -webkit-appearance: none; @@ -2390,21 +2417,25 @@ textarea.form-control-lg { } } .form-range::-webkit-slider-thumb:active { - background-color: #bababa; + background-color: #c2cdf8; } .form-range::-webkit-slider-runnable-track { width: 100%; height: 0.5rem; color: transparent; cursor: pointer; - background-color: #eceeef; + background-color: #dee2e6; border-color: transparent; + border-radius: 1rem; + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); } .form-range::-moz-range-thumb { width: 1rem; height: 1rem; - background-color: #1a1a1a; + background-color: #3459e6; border: 0; + border-radius: 1rem; + box-shadow: 0 0.1rem 0.25rem rgba(0, 0, 0, 0.1); -moz-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; -moz-appearance: none; @@ -2417,15 +2448,17 @@ textarea.form-control-lg { } } .form-range::-moz-range-thumb:active { - background-color: #bababa; + background-color: #c2cdf8; } .form-range::-moz-range-track { width: 100%; height: 0.5rem; color: transparent; cursor: pointer; - background-color: #eceeef; + background-color: #dee2e6; border-color: transparent; + border-radius: 1rem; + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); } .form-range:disabled { pointer-events: none; @@ -2443,7 +2476,7 @@ textarea.form-control-lg { .form-floating > .form-control, .form-floating > .form-control-plaintext, .form-floating > .form-select { - height: 3.5rem; + height: calc(3.5rem + 2px); line-height: 1.25; } .form-floating > label { @@ -2452,13 +2485,13 @@ textarea.form-control-lg { left: 0; width: 100%; height: 100%; - padding: 1rem 1.5rem; + padding: 1rem 1rem; overflow: hidden; text-align: start; text-overflow: ellipsis; white-space: nowrap; pointer-events: none; - border: 0 solid transparent; + border: 1px solid transparent; transform-origin: 0 0; transition: opacity 0.1s ease-in-out, transform 0.1s ease-in-out; } @@ -2469,7 +2502,7 @@ textarea.form-control-lg { } .form-floating > .form-control, .form-floating > .form-control-plaintext { - padding: 1rem 1.5rem; + padding: 1rem 1rem; } .form-floating > .form-control::-moz-placeholder, .form-floating > .form-control-plaintext::-moz-placeholder { color: transparent; @@ -2513,7 +2546,7 @@ textarea.form-control-lg { transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem); } .form-floating > .form-control-plaintext ~ label { - border-width: 0 0; + border-width: 1px 0; } .input-group { @@ -2547,47 +2580,72 @@ textarea.form-control-lg { .input-group-text { display: flex; align-items: center; - padding: 0.75rem 1.5rem; - font-size: 1rem; + padding: 0.5rem 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; - color: #55595c; + color: #495057; text-align: center; white-space: nowrap; - background-color: #eceeef; - border: 0 solid #ced4da; + background-color: #f8f9fa; + border: 1px solid #ced4da; + border-radius: 0.375rem; } .input-group-lg > .form-control, .input-group-lg > .form-select, .input-group-lg > .input-group-text, .input-group-lg > .btn { - padding: 2rem 2rem; + padding: 0.5rem 1rem; font-size: 1.25rem; + border-radius: 0.5rem; } .input-group-sm > .form-control, .input-group-sm > .form-select, .input-group-sm > .input-group-text, .input-group-sm > .btn { - padding: 0.5rem 1rem; + padding: 0.25rem 0.5rem; font-size: 0.875rem; + border-radius: 0.25rem; } .input-group-lg > .form-select, .input-group-sm > .form-select { - padding-right: 6rem; + padding-right: 4rem; } +.input-group:not(.has-validation) > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating), +.input-group:not(.has-validation) > .dropdown-toggle:nth-last-child(n+3), +.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-control, +.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-select { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.input-group.has-validation > :nth-last-child(n+3):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating), +.input-group.has-validation > .dropdown-toggle:nth-last-child(n+4), +.input-group.has-validation > .form-floating:nth-last-child(n+3) > .form-control, +.input-group.has-validation > .form-floating:nth-last-child(n+3) > .form-select { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} .input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) { - margin-left: 0; + margin-left: -1px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} +.input-group > .form-floating:not(:first-child) > .form-control, +.input-group > .form-floating:not(:first-child) > .form-select { + border-top-left-radius: 0; + border-bottom-left-radius: 0; } + .valid-feedback { display: none; width: 100%; margin-top: 0.25rem; font-size: 0.875em; - color: #4bbf73; + color: #2fb380; } .valid-tooltip { @@ -2600,7 +2658,8 @@ textarea.form-control-lg { margin-top: 0.1rem; font-size: 0.875rem; color: #fff; - background-color: rgba(75, 191, 115, 0.9); + background-color: rgba(47, 179, 128, 0.9); + border-radius: 0.375rem; } .was-validated :valid ~ .valid-feedback, @@ -2611,52 +2670,52 @@ textarea.form-control-lg { } .was-validated .form-control:valid, .form-control.is-valid { - border-color: #4bbf73; - padding-right: calc(1.5em + 1.5rem); - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%234bbf73' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e"); + border-color: #2fb380; + padding-right: calc(1.5em + 1rem); + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%232fb380' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e"); background-repeat: no-repeat; - background-position: right calc(0.375em + 0.375rem) center; - background-size: calc(0.75em + 0.75rem) calc(0.75em + 0.75rem); + background-position: right calc(0.375em + 0.25rem) center; + background-size: calc(0.75em + 0.5rem) calc(0.75em + 0.5rem); } .was-validated .form-control:valid:focus, .form-control.is-valid:focus { - border-color: #4bbf73; - box-shadow: 0 0 0 0.25rem rgba(75, 191, 115, 0.25); + border-color: #2fb380; + box-shadow: 0 0 0 0.25rem rgba(47, 179, 128, 0.25); } .was-validated textarea.form-control:valid, textarea.form-control.is-valid { - padding-right: calc(1.5em + 1.5rem); - background-position: top calc(0.375em + 0.375rem) right calc(0.375em + 0.375rem); + padding-right: calc(1.5em + 1rem); + background-position: top calc(0.375em + 0.25rem) right calc(0.375em + 0.25rem); } .was-validated .form-select:valid, .form-select.is-valid { - border-color: #4bbf73; + border-color: #2fb380; } .was-validated .form-select:valid:not([multiple]):not([size]), .was-validated .form-select:valid:not([multiple])[size="1"], .form-select.is-valid:not([multiple]):not([size]), .form-select.is-valid:not([multiple])[size="1"] { - padding-right: 8.25rem; - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%234bbf73' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e"); - background-position: right 1.5rem center, center right 4.5rem; - background-size: 16px 12px, calc(0.75em + 0.75rem) calc(0.75em + 0.75rem); + padding-right: 5.5rem; + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%232fb380' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e"); + background-position: right 1rem center, center right 3rem; + background-size: 16px 12px, calc(0.75em + 0.5rem) calc(0.75em + 0.5rem); } .was-validated .form-select:valid:focus, .form-select.is-valid:focus { - border-color: #4bbf73; - box-shadow: 0 0 0 0.25rem rgba(75, 191, 115, 0.25); + border-color: #2fb380; + box-shadow: 0 0 0 0.25rem rgba(47, 179, 128, 0.25); } .was-validated .form-control-color:valid, .form-control-color.is-valid { - width: calc(3rem + calc(1.5em + 1.5rem)); + width: calc(3rem + calc(1.5em + 1rem)); } .was-validated .form-check-input:valid, .form-check-input.is-valid { - border-color: #4bbf73; + border-color: #2fb380; } .was-validated .form-check-input:valid:checked, .form-check-input.is-valid:checked { - background-color: #4bbf73; + background-color: #2fb380; } .was-validated .form-check-input:valid:focus, .form-check-input.is-valid:focus { - box-shadow: 0 0 0 0.25rem rgba(75, 191, 115, 0.25); + box-shadow: 0 0 0 0.25rem rgba(47, 179, 128, 0.25); } .was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label { - color: #4bbf73; + color: #2fb380; } .form-check-inline .form-check-input ~ .valid-feedback { @@ -2676,7 +2735,7 @@ textarea.form-control-lg { width: 100%; margin-top: 0.25rem; font-size: 0.875em; - color: #d9534f; + color: #da292e; } .invalid-tooltip { @@ -2689,7 +2748,8 @@ textarea.form-control-lg { margin-top: 0.1rem; font-size: 0.875rem; color: #fff; - background-color: rgba(217, 83, 79, 0.9); + background-color: rgba(218, 41, 46, 0.9); + border-radius: 0.375rem; } .was-validated :invalid ~ .invalid-feedback, @@ -2700,52 +2760,52 @@ textarea.form-control-lg { } .was-validated .form-control:invalid, .form-control.is-invalid { - border-color: #d9534f; - padding-right: calc(1.5em + 1.5rem); - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23d9534f'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23d9534f' stroke='none'/%3e%3c/svg%3e"); + border-color: #da292e; + padding-right: calc(1.5em + 1rem); + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23da292e'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23da292e' stroke='none'/%3e%3c/svg%3e"); background-repeat: no-repeat; - background-position: right calc(0.375em + 0.375rem) center; - background-size: calc(0.75em + 0.75rem) calc(0.75em + 0.75rem); + background-position: right calc(0.375em + 0.25rem) center; + background-size: calc(0.75em + 0.5rem) calc(0.75em + 0.5rem); } .was-validated .form-control:invalid:focus, .form-control.is-invalid:focus { - border-color: #d9534f; - box-shadow: 0 0 0 0.25rem rgba(217, 83, 79, 0.25); + border-color: #da292e; + box-shadow: 0 0 0 0.25rem rgba(218, 41, 46, 0.25); } .was-validated textarea.form-control:invalid, textarea.form-control.is-invalid { - padding-right: calc(1.5em + 1.5rem); - background-position: top calc(0.375em + 0.375rem) right calc(0.375em + 0.375rem); + padding-right: calc(1.5em + 1rem); + background-position: top calc(0.375em + 0.25rem) right calc(0.375em + 0.25rem); } .was-validated .form-select:invalid, .form-select.is-invalid { - border-color: #d9534f; + border-color: #da292e; } .was-validated .form-select:invalid:not([multiple]):not([size]), .was-validated .form-select:invalid:not([multiple])[size="1"], .form-select.is-invalid:not([multiple]):not([size]), .form-select.is-invalid:not([multiple])[size="1"] { - padding-right: 8.25rem; - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23d9534f'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23d9534f' stroke='none'/%3e%3c/svg%3e"); - background-position: right 1.5rem center, center right 4.5rem; - background-size: 16px 12px, calc(0.75em + 0.75rem) calc(0.75em + 0.75rem); + padding-right: 5.5rem; + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23da292e'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23da292e' stroke='none'/%3e%3c/svg%3e"); + background-position: right 1rem center, center right 3rem; + background-size: 16px 12px, calc(0.75em + 0.5rem) calc(0.75em + 0.5rem); } .was-validated .form-select:invalid:focus, .form-select.is-invalid:focus { - border-color: #d9534f; - box-shadow: 0 0 0 0.25rem rgba(217, 83, 79, 0.25); + border-color: #da292e; + box-shadow: 0 0 0 0.25rem rgba(218, 41, 46, 0.25); } .was-validated .form-control-color:invalid, .form-control-color.is-invalid { - width: calc(3rem + calc(1.5em + 1.5rem)); + width: calc(3rem + calc(1.5em + 1rem)); } .was-validated .form-check-input:invalid, .form-check-input.is-invalid { - border-color: #d9534f; + border-color: #da292e; } .was-validated .form-check-input:invalid:checked, .form-check-input.is-invalid:checked { - background-color: #d9534f; + background-color: #da292e; } .was-validated .form-check-input:invalid:focus, .form-check-input.is-invalid:focus { - box-shadow: 0 0 0 0.25rem rgba(217, 83, 79, 0.25); + box-shadow: 0 0 0 0.25rem rgba(218, 41, 46, 0.25); } .was-validated .form-check-input:invalid ~ .form-check-label, .form-check-input.is-invalid ~ .form-check-label { - color: #d9534f; + color: #da292e; } .form-check-inline .form-check-input ~ .invalid-feedback { @@ -2761,19 +2821,19 @@ textarea.form-control-lg { } .btn { - --bs-btn-padding-x: 1.5rem; - --bs-btn-padding-y: 0.75rem; + --bs-btn-padding-x: 1rem; + --bs-btn-padding-y: 0.5rem; --bs-btn-font-family: ; - --bs-btn-font-size: 1rem; - --bs-btn-font-weight: 600; - --bs-btn-line-height: 1.5rem; - --bs-btn-color: #55595c; + --bs-btn-font-size: 0.875rem; + --bs-btn-font-weight: 500; + --bs-btn-line-height: 1.5; + --bs-btn-color: #495057; --bs-btn-bg: transparent; - --bs-btn-border-width: 0; + --bs-btn-border-width: 1px; --bs-btn-border-color: transparent; --bs-btn-border-radius: 0.375rem; --bs-btn-hover-border-color: transparent; - --bs-btn-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075); + --bs-btn-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-btn-disabled-opacity: 0.65; --bs-btn-focus-box-shadow: 0 0 0 0.25rem rgba(var(--bs-btn-focus-shadow-rgb), .5); display: inline-block; @@ -2791,7 +2851,9 @@ textarea.form-control-lg { -moz-user-select: none; user-select: none; border: var(--bs-btn-border-width) solid var(--bs-btn-border-color); + border-radius: var(--bs-btn-border-radius); background-color: var(--bs-btn-bg); + box-shadow: var(--bs-btn-box-shadow); transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { @@ -2799,30 +2861,36 @@ textarea.form-control-lg { transition: none; } } -:not(.btn-check) + .btn:hover, .btn:first-child:hover { +.btn:hover { color: var(--bs-btn-hover-color); background-color: var(--bs-btn-hover-bg); border-color: var(--bs-btn-hover-border-color); } +.btn-check + .btn:hover { + color: var(--bs-btn-color); + background-color: var(--bs-btn-bg); + border-color: var(--bs-btn-border-color); +} .btn:focus-visible { color: var(--bs-btn-hover-color); background-color: var(--bs-btn-hover-bg); border-color: var(--bs-btn-hover-border-color); outline: 0; - box-shadow: var(--bs-btn-focus-box-shadow); + box-shadow: var(--bs-btn-box-shadow), var(--bs-btn-focus-box-shadow); } .btn-check:focus-visible + .btn { border-color: var(--bs-btn-hover-border-color); outline: 0; - box-shadow: var(--bs-btn-focus-box-shadow); + box-shadow: var(--bs-btn-box-shadow), var(--bs-btn-focus-box-shadow); } .btn-check:checked + .btn, :not(.btn-check) + .btn:active, .btn:first-child:active, .btn.active, .btn.show { color: var(--bs-btn-active-color); background-color: var(--bs-btn-active-bg); border-color: var(--bs-btn-active-border-color); + box-shadow: var(--bs-btn-active-shadow); } .btn-check:checked + .btn:focus-visible, :not(.btn-check) + .btn:active:focus-visible, .btn:first-child:active:focus-visible, .btn.active:focus-visible, .btn.show:focus-visible { - box-shadow: var(--bs-btn-focus-box-shadow); + box-shadow: var(--bs-btn-active-shadow), var(--bs-btn-focus-box-shadow); } .btn:disabled, .btn.disabled, fieldset:disabled .btn { color: var(--bs-btn-disabled-color); @@ -2830,23 +2898,24 @@ textarea.form-control-lg { background-color: var(--bs-btn-disabled-bg); border-color: var(--bs-btn-disabled-border-color); opacity: var(--bs-btn-disabled-opacity); + box-shadow: none; } .btn-primary { --bs-btn-color: #fff; - --bs-btn-bg: #1a1a1a; - --bs-btn-border-color: #1a1a1a; + --bs-btn-bg: #3459e6; + --bs-btn-border-color: #3459e6; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #161616; - --bs-btn-hover-border-color: #151515; - --bs-btn-focus-shadow-rgb: 60, 60, 60; + --bs-btn-hover-bg: #2c4cc4; + --bs-btn-hover-border-color: #2a47b8; + --bs-btn-focus-shadow-rgb: 82, 114, 234; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #151515; - --bs-btn-active-border-color: #141414; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-active-bg: #2a47b8; + --bs-btn-active-border-color: #2743ad; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-btn-disabled-color: #fff; - --bs-btn-disabled-bg: #1a1a1a; - --bs-btn-disabled-border-color: #1a1a1a; + --bs-btn-disabled-bg: #3459e6; + --bs-btn-disabled-border-color: #3459e6; } .btn-secondary { @@ -2860,7 +2929,7 @@ textarea.form-control-lg { --bs-btn-active-color: #000; --bs-btn-active-bg: white; --bs-btn-active-border-color: white; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-btn-disabled-color: #000; --bs-btn-disabled-bg: #fff; --bs-btn-disabled-border-color: #fff; @@ -2868,120 +2937,120 @@ textarea.form-control-lg { .btn-success { --bs-btn-color: #fff; - --bs-btn-bg: #4bbf73; - --bs-btn-border-color: #4bbf73; + --bs-btn-bg: #2fb380; + --bs-btn-border-color: #2fb380; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #40a262; - --bs-btn-hover-border-color: #3c995c; - --bs-btn-focus-shadow-rgb: 102, 201, 136; + --bs-btn-hover-bg: #28986d; + --bs-btn-hover-border-color: #268f66; + --bs-btn-focus-shadow-rgb: 78, 190, 147; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #3c995c; - --bs-btn-active-border-color: #388f56; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-active-bg: #268f66; + --bs-btn-active-border-color: #238660; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-btn-disabled-color: #fff; - --bs-btn-disabled-bg: #4bbf73; - --bs-btn-disabled-border-color: #4bbf73; + --bs-btn-disabled-bg: #2fb380; + --bs-btn-disabled-border-color: #2fb380; } .btn-info { --bs-btn-color: #fff; - --bs-btn-bg: #1f9bcf; - --bs-btn-border-color: #1f9bcf; + --bs-btn-bg: #287bb5; + --bs-btn-border-color: #287bb5; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #1a84b0; - --bs-btn-hover-border-color: #197ca6; - --bs-btn-focus-shadow-rgb: 65, 170, 214; + --bs-btn-hover-bg: #22699a; + --bs-btn-hover-border-color: #206291; + --bs-btn-focus-shadow-rgb: 72, 143, 192; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #197ca6; - --bs-btn-active-border-color: #17749b; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-active-bg: #206291; + --bs-btn-active-border-color: #1e5c88; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-btn-disabled-color: #fff; - --bs-btn-disabled-bg: #1f9bcf; - --bs-btn-disabled-border-color: #1f9bcf; + --bs-btn-disabled-bg: #287bb5; + --bs-btn-disabled-border-color: #287bb5; } .btn-warning { - --bs-btn-color: #000; - --bs-btn-bg: #f0ad4e; - --bs-btn-border-color: #f0ad4e; - --bs-btn-hover-color: #000; - --bs-btn-hover-bg: #f2b969; - --bs-btn-hover-border-color: #f2b560; - --bs-btn-focus-shadow-rgb: 204, 147, 66; - --bs-btn-active-color: #000; - --bs-btn-active-bg: #f3bd71; - --bs-btn-active-border-color: #f2b560; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - --bs-btn-disabled-color: #000; - --bs-btn-disabled-bg: #f0ad4e; - --bs-btn-disabled-border-color: #f0ad4e; + --bs-btn-color: #fff; + --bs-btn-bg: #f4bd61; + --bs-btn-border-color: #f4bd61; + --bs-btn-hover-color: #fff; + --bs-btn-hover-bg: #cfa152; + --bs-btn-hover-border-color: #c3974e; + --bs-btn-focus-shadow-rgb: 246, 199, 121; + --bs-btn-active-color: #fff; + --bs-btn-active-bg: #c3974e; + --bs-btn-active-border-color: #b78e49; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-btn-disabled-color: #fff; + --bs-btn-disabled-bg: #f4bd61; + --bs-btn-disabled-border-color: #f4bd61; } .btn-danger { --bs-btn-color: #fff; - --bs-btn-bg: #d9534f; - --bs-btn-border-color: #d9534f; + --bs-btn-bg: #da292e; + --bs-btn-border-color: #da292e; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #b84743; - --bs-btn-hover-border-color: #ae423f; - --bs-btn-focus-shadow-rgb: 223, 109, 105; + --bs-btn-hover-bg: #b92327; + --bs-btn-hover-border-color: #ae2125; + --bs-btn-focus-shadow-rgb: 224, 73, 77; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #ae423f; - --bs-btn-active-border-color: #a33e3b; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-active-bg: #ae2125; + --bs-btn-active-border-color: #a41f23; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-btn-disabled-color: #fff; - --bs-btn-disabled-bg: #d9534f; - --bs-btn-disabled-border-color: #d9534f; + --bs-btn-disabled-bg: #da292e; + --bs-btn-disabled-border-color: #da292e; } .btn-light { --bs-btn-color: #000; - --bs-btn-bg: #fff; - --bs-btn-border-color: #fff; + --bs-btn-bg: #f8f9fa; + --bs-btn-border-color: #f8f9fa; --bs-btn-hover-color: #000; - --bs-btn-hover-bg: #d9d9d9; - --bs-btn-hover-border-color: #cccccc; - --bs-btn-focus-shadow-rgb: 217, 217, 217; - --bs-btn-active-color: #000; - --bs-btn-active-bg: #cccccc; - --bs-btn-active-border-color: #bfbfbf; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-hover-bg: #d3d4d5; + --bs-btn-hover-border-color: #c6c7c8; + --bs-btn-focus-shadow-rgb: 211, 212, 213; + --bs-btn-active-color: #fff; + --bs-btn-active-bg: #c6c7c8; + --bs-btn-active-border-color: #babbbc; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-btn-disabled-color: #000; - --bs-btn-disabled-bg: #fff; - --bs-btn-disabled-border-color: #fff; + --bs-btn-disabled-bg: #f8f9fa; + --bs-btn-disabled-border-color: #f8f9fa; } .btn-dark { --bs-btn-color: #fff; - --bs-btn-bg: #343a40; - --bs-btn-border-color: #343a40; + --bs-btn-bg: #212529; + --bs-btn-border-color: #212529; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #52585d; - --bs-btn-hover-border-color: #484e53; - --bs-btn-focus-shadow-rgb: 82, 88, 93; + --bs-btn-hover-bg: #424649; + --bs-btn-hover-border-color: #373b3e; + --bs-btn-focus-shadow-rgb: 66, 70, 73; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #5d6166; - --bs-btn-active-border-color: #484e53; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-active-bg: #4d5154; + --bs-btn-active-border-color: #373b3e; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-btn-disabled-color: #fff; - --bs-btn-disabled-bg: #343a40; - --bs-btn-disabled-border-color: #343a40; + --bs-btn-disabled-bg: #212529; + --bs-btn-disabled-border-color: #212529; } .btn-outline-primary { - --bs-btn-color: #1a1a1a; - --bs-btn-border-color: #1a1a1a; + --bs-btn-color: #3459e6; + --bs-btn-border-color: #3459e6; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #1a1a1a; - --bs-btn-hover-border-color: #1a1a1a; - --bs-btn-focus-shadow-rgb: 26, 26, 26; + --bs-btn-hover-bg: #3459e6; + --bs-btn-hover-border-color: #3459e6; + --bs-btn-focus-shadow-rgb: 52, 89, 230; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #1a1a1a; - --bs-btn-active-border-color: #1a1a1a; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - --bs-btn-disabled-color: #1a1a1a; + --bs-btn-active-bg: #3459e6; + --bs-btn-active-border-color: #3459e6; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-btn-disabled-color: #3459e6; --bs-btn-disabled-bg: transparent; - --bs-btn-disabled-border-color: #1a1a1a; + --bs-btn-disabled-border-color: #3459e6; --bs-gradient: none; } @@ -2995,7 +3064,7 @@ textarea.form-control-lg { --bs-btn-active-color: #000; --bs-btn-active-bg: #fff; --bs-btn-active-border-color: #fff; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-btn-disabled-color: #fff; --bs-btn-disabled-bg: transparent; --bs-btn-disabled-border-color: #fff; @@ -3003,104 +3072,104 @@ textarea.form-control-lg { } .btn-outline-success { - --bs-btn-color: #4bbf73; - --bs-btn-border-color: #4bbf73; + --bs-btn-color: #2fb380; + --bs-btn-border-color: #2fb380; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #4bbf73; - --bs-btn-hover-border-color: #4bbf73; - --bs-btn-focus-shadow-rgb: 75, 191, 115; + --bs-btn-hover-bg: #2fb380; + --bs-btn-hover-border-color: #2fb380; + --bs-btn-focus-shadow-rgb: 47, 179, 128; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #4bbf73; - --bs-btn-active-border-color: #4bbf73; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - --bs-btn-disabled-color: #4bbf73; + --bs-btn-active-bg: #2fb380; + --bs-btn-active-border-color: #2fb380; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-btn-disabled-color: #2fb380; --bs-btn-disabled-bg: transparent; - --bs-btn-disabled-border-color: #4bbf73; + --bs-btn-disabled-border-color: #2fb380; --bs-gradient: none; } .btn-outline-info { - --bs-btn-color: #1f9bcf; - --bs-btn-border-color: #1f9bcf; + --bs-btn-color: #287bb5; + --bs-btn-border-color: #287bb5; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #1f9bcf; - --bs-btn-hover-border-color: #1f9bcf; - --bs-btn-focus-shadow-rgb: 31, 155, 207; + --bs-btn-hover-bg: #287bb5; + --bs-btn-hover-border-color: #287bb5; + --bs-btn-focus-shadow-rgb: 40, 123, 181; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #1f9bcf; - --bs-btn-active-border-color: #1f9bcf; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - --bs-btn-disabled-color: #1f9bcf; + --bs-btn-active-bg: #287bb5; + --bs-btn-active-border-color: #287bb5; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-btn-disabled-color: #287bb5; --bs-btn-disabled-bg: transparent; - --bs-btn-disabled-border-color: #1f9bcf; + --bs-btn-disabled-border-color: #287bb5; --bs-gradient: none; } .btn-outline-warning { - --bs-btn-color: #f0ad4e; - --bs-btn-border-color: #f0ad4e; - --bs-btn-hover-color: #000; - --bs-btn-hover-bg: #f0ad4e; - --bs-btn-hover-border-color: #f0ad4e; - --bs-btn-focus-shadow-rgb: 240, 173, 78; - --bs-btn-active-color: #000; - --bs-btn-active-bg: #f0ad4e; - --bs-btn-active-border-color: #f0ad4e; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - --bs-btn-disabled-color: #f0ad4e; + --bs-btn-color: #f4bd61; + --bs-btn-border-color: #f4bd61; + --bs-btn-hover-color: #fff; + --bs-btn-hover-bg: #f4bd61; + --bs-btn-hover-border-color: #f4bd61; + --bs-btn-focus-shadow-rgb: 244, 189, 97; + --bs-btn-active-color: #fff; + --bs-btn-active-bg: #f4bd61; + --bs-btn-active-border-color: #f4bd61; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-btn-disabled-color: #f4bd61; --bs-btn-disabled-bg: transparent; - --bs-btn-disabled-border-color: #f0ad4e; + --bs-btn-disabled-border-color: #f4bd61; --bs-gradient: none; } .btn-outline-danger { - --bs-btn-color: #d9534f; - --bs-btn-border-color: #d9534f; + --bs-btn-color: #da292e; + --bs-btn-border-color: #da292e; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #d9534f; - --bs-btn-hover-border-color: #d9534f; - --bs-btn-focus-shadow-rgb: 217, 83, 79; + --bs-btn-hover-bg: #da292e; + --bs-btn-hover-border-color: #da292e; + --bs-btn-focus-shadow-rgb: 218, 41, 46; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #d9534f; - --bs-btn-active-border-color: #d9534f; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - --bs-btn-disabled-color: #d9534f; + --bs-btn-active-bg: #da292e; + --bs-btn-active-border-color: #da292e; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-btn-disabled-color: #da292e; --bs-btn-disabled-bg: transparent; - --bs-btn-disabled-border-color: #d9534f; + --bs-btn-disabled-border-color: #da292e; --bs-gradient: none; } .btn-outline-light { - --bs-btn-color: #fff; - --bs-btn-border-color: #fff; + --bs-btn-color: #f8f9fa; + --bs-btn-border-color: #f8f9fa; --bs-btn-hover-color: #000; - --bs-btn-hover-bg: #fff; - --bs-btn-hover-border-color: #fff; - --bs-btn-focus-shadow-rgb: 255, 255, 255; + --bs-btn-hover-bg: #f8f9fa; + --bs-btn-hover-border-color: #f8f9fa; + --bs-btn-focus-shadow-rgb: 248, 249, 250; --bs-btn-active-color: #000; - --bs-btn-active-bg: #fff; - --bs-btn-active-border-color: #fff; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - --bs-btn-disabled-color: #fff; + --bs-btn-active-bg: #f8f9fa; + --bs-btn-active-border-color: #f8f9fa; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-btn-disabled-color: #f8f9fa; --bs-btn-disabled-bg: transparent; - --bs-btn-disabled-border-color: #fff; + --bs-btn-disabled-border-color: #f8f9fa; --bs-gradient: none; } .btn-outline-dark { - --bs-btn-color: #343a40; - --bs-btn-border-color: #343a40; + --bs-btn-color: #212529; + --bs-btn-border-color: #212529; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #343a40; - --bs-btn-hover-border-color: #343a40; - --bs-btn-focus-shadow-rgb: 52, 58, 64; + --bs-btn-hover-bg: #212529; + --bs-btn-hover-border-color: #212529; + --bs-btn-focus-shadow-rgb: 33, 37, 41; --bs-btn-active-color: #fff; - --bs-btn-active-bg: #343a40; - --bs-btn-active-border-color: #343a40; - --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - --bs-btn-disabled-color: #343a40; + --bs-btn-active-bg: #212529; + --bs-btn-active-border-color: #212529; + --bs-btn-active-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-btn-disabled-color: #212529; --bs-btn-disabled-bg: transparent; - --bs-btn-disabled-border-color: #343a40; + --bs-btn-disabled-border-color: #212529; --bs-gradient: none; } @@ -3113,10 +3182,10 @@ textarea.form-control-lg { --bs-btn-hover-border-color: transparent; --bs-btn-active-color: var(--bs-link-hover-color); --bs-btn-active-border-color: transparent; - --bs-btn-disabled-color: #919aa1; + --bs-btn-disabled-color: #6c757d; --bs-btn-disabled-border-color: transparent; --bs-btn-box-shadow: none; - --bs-btn-focus-shadow-rgb: 60, 60, 60; + --bs-btn-focus-shadow-rgb: 82, 114, 234; text-decoration: underline; } .btn-link:focus-visible { @@ -3127,15 +3196,15 @@ textarea.form-control-lg { } .btn-lg, .btn-group-lg > .btn { - --bs-btn-padding-y: 2rem; - --bs-btn-padding-x: 2rem; + --bs-btn-padding-y: 0.5rem; + --bs-btn-padding-x: 1rem; --bs-btn-font-size: 1.25rem; --bs-btn-border-radius: 0.5rem; } .btn-sm, .btn-group-sm > .btn { - --bs-btn-padding-y: 0.5rem; - --bs-btn-padding-x: 1rem; + --bs-btn-padding-y: 0.25rem; + --bs-btn-padding-x: 0.5rem; --bs-btn-font-size: 0.875rem; --bs-btn-border-radius: 0.25rem; } @@ -3209,25 +3278,25 @@ textarea.form-control-lg { --bs-dropdown-padding-x: 0; --bs-dropdown-padding-y: 0.5rem; --bs-dropdown-spacer: 0.125rem; - --bs-dropdown-font-size: 1rem; - --bs-dropdown-color: #55595c; + --bs-dropdown-font-size: 0.875rem; + --bs-dropdown-color: #495057; --bs-dropdown-bg: #fff; - --bs-dropdown-border-color: var(--bs-border-color-translucent); + --bs-dropdown-border-color: #dee2e6; --bs-dropdown-border-radius: 0.375rem; --bs-dropdown-border-width: 1px; --bs-dropdown-inner-border-radius: calc(0.375rem - 1px); - --bs-dropdown-divider-bg: var(--bs-border-color-translucent); + --bs-dropdown-divider-bg: #e9ecef; --bs-dropdown-divider-margin-y: 0.5rem; - --bs-dropdown-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); - --bs-dropdown-link-color: #1a1a1a; - --bs-dropdown-link-hover-color: #171717; - --bs-dropdown-link-hover-bg: #f7f7f9; + --bs-dropdown-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-dropdown-link-color: #212529; + --bs-dropdown-link-hover-color: #fff; + --bs-dropdown-link-hover-bg: #3459e6; --bs-dropdown-link-active-color: #fff; - --bs-dropdown-link-active-bg: #1a1a1a; + --bs-dropdown-link-active-bg: #3459e6; --bs-dropdown-link-disabled-color: #adb5bd; --bs-dropdown-item-padding-x: 1rem; - --bs-dropdown-item-padding-y: 0.25rem; - --bs-dropdown-header-color: #919aa1; + --bs-dropdown-item-padding-y: 0.5rem; + --bs-dropdown-header-color: #6c757d; --bs-dropdown-header-padding-x: 1rem; --bs-dropdown-header-padding-y: 0.5rem; position: absolute; @@ -3243,6 +3312,8 @@ textarea.form-control-lg { background-color: var(--bs-dropdown-bg); background-clip: padding-box; border: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color); + border-radius: var(--bs-dropdown-border-radius); + box-shadow: var(--bs-dropdown-box-shadow); } .dropdown-menu[data-bs-popper] { top: 100%; @@ -3478,16 +3549,16 @@ textarea.form-control-lg { } .dropdown-menu-dark { - --bs-dropdown-color: #eceeef; + --bs-dropdown-color: #dee2e6; --bs-dropdown-bg: #343a40; - --bs-dropdown-border-color: var(--bs-border-color-translucent); + --bs-dropdown-border-color: #dee2e6; --bs-dropdown-box-shadow: ; - --bs-dropdown-link-color: #eceeef; + --bs-dropdown-link-color: #dee2e6; --bs-dropdown-link-hover-color: #fff; - --bs-dropdown-divider-bg: var(--bs-border-color-translucent); + --bs-dropdown-divider-bg: #e9ecef; --bs-dropdown-link-hover-bg: rgba(255, 255, 255, 0.15); --bs-dropdown-link-active-color: #fff; - --bs-dropdown-link-active-bg: #1a1a1a; + --bs-dropdown-link-active-bg: #3459e6; --bs-dropdown-link-disabled-color: #adb5bd; --bs-dropdown-header-color: #adb5bd; } @@ -3527,13 +3598,29 @@ textarea.form-control-lg { width: auto; } +.btn-group { + border-radius: 0.375rem; +} .btn-group > :not(.btn-check:first-child) + .btn, .btn-group > .btn-group:not(:first-child) { - margin-left: 0; + margin-left: -1px; +} +.btn-group > .btn:not(:last-child):not(.dropdown-toggle), +.btn-group > .btn.dropdown-toggle-split:first-child, +.btn-group > .btn-group:not(:last-child) > .btn { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.btn-group > .btn:nth-child(n+3), +.btn-group > :not(.btn-check) + .btn, +.btn-group > .btn-group:not(:first-child) > .btn { + border-top-left-radius: 0; + border-bottom-left-radius: 0; } + .dropdown-toggle-split { - padding-right: 1.125rem; - padding-left: 1.125rem; + padding-right: 0.75rem; + padding-left: 0.75rem; } .dropdown-toggle-split::after, .dropup .dropdown-toggle-split::after, .dropend .dropdown-toggle-split::after { margin-left: 0; @@ -3543,13 +3630,20 @@ textarea.form-control-lg { } .btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split { + padding-right: 0.375rem; + padding-left: 0.375rem; +} + +.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split { padding-right: 0.75rem; padding-left: 0.75rem; } -.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split { - padding-right: 1.5rem; - padding-left: 1.5rem; +.btn-group.show .dropdown-toggle { + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} +.btn-group.show .dropdown-toggle.btn-link { + box-shadow: none; } .btn-group-vertical { @@ -3563,15 +3657,26 @@ textarea.form-control-lg { } .btn-group-vertical > .btn:not(:first-child), .btn-group-vertical > .btn-group:not(:first-child) { - margin-top: 0; + margin-top: -1px; +} +.btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle), +.btn-group-vertical > .btn-group:not(:last-child) > .btn { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; } +.btn-group-vertical > .btn ~ .btn, +.btn-group-vertical > .btn-group:not(:first-child) > .btn { + border-top-left-radius: 0; + border-top-right-radius: 0; +} + .nav { --bs-nav-link-padding-x: 1rem; --bs-nav-link-padding-y: 0.5rem; --bs-nav-link-font-weight: ; - --bs-nav-link-color: var(--bs-link-color); - --bs-nav-link-hover-color: var(--bs-link-hover-color); - --bs-nav-link-disabled-color: #919aa1; + --bs-nav-link-color: #495057; + --bs-nav-link-hover-color: #495057; + --bs-nav-link-disabled-color: #6c757d; display: flex; flex-wrap: wrap; padding-left: 0; @@ -3604,18 +3709,20 @@ textarea.form-control-lg { .nav-tabs { --bs-nav-tabs-border-width: 1px; - --bs-nav-tabs-border-color: #eceeef; - --bs-nav-tabs-border-radius: 0.375rem; - --bs-nav-tabs-link-hover-border-color: #f7f7f9 #f7f7f9 #eceeef; - --bs-nav-tabs-link-active-color: #55595c; + --bs-nav-tabs-border-color: #dee2e6; + --bs-nav-tabs-border-radius: 0; + --bs-nav-tabs-link-hover-border-color: #e9ecef #e9ecef #dee2e6; + --bs-nav-tabs-link-active-color: #3459e6; --bs-nav-tabs-link-active-bg: #fff; - --bs-nav-tabs-link-active-border-color: #eceeef #eceeef #fff; + --bs-nav-tabs-link-active-border-color: #dee2e6 #dee2e6 #fff; border-bottom: var(--bs-nav-tabs-border-width) solid var(--bs-nav-tabs-border-color); } .nav-tabs .nav-link { margin-bottom: calc(-1 * var(--bs-nav-tabs-border-width)); background: none; border: var(--bs-nav-tabs-border-width) solid transparent; + border-top-left-radius: var(--bs-nav-tabs-border-radius); + border-top-right-radius: var(--bs-nav-tabs-border-radius); } .nav-tabs .nav-link:hover, .nav-tabs .nav-link:focus { isolation: isolate; @@ -3634,16 +3741,19 @@ textarea.form-control-lg { } .nav-tabs .dropdown-menu { margin-top: calc(-1 * var(--bs-nav-tabs-border-width)); + border-top-left-radius: 0; + border-top-right-radius: 0; } .nav-pills { --bs-nav-pills-border-radius: 0.375rem; --bs-nav-pills-link-active-color: #fff; - --bs-nav-pills-link-active-bg: #1a1a1a; + --bs-nav-pills-link-active-bg: #3459e6; } .nav-pills .nav-link { background: none; border: 0; + border-radius: var(--bs-nav-pills-border-radius); } .nav-pills .nav-link:disabled { color: var(--bs-nav-link-disabled-color); @@ -3683,21 +3793,21 @@ textarea.form-control-lg { .navbar { --bs-navbar-padding-x: 0; - --bs-navbar-padding-y: 1.5rem; - --bs-navbar-color: rgba(0, 0, 0, 0.3); - --bs-navbar-hover-color: #1a1a1a; + --bs-navbar-padding-y: 0.85rem; + --bs-navbar-color: #000; + --bs-navbar-hover-color: #000; --bs-navbar-disabled-color: rgba(0, 0, 0, 0.3); - --bs-navbar-active-color: #1a1a1a; + --bs-navbar-active-color: #000; --bs-navbar-brand-padding-y: 0.3125rem; --bs-navbar-brand-margin-end: 1rem; --bs-navbar-brand-font-size: 1.25rem; - --bs-navbar-brand-color: #1a1a1a; - --bs-navbar-brand-hover-color: #1a1a1a; - --bs-navbar-nav-link-padding-x: 0.5rem; + --bs-navbar-brand-color: #000; + --bs-navbar-brand-hover-color: #000; + --bs-navbar-nav-link-padding-x: 0.75rem; --bs-navbar-toggler-padding-y: 0.25rem; --bs-navbar-toggler-padding-x: 0.75rem; --bs-navbar-toggler-font-size: 1.25rem; - --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%280, 0, 0, 0.3%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); + --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='%23000' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); --bs-navbar-toggler-border-color: rgba(0, 0, 0, 0.1); --bs-navbar-toggler-border-radius: 0.375rem; --bs-navbar-toggler-focus-width: 0.25rem; @@ -3779,6 +3889,7 @@ textarea.form-control-lg { color: var(--bs-navbar-color); background-color: transparent; border: var(--bs-border-width) solid var(--bs-navbar-toggler-border-color); + border-radius: var(--bs-navbar-toggler-border-radius); transition: var(--bs-navbar-toggler-transition); } @media (prefers-reduced-motion: reduce) { @@ -3846,6 +3957,7 @@ textarea.form-control-lg { background-color: transparent !important; border: 0 !important; transform: none !important; + box-shadow: none; transition: none; } .navbar-expand-sm .offcanvas .offcanvas-header { @@ -3893,6 +4005,7 @@ textarea.form-control-lg { background-color: transparent !important; border: 0 !important; transform: none !important; + box-shadow: none; transition: none; } .navbar-expand-md .offcanvas .offcanvas-header { @@ -3940,6 +4053,7 @@ textarea.form-control-lg { background-color: transparent !important; border: 0 !important; transform: none !important; + box-shadow: none; transition: none; } .navbar-expand-lg .offcanvas .offcanvas-header { @@ -3987,6 +4101,7 @@ textarea.form-control-lg { background-color: transparent !important; border: 0 !important; transform: none !important; + box-shadow: none; transition: none; } .navbar-expand-xl .offcanvas .offcanvas-header { @@ -4034,6 +4149,7 @@ textarea.form-control-lg { background-color: transparent !important; border: 0 !important; transform: none !important; + box-shadow: none; transition: none; } .navbar-expand-xxl .offcanvas .offcanvas-header { @@ -4080,6 +4196,7 @@ textarea.form-control-lg { background-color: transparent !important; border: 0 !important; transform: none !important; + box-shadow: none; transition: none; } .navbar-expand .offcanvas .offcanvas-header { @@ -4093,27 +4210,27 @@ textarea.form-control-lg { } .navbar-dark { - --bs-navbar-color: rgba(255, 255, 255, 0.55); + --bs-navbar-color: #fff; --bs-navbar-hover-color: #fff; --bs-navbar-disabled-color: rgba(255, 255, 255, 0.25); --bs-navbar-active-color: #fff; --bs-navbar-brand-color: #fff; --bs-navbar-brand-hover-color: #fff; --bs-navbar-toggler-border-color: rgba(255, 255, 255, 0.1); - --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); + --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='%23fff' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); } .card { --bs-card-spacer-y: 1rem; - --bs-card-spacer-x: 1rem; + --bs-card-spacer-x: 1.5rem; --bs-card-title-spacer-y: 0.5rem; --bs-card-border-width: 1px; --bs-card-border-color: var(--bs-border-color-translucent); --bs-card-border-radius: 0.375rem; --bs-card-box-shadow: ; --bs-card-inner-border-radius: calc(0.375rem - 1px); - --bs-card-cap-padding-y: 0.5rem; - --bs-card-cap-padding-x: 1rem; + --bs-card-cap-padding-y: 1rem; + --bs-card-cap-padding-x: 1.5rem; --bs-card-cap-bg: rgba(0, 0, 0, 0.03); --bs-card-cap-color: ; --bs-card-height: ; @@ -4130,6 +4247,8 @@ textarea.form-control-lg { background-color: var(--bs-card-bg); background-clip: border-box; border: var(--bs-card-border-width) solid var(--bs-card-border-color); + border-radius: var(--bs-card-border-radius); + box-shadow: var(--bs-card-box-shadow); } .card > hr { margin-right: 0; @@ -4141,9 +4260,13 @@ textarea.form-control-lg { } .card > .list-group:first-child { border-top-width: 0; + border-top-left-radius: var(--bs-card-inner-border-radius); + border-top-right-radius: var(--bs-card-inner-border-radius); } .card > .list-group:last-child { border-bottom-width: 0; + border-bottom-right-radius: var(--bs-card-inner-border-radius); + border-bottom-left-radius: var(--bs-card-inner-border-radius); } .card > .card-header + .list-group, .card > .list-group + .card-footer { @@ -4180,12 +4303,20 @@ textarea.form-control-lg { background-color: var(--bs-card-cap-bg); border-bottom: var(--bs-card-border-width) solid var(--bs-card-border-color); } +.card-header:first-child { + border-radius: var(--bs-card-inner-border-radius) var(--bs-card-inner-border-radius) 0 0; +} + .card-footer { padding: var(--bs-card-cap-padding-y) var(--bs-card-cap-padding-x); color: var(--bs-card-cap-color); background-color: var(--bs-card-cap-bg); border-top: var(--bs-card-border-width) solid var(--bs-card-border-color); } +.card-footer:last-child { + border-radius: 0 0 var(--bs-card-inner-border-radius) var(--bs-card-inner-border-radius); +} + .card-header-tabs { margin-right: calc(-0.5 * var(--bs-card-cap-padding-x)); margin-bottom: calc(-1 * var(--bs-card-cap-padding-y)); @@ -4209,6 +4340,7 @@ textarea.form-control-lg { bottom: 0; left: 0; padding: var(--bs-card-img-overlay-padding); + border-radius: var(--bs-card-inner-border-radius); } .card-img, @@ -4217,6 +4349,18 @@ textarea.form-control-lg { width: 100%; } +.card-img, +.card-img-top { + border-top-left-radius: var(--bs-card-inner-border-radius); + border-top-right-radius: var(--bs-card-inner-border-radius); +} + +.card-img, +.card-img-bottom { + border-bottom-right-radius: var(--bs-card-inner-border-radius); + border-bottom-left-radius: var(--bs-card-inner-border-radius); +} + .card-group > .card { margin-bottom: var(--bs-card-group-margin); } @@ -4233,10 +4377,34 @@ textarea.form-control-lg { margin-left: 0; border-left: 0; } + .card-group > .card:not(:last-child) { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + .card-group > .card:not(:last-child) .card-img-top, +.card-group > .card:not(:last-child) .card-header { + border-top-right-radius: 0; + } + .card-group > .card:not(:last-child) .card-img-bottom, +.card-group > .card:not(:last-child) .card-footer { + border-bottom-right-radius: 0; + } + .card-group > .card:not(:first-child) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + .card-group > .card:not(:first-child) .card-img-top, +.card-group > .card:not(:first-child) .card-header { + border-top-left-radius: 0; + } + .card-group > .card:not(:first-child) .card-img-bottom, +.card-group > .card:not(:first-child) .card-footer { + border-bottom-left-radius: 0; + } } .accordion { - --bs-accordion-color: var(--bs-body-color); + --bs-accordion-color: #495057; --bs-accordion-bg: #fff; --bs-accordion-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, border-radius 0.15s ease; --bs-accordion-border-color: var(--bs-border-color); @@ -4245,19 +4413,19 @@ textarea.form-control-lg { --bs-accordion-inner-border-radius: calc(0.375rem - 1px); --bs-accordion-btn-padding-x: 1.25rem; --bs-accordion-btn-padding-y: 1rem; - --bs-accordion-btn-color: var(--bs-body-color); + --bs-accordion-btn-color: #495057; --bs-accordion-btn-bg: var(--bs-accordion-bg); - --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='var%28--bs-body-color%29'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); + --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23495057'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); --bs-accordion-btn-icon-width: 1.25rem; --bs-accordion-btn-icon-transform: rotate(-180deg); --bs-accordion-btn-icon-transition: transform 0.2s ease-in-out; - --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23171717'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); - --bs-accordion-btn-focus-border-color: #8d8d8d; - --bs-accordion-btn-focus-box-shadow: 0 0 0 0.25rem rgba(26, 26, 26, 0.25); + --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%232f50cf'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); + --bs-accordion-btn-focus-border-color: #9aacf3; + --bs-accordion-btn-focus-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-accordion-body-padding-x: 1.25rem; --bs-accordion-body-padding-y: 1rem; - --bs-accordion-active-color: #171717; - --bs-accordion-active-bg: #e8e8e8; + --bs-accordion-active-color: #2f50cf; + --bs-accordion-active-bg: #ebeefd; } .accordion-button { @@ -4271,6 +4439,7 @@ textarea.form-control-lg { text-align: left; background-color: var(--bs-accordion-btn-bg); border: 0; + border-radius: 0; overflow-anchor: none; transition: var(--bs-accordion-transition); } @@ -4323,9 +4492,30 @@ textarea.form-control-lg { background-color: var(--bs-accordion-bg); border: var(--bs-accordion-border-width) solid var(--bs-accordion-border-color); } +.accordion-item:first-of-type { + border-top-left-radius: var(--bs-accordion-border-radius); + border-top-right-radius: var(--bs-accordion-border-radius); +} +.accordion-item:first-of-type .accordion-button { + border-top-left-radius: var(--bs-accordion-inner-border-radius); + border-top-right-radius: var(--bs-accordion-inner-border-radius); +} .accordion-item:not(:first-of-type) { border-top: 0; } +.accordion-item:last-of-type { + border-bottom-right-radius: var(--bs-accordion-border-radius); + border-bottom-left-radius: var(--bs-accordion-border-radius); +} +.accordion-item:last-of-type .accordion-button.collapsed { + border-bottom-right-radius: var(--bs-accordion-inner-border-radius); + border-bottom-left-radius: var(--bs-accordion-inner-border-radius); +} +.accordion-item:last-of-type .accordion-collapse { + border-bottom-right-radius: var(--bs-accordion-border-radius); + border-bottom-left-radius: var(--bs-accordion-border-radius); +} + .accordion-body { padding: var(--bs-accordion-body-padding-y) var(--bs-accordion-body-padding-x); } @@ -4336,6 +4526,7 @@ textarea.form-control-lg { .accordion-flush .accordion-item { border-right: 0; border-left: 0; + border-radius: 0; } .accordion-flush .accordion-item:first-child { border-top: 0; @@ -4343,15 +4534,19 @@ textarea.form-control-lg { .accordion-flush .accordion-item:last-child { border-bottom: 0; } +.accordion-flush .accordion-item .accordion-button, .accordion-flush .accordion-item .accordion-button.collapsed { + border-radius: 0; +} + .breadcrumb { - --bs-breadcrumb-padding-x: 0; + --bs-breadcrumb-padding-x: 1rem; --bs-breadcrumb-padding-y: 0; --bs-breadcrumb-margin-bottom: 1rem; --bs-breadcrumb-bg: ; --bs-breadcrumb-border-radius: ; - --bs-breadcrumb-divider-color: #919aa1; + --bs-breadcrumb-divider-color: #6c757d; --bs-breadcrumb-item-padding-x: 0.5rem; - --bs-breadcrumb-item-active-color: #919aa1; + --bs-breadcrumb-item-active-color: #6c757d; display: flex; flex-wrap: wrap; padding: var(--bs-breadcrumb-padding-y) var(--bs-breadcrumb-padding-x); @@ -4359,6 +4554,7 @@ textarea.form-control-lg { font-size: var(--bs-breadcrumb-font-size); list-style: none; background-color: var(--bs-breadcrumb-bg); + border-radius: var(--bs-breadcrumb-border-radius); } .breadcrumb-item + .breadcrumb-item { @@ -4368,33 +4564,33 @@ textarea.form-control-lg { float: left; padding-right: var(--bs-breadcrumb-item-padding-x); color: var(--bs-breadcrumb-divider-color); - content: var(--bs-breadcrumb-divider, "/") /* rtl: var(--bs-breadcrumb-divider, "/") */; + content: var(--bs-breadcrumb-divider, ">") /* rtl: var(--bs-breadcrumb-divider, ">") */; } .breadcrumb-item.active { color: var(--bs-breadcrumb-item-active-color); } .pagination { - --bs-pagination-padding-x: 0.75rem; - --bs-pagination-padding-y: 0.375rem; + --bs-pagination-padding-x: 1rem; + --bs-pagination-padding-y: 0.5rem; --bs-pagination-font-size: 1rem; - --bs-pagination-color: var(--bs-link-color); + --bs-pagination-color: #495057; --bs-pagination-bg: #fff; --bs-pagination-border-width: 1px; - --bs-pagination-border-color: transparent; + --bs-pagination-border-color: #dee2e6; --bs-pagination-border-radius: 0.375rem; - --bs-pagination-hover-color: var(--bs-link-hover-color); - --bs-pagination-hover-bg: #f7f7f9; - --bs-pagination-hover-border-color: transparent; - --bs-pagination-focus-color: var(--bs-link-hover-color); - --bs-pagination-focus-bg: #f7f7f9; - --bs-pagination-focus-box-shadow: 0 0 0 0.25rem rgba(26, 26, 26, 0.25); + --bs-pagination-hover-color: #495057; + --bs-pagination-hover-bg: #f8f9fa; + --bs-pagination-hover-border-color: #dee2e6; + --bs-pagination-focus-color: #495057; + --bs-pagination-focus-bg: #e9ecef; + --bs-pagination-focus-box-shadow: 0 0 0 0.25rem rgba(52, 89, 230, 0.25); --bs-pagination-active-color: #fff; - --bs-pagination-active-bg: #1a1a1a; - --bs-pagination-active-border-color: #1a1a1a; - --bs-pagination-disabled-color: #919aa1; + --bs-pagination-active-bg: #3459e6; + --bs-pagination-active-border-color: #3459e6; + --bs-pagination-disabled-color: #6c757d; --bs-pagination-disabled-bg: #fff; - --bs-pagination-disabled-border-color: transparent; + --bs-pagination-disabled-border-color: #dee2e6; display: flex; padding-left: 0; list-style: none; @@ -4445,6 +4641,15 @@ textarea.form-control-lg { .page-item:not(:first-child) .page-link { margin-left: -1px; } +.page-item:first-child .page-link { + border-top-left-radius: var(--bs-pagination-border-radius); + border-bottom-left-radius: var(--bs-pagination-border-radius); +} +.page-item:last-child .page-link { + border-top-right-radius: var(--bs-pagination-border-radius); + border-bottom-right-radius: var(--bs-pagination-border-radius); +} + .pagination-lg { --bs-pagination-padding-x: 1.5rem; --bs-pagination-padding-y: 0.75rem; @@ -4475,6 +4680,7 @@ textarea.form-control-lg { text-align: center; white-space: nowrap; vertical-align: baseline; + border-radius: var(--bs-badge-border-radius); } .badge:empty { display: none; @@ -4500,6 +4706,7 @@ textarea.form-control-lg { color: var(--bs-alert-color); background-color: var(--bs-alert-bg); border: var(--bs-alert-border); + border-radius: var(--bs-alert-border-radius); } .alert-heading { @@ -4522,12 +4729,12 @@ textarea.form-control-lg { } .alert-primary { - --bs-alert-color: #101010; - --bs-alert-bg: #d1d1d1; - --bs-alert-border-color: #bababa; + --bs-alert-color: #1f358a; + --bs-alert-bg: #d6defa; + --bs-alert-border-color: #c2cdf8; } .alert-primary .alert-link { - color: #0d0d0d; + color: #192a6e; } .alert-secondary { @@ -4540,63 +4747,57 @@ textarea.form-control-lg { } .alert-success { - --bs-alert-color: #2d7345; - --bs-alert-bg: #dbf2e3; - --bs-alert-border-color: #c9ecd5; + --bs-alert-color: #1c6b4d; + --bs-alert-bg: #d5f0e6; + --bs-alert-border-color: #c1e8d9; } .alert-success .alert-link { - color: #245c37; + color: #16563e; } .alert-info { - --bs-alert-color: #135d7c; - --bs-alert-bg: #d2ebf5; - --bs-alert-border-color: #bce1f1; + --bs-alert-color: #184a6d; + --bs-alert-bg: #d4e5f0; + --bs-alert-border-color: #bfd7e9; } .alert-info .alert-link { - color: #0f4a63; + color: #133b57; } .alert-warning { - --bs-alert-color: #90682f; - --bs-alert-bg: #fcefdc; - --bs-alert-border-color: #fbe6ca; + --bs-alert-color: #92713a; + --bs-alert-bg: #fdf2df; + --bs-alert-border-color: #fcebd0; } .alert-warning .alert-link { - color: #735326; + color: #755a2e; } .alert-danger { - --bs-alert-color: #82322f; - --bs-alert-bg: #f7dddc; - --bs-alert-border-color: #f4cbca; + --bs-alert-color: #83191c; + --bs-alert-bg: #f8d4d5; + --bs-alert-border-color: #f4bfc0; } .alert-danger .alert-link { - color: #682826; + color: #691416; } .alert-light { - --bs-alert-color: #999999; - --bs-alert-bg: white; - --bs-alert-border-color: white; + --bs-alert-color: #959596; + --bs-alert-bg: #fefefe; + --bs-alert-border-color: #fdfdfe; } .alert-light .alert-link { - color: #7a7a7a; + color: #777778; } .alert-dark { - --bs-alert-color: #1f2326; - --bs-alert-bg: #d6d8d9; - --bs-alert-border-color: #c2c4c6; + --bs-alert-color: #141619; + --bs-alert-bg: #d3d3d4; + --bs-alert-border-color: #bcbebf; } .alert-dark .alert-link { - color: #191c1e; -} - -@-webkit-keyframes progress-bar-stripes { - 0% { - background-position-x: 1rem; - } + color: #101214; } @keyframes progress-bar-stripes { @@ -4607,17 +4808,19 @@ textarea.form-control-lg { .progress { --bs-progress-height: 1rem; --bs-progress-font-size: 0.75rem; - --bs-progress-bg: #f7f7f9; + --bs-progress-bg: #e9ecef; --bs-progress-border-radius: 0.375rem; --bs-progress-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); --bs-progress-bar-color: #fff; - --bs-progress-bar-bg: #1a1a1a; + --bs-progress-bar-bg: #3459e6; --bs-progress-bar-transition: width 0.6s ease; display: flex; height: var(--bs-progress-height); overflow: hidden; font-size: var(--bs-progress-font-size); background-color: var(--bs-progress-bg); + border-radius: var(--bs-progress-border-radius); + box-shadow: var(--bs-progress-box-shadow); } .progress-bar { @@ -4643,38 +4846,37 @@ textarea.form-control-lg { } .progress-bar-animated { - -webkit-animation: 1s linear infinite progress-bar-stripes; animation: 1s linear infinite progress-bar-stripes; } @media (prefers-reduced-motion: reduce) { .progress-bar-animated { - -webkit-animation: none; animation: none; } } .list-group { - --bs-list-group-color: #1a1a1a; + --bs-list-group-color: #212529; --bs-list-group-bg: #fff; --bs-list-group-border-color: rgba(0, 0, 0, 0.125); --bs-list-group-border-width: 1px; --bs-list-group-border-radius: 0.375rem; - --bs-list-group-item-padding-x: 1rem; - --bs-list-group-item-padding-y: 0.5rem; - --bs-list-group-action-color: #55595c; - --bs-list-group-action-hover-color: #55595c; + --bs-list-group-item-padding-x: 1.5rem; + --bs-list-group-item-padding-y: 1rem; + --bs-list-group-action-color: #495057; + --bs-list-group-action-hover-color: #495057; --bs-list-group-action-hover-bg: #f8f9fa; - --bs-list-group-action-active-color: #55595c; - --bs-list-group-action-active-bg: #f7f7f9; - --bs-list-group-disabled-color: #919aa1; + --bs-list-group-action-active-color: #495057; + --bs-list-group-action-active-bg: #e9ecef; + --bs-list-group-disabled-color: #6c757d; --bs-list-group-disabled-bg: #fff; --bs-list-group-active-color: #fff; - --bs-list-group-active-bg: #1a1a1a; - --bs-list-group-active-border-color: #1a1a1a; + --bs-list-group-active-bg: #3459e6; + --bs-list-group-active-border-color: #3459e6; display: flex; flex-direction: column; padding-left: 0; margin-bottom: 0; + border-radius: var(--bs-list-group-border-radius); } .list-group-numbered { @@ -4711,6 +4913,14 @@ textarea.form-control-lg { background-color: var(--bs-list-group-bg); border: var(--bs-list-group-border-width) solid var(--bs-list-group-border-color); } +.list-group-item:first-child { + border-top-left-radius: inherit; + border-top-right-radius: inherit; +} +.list-group-item:last-child { + border-bottom-right-radius: inherit; + border-bottom-left-radius: inherit; +} .list-group-item.disabled, .list-group-item:disabled { color: var(--bs-list-group-disabled-color); pointer-events: none; @@ -4733,6 +4943,14 @@ textarea.form-control-lg { .list-group-horizontal { flex-direction: row; } +.list-group-horizontal > .list-group-item:first-child:not(:last-child) { + border-bottom-left-radius: var(--bs-list-group-border-radius); + border-top-right-radius: 0; +} +.list-group-horizontal > .list-group-item:last-child:not(:first-child) { + border-top-right-radius: var(--bs-list-group-border-radius); + border-bottom-left-radius: 0; +} .list-group-horizontal > .list-group-item.active { margin-top: 0; } @@ -4749,6 +4967,14 @@ textarea.form-control-lg { .list-group-horizontal-sm { flex-direction: row; } + .list-group-horizontal-sm > .list-group-item:first-child:not(:last-child) { + border-bottom-left-radius: var(--bs-list-group-border-radius); + border-top-right-radius: 0; + } + .list-group-horizontal-sm > .list-group-item:last-child:not(:first-child) { + border-top-right-radius: var(--bs-list-group-border-radius); + border-bottom-left-radius: 0; + } .list-group-horizontal-sm > .list-group-item.active { margin-top: 0; } @@ -4765,6 +4991,14 @@ textarea.form-control-lg { .list-group-horizontal-md { flex-direction: row; } + .list-group-horizontal-md > .list-group-item:first-child:not(:last-child) { + border-bottom-left-radius: var(--bs-list-group-border-radius); + border-top-right-radius: 0; + } + .list-group-horizontal-md > .list-group-item:last-child:not(:first-child) { + border-top-right-radius: var(--bs-list-group-border-radius); + border-bottom-left-radius: 0; + } .list-group-horizontal-md > .list-group-item.active { margin-top: 0; } @@ -4781,6 +5015,14 @@ textarea.form-control-lg { .list-group-horizontal-lg { flex-direction: row; } + .list-group-horizontal-lg > .list-group-item:first-child:not(:last-child) { + border-bottom-left-radius: var(--bs-list-group-border-radius); + border-top-right-radius: 0; + } + .list-group-horizontal-lg > .list-group-item:last-child:not(:first-child) { + border-top-right-radius: var(--bs-list-group-border-radius); + border-bottom-left-radius: 0; + } .list-group-horizontal-lg > .list-group-item.active { margin-top: 0; } @@ -4797,6 +5039,14 @@ textarea.form-control-lg { .list-group-horizontal-xl { flex-direction: row; } + .list-group-horizontal-xl > .list-group-item:first-child:not(:last-child) { + border-bottom-left-radius: var(--bs-list-group-border-radius); + border-top-right-radius: 0; + } + .list-group-horizontal-xl > .list-group-item:last-child:not(:first-child) { + border-top-right-radius: var(--bs-list-group-border-radius); + border-bottom-left-radius: 0; + } .list-group-horizontal-xl > .list-group-item.active { margin-top: 0; } @@ -4813,6 +5063,14 @@ textarea.form-control-lg { .list-group-horizontal-xxl { flex-direction: row; } + .list-group-horizontal-xxl > .list-group-item:first-child:not(:last-child) { + border-bottom-left-radius: var(--bs-list-group-border-radius); + border-top-right-radius: 0; + } + .list-group-horizontal-xxl > .list-group-item:last-child:not(:first-child) { + border-top-right-radius: var(--bs-list-group-border-radius); + border-bottom-left-radius: 0; + } .list-group-horizontal-xxl > .list-group-item.active { margin-top: 0; } @@ -4825,6 +5083,9 @@ textarea.form-control-lg { border-left-width: var(--bs-list-group-border-width); } } +.list-group-flush { + border-radius: 0; +} .list-group-flush > .list-group-item { border-width: 0 0 var(--bs-list-group-border-width); } @@ -4833,17 +5094,17 @@ textarea.form-control-lg { } .list-group-item-primary { - color: #101010; - background-color: #d1d1d1; + color: #1f358a; + background-color: #d6defa; } .list-group-item-primary.list-group-item-action:hover, .list-group-item-primary.list-group-item-action:focus { - color: #101010; - background-color: #bcbcbc; + color: #1f358a; + background-color: #c1c8e1; } .list-group-item-primary.list-group-item-action.active { color: #fff; - background-color: #101010; - border-color: #101010; + background-color: #1f358a; + border-color: #1f358a; } .list-group-item-secondary { @@ -4861,87 +5122,87 @@ textarea.form-control-lg { } .list-group-item-success { - color: #2d7345; - background-color: #dbf2e3; + color: #1c6b4d; + background-color: #d5f0e6; } .list-group-item-success.list-group-item-action:hover, .list-group-item-success.list-group-item-action:focus { - color: #2d7345; - background-color: #c5dacc; + color: #1c6b4d; + background-color: #c0d8cf; } .list-group-item-success.list-group-item-action.active { color: #fff; - background-color: #2d7345; - border-color: #2d7345; + background-color: #1c6b4d; + border-color: #1c6b4d; } .list-group-item-info { - color: #135d7c; - background-color: #d2ebf5; + color: #184a6d; + background-color: #d4e5f0; } .list-group-item-info.list-group-item-action:hover, .list-group-item-info.list-group-item-action:focus { - color: #135d7c; - background-color: #bdd4dd; + color: #184a6d; + background-color: #bfced8; } .list-group-item-info.list-group-item-action.active { color: #fff; - background-color: #135d7c; - border-color: #135d7c; + background-color: #184a6d; + border-color: #184a6d; } .list-group-item-warning { - color: #90682f; - background-color: #fcefdc; + color: #92713a; + background-color: #fdf2df; } .list-group-item-warning.list-group-item-action:hover, .list-group-item-warning.list-group-item-action:focus { - color: #90682f; - background-color: #e3d7c6; + color: #92713a; + background-color: #e4dac9; } .list-group-item-warning.list-group-item-action.active { color: #fff; - background-color: #90682f; - border-color: #90682f; + background-color: #92713a; + border-color: #92713a; } .list-group-item-danger { - color: #82322f; - background-color: #f7dddc; + color: #83191c; + background-color: #f8d4d5; } .list-group-item-danger.list-group-item-action:hover, .list-group-item-danger.list-group-item-action:focus { - color: #82322f; - background-color: #dec7c6; + color: #83191c; + background-color: #dfbfc0; } .list-group-item-danger.list-group-item-action.active { color: #fff; - background-color: #82322f; - border-color: #82322f; + background-color: #83191c; + border-color: #83191c; } .list-group-item-light { - color: #999999; - background-color: white; + color: #959596; + background-color: #fefefe; } .list-group-item-light.list-group-item-action:hover, .list-group-item-light.list-group-item-action:focus { - color: #999999; - background-color: #e6e6e6; + color: #959596; + background-color: #e5e5e5; } .list-group-item-light.list-group-item-action.active { color: #fff; - background-color: #999999; - border-color: #999999; + background-color: #959596; + border-color: #959596; } .list-group-item-dark { - color: #1f2326; - background-color: #d6d8d9; + color: #141619; + background-color: #d3d3d4; } .list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus { - color: #1f2326; - background-color: #c1c2c3; + color: #141619; + background-color: #bebebf; } .list-group-item-dark.list-group-item-action.active { color: #fff; - background-color: #1f2326; - border-color: #1f2326; + background-color: #141619; + border-color: #141619; } .btn-close { @@ -4952,6 +5213,7 @@ textarea.form-control-lg { color: #000; background: transparent url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23000'%3e%3cpath d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/%3e%3c/svg%3e") center/1em auto no-repeat; border: 0; + border-radius: 0.375rem; opacity: 0.5; } .btn-close:hover { @@ -4961,7 +5223,7 @@ textarea.form-control-lg { } .btn-close:focus { outline: 0; - box-shadow: 0 0 0 0.25rem rgba(26, 26, 26, 0.25); + box-shadow: 0 0 0 0.25rem rgba(52, 89, 230, 0.25); opacity: 1; } .btn-close:disabled, .btn-close.disabled { @@ -4988,8 +5250,8 @@ textarea.form-control-lg { --bs-toast-border-width: 1px; --bs-toast-border-color: var(--bs-border-color-translucent); --bs-toast-border-radius: 0.375rem; - --bs-toast-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); - --bs-toast-header-color: #919aa1; + --bs-toast-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + --bs-toast-header-color: #212529; --bs-toast-header-bg: rgba(255, 255, 255, 0.85); --bs-toast-header-border-color: rgba(0, 0, 0, 0.05); width: var(--bs-toast-max-width); @@ -5001,6 +5263,7 @@ textarea.form-control-lg { background-clip: padding-box; border: var(--bs-toast-border-width) solid var(--bs-toast-border-color); box-shadow: var(--bs-toast-box-shadow); + border-radius: var(--bs-toast-border-radius); } .toast.showing { opacity: 0; @@ -5010,6 +5273,7 @@ textarea.form-control-lg { } .toast-container { + --bs-toast-zindex: 1090; position: absolute; z-index: var(--bs-toast-zindex); width: -webkit-max-content; @@ -5030,6 +5294,8 @@ textarea.form-control-lg { background-color: var(--bs-toast-header-bg); background-clip: padding-box; border-bottom: var(--bs-toast-border-width) solid var(--bs-toast-header-border-color); + border-top-left-radius: calc(var(--bs-toast-border-radius) - var(--bs-toast-border-width)); + border-top-right-radius: calc(var(--bs-toast-border-radius) - var(--bs-toast-border-width)); } .toast-header .btn-close { margin-right: calc(-0.5 * var(--bs-toast-padding-x)); @@ -5048,7 +5314,7 @@ textarea.form-control-lg { --bs-modal-margin: 0.5rem; --bs-modal-color: ; --bs-modal-bg: #fff; - --bs-modal-border-color: var(--bs-border-color-translucent); + --bs-modal-border-color: #dee2e6; --bs-modal-border-width: 1px; --bs-modal-border-radius: 0.5rem; --bs-modal-box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075); @@ -5057,12 +5323,12 @@ textarea.form-control-lg { --bs-modal-header-padding-y: 1rem; --bs-modal-header-padding: 1rem 1rem; --bs-modal-header-border-color: var(--bs-border-color); - --bs-modal-header-border-width: 1px; + --bs-modal-header-border-width: 0; --bs-modal-title-line-height: 1.5; --bs-modal-footer-gap: 0.5rem; --bs-modal-footer-bg: ; --bs-modal-footer-border-color: var(--bs-border-color); - --bs-modal-footer-border-width: 1px; + --bs-modal-footer-border-width: 0; position: fixed; top: 0; left: 0; @@ -5124,6 +5390,8 @@ textarea.form-control-lg { background-color: var(--bs-modal-bg); background-clip: padding-box; border: var(--bs-modal-border-width) solid var(--bs-modal-border-color); + border-radius: var(--bs-modal-border-radius); + box-shadow: var(--bs-modal-box-shadow); outline: 0; } @@ -5153,6 +5421,8 @@ textarea.form-control-lg { justify-content: space-between; padding: var(--bs-modal-header-padding); border-bottom: var(--bs-modal-header-border-width) solid var(--bs-modal-header-border-color); + border-top-left-radius: var(--bs-modal-inner-border-radius); + border-top-right-radius: var(--bs-modal-inner-border-radius); } .modal-header .btn-close { padding: calc(var(--bs-modal-header-padding-y) * 0.5) calc(var(--bs-modal-header-padding-x) * 0.5); @@ -5179,6 +5449,8 @@ textarea.form-control-lg { padding: calc(var(--bs-modal-padding) - var(--bs-modal-footer-gap) * 0.5); background-color: var(--bs-modal-footer-bg); border-top: var(--bs-modal-footer-border-width) solid var(--bs-modal-footer-border-color); + border-bottom-right-radius: var(--bs-modal-inner-border-radius); + border-bottom-left-radius: var(--bs-modal-inner-border-radius); } .modal-footer > * { margin: calc(var(--bs-modal-footer-gap) * 0.5); @@ -5187,7 +5459,7 @@ textarea.form-control-lg { @media (min-width: 576px) { .modal { --bs-modal-margin: 1.75rem; - --bs-modal-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); + --bs-modal-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } .modal-dialog { max-width: var(--bs-modal-width); @@ -5218,6 +5490,11 @@ textarea.form-control-lg { .modal-fullscreen .modal-content { height: 100%; border: 0; + border-radius: 0; +} +.modal-fullscreen .modal-header, +.modal-fullscreen .modal-footer { + border-radius: 0; } .modal-fullscreen .modal-body { overflow-y: auto; @@ -5233,6 +5510,11 @@ textarea.form-control-lg { .modal-fullscreen-sm-down .modal-content { height: 100%; border: 0; + border-radius: 0; + } + .modal-fullscreen-sm-down .modal-header, +.modal-fullscreen-sm-down .modal-footer { + border-radius: 0; } .modal-fullscreen-sm-down .modal-body { overflow-y: auto; @@ -5248,6 +5530,11 @@ textarea.form-control-lg { .modal-fullscreen-md-down .modal-content { height: 100%; border: 0; + border-radius: 0; + } + .modal-fullscreen-md-down .modal-header, +.modal-fullscreen-md-down .modal-footer { + border-radius: 0; } .modal-fullscreen-md-down .modal-body { overflow-y: auto; @@ -5263,6 +5550,11 @@ textarea.form-control-lg { .modal-fullscreen-lg-down .modal-content { height: 100%; border: 0; + border-radius: 0; + } + .modal-fullscreen-lg-down .modal-header, +.modal-fullscreen-lg-down .modal-footer { + border-radius: 0; } .modal-fullscreen-lg-down .modal-body { overflow-y: auto; @@ -5278,6 +5570,11 @@ textarea.form-control-lg { .modal-fullscreen-xl-down .modal-content { height: 100%; border: 0; + border-radius: 0; + } + .modal-fullscreen-xl-down .modal-header, +.modal-fullscreen-xl-down .modal-footer { + border-radius: 0; } .modal-fullscreen-xl-down .modal-body { overflow-y: auto; @@ -5293,6 +5590,11 @@ textarea.form-control-lg { .modal-fullscreen-xxl-down .modal-content { height: 100%; border: 0; + border-radius: 0; + } + .modal-fullscreen-xxl-down .modal-header, +.modal-fullscreen-xxl-down .modal-footer { + border-radius: 0; } .modal-fullscreen-xxl-down .modal-body { overflow-y: auto; @@ -5398,6 +5700,7 @@ textarea.form-control-lg { color: var(--bs-tooltip-color); text-align: center; background-color: var(--bs-tooltip-bg); + border-radius: var(--bs-tooltip-border-radius); } .popover { @@ -5409,15 +5712,15 @@ textarea.form-control-lg { --bs-popover-border-color: var(--bs-border-color-translucent); --bs-popover-border-radius: 0.5rem; --bs-popover-inner-border-radius: calc(0.5rem - 1px); - --bs-popover-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); + --bs-popover-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); --bs-popover-header-padding-x: 1rem; --bs-popover-header-padding-y: 0.5rem; --bs-popover-header-font-size: 1rem; - --bs-popover-header-color: #1a1a1a; + --bs-popover-header-color: #212529; --bs-popover-header-bg: #f0f0f0; --bs-popover-body-padding-x: 1rem; --bs-popover-body-padding-y: 1rem; - --bs-popover-body-color: #55595c; + --bs-popover-body-color: #495057; --bs-popover-arrow-width: 1rem; --bs-popover-arrow-height: 0.5rem; --bs-popover-arrow-border: var(--bs-popover-border-color); @@ -5443,6 +5746,8 @@ textarea.form-control-lg { background-color: var(--bs-popover-bg); background-clip: padding-box; border: var(--bs-popover-border-width) solid var(--bs-popover-border-color); + border-radius: var(--bs-popover-border-radius); + box-shadow: var(--bs-popover-box-shadow); } .popover .popover-arrow { display: block; @@ -5543,6 +5848,8 @@ textarea.form-control-lg { color: var(--bs-popover-header-color); background-color: var(--bs-popover-header-bg); border-bottom: var(--bs-popover-border-width) solid var(--bs-popover-border-color); + border-top-left-radius: var(--bs-popover-inner-border-radius); + border-top-right-radius: var(--bs-popover-inner-border-radius); } .popover-header:empty { display: none; @@ -5767,16 +6074,9 @@ textarea.form-control-lg { height: var(--bs-spinner-height); vertical-align: var(--bs-spinner-vertical-align); border-radius: 50%; - -webkit-animation: var(--bs-spinner-animation-speed) linear infinite var(--bs-spinner-animation-name); animation: var(--bs-spinner-animation-speed) linear infinite var(--bs-spinner-animation-name); } -@-webkit-keyframes spinner-border { - to { - transform: rotate(360deg) /* rtl:ignore */; - } -} - @keyframes spinner-border { to { transform: rotate(360deg) /* rtl:ignore */; @@ -5799,16 +6099,6 @@ textarea.form-control-lg { --bs-spinner-border-width: 0.2em; } -@-webkit-keyframes spinner-grow { - 0% { - transform: scale(0); - } - 50% { - opacity: 1; - transform: none; - } -} - @keyframes spinner-grow { 0% { transform: scale(0); @@ -5848,7 +6138,7 @@ textarea.form-control-lg { --bs-offcanvas-color: ; --bs-offcanvas-bg: #fff; --bs-offcanvas-border-width: 1px; - --bs-offcanvas-border-color: var(--bs-border-color-translucent); + --bs-offcanvas-border-color: #dee2e6; --bs-offcanvas-box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075); } @@ -5865,6 +6155,7 @@ textarea.form-control-lg { background-color: var(--bs-offcanvas-bg); background-clip: padding-box; outline: 0; + box-shadow: var(--bs-offcanvas-box-shadow); transition: transform 0.3s ease-in-out; } } @@ -5953,6 +6244,7 @@ textarea.form-control-lg { background-color: var(--bs-offcanvas-bg); background-clip: padding-box; outline: 0; + box-shadow: var(--bs-offcanvas-box-shadow); transition: transform 0.3s ease-in-out; } } @@ -6041,6 +6333,7 @@ textarea.form-control-lg { background-color: var(--bs-offcanvas-bg); background-clip: padding-box; outline: 0; + box-shadow: var(--bs-offcanvas-box-shadow); transition: transform 0.3s ease-in-out; } } @@ -6129,6 +6422,7 @@ textarea.form-control-lg { background-color: var(--bs-offcanvas-bg); background-clip: padding-box; outline: 0; + box-shadow: var(--bs-offcanvas-box-shadow); transition: transform 0.3s ease-in-out; } } @@ -6217,6 +6511,7 @@ textarea.form-control-lg { background-color: var(--bs-offcanvas-bg); background-clip: padding-box; outline: 0; + box-shadow: var(--bs-offcanvas-box-shadow); transition: transform 0.3s ease-in-out; } } @@ -6304,6 +6599,7 @@ textarea.form-control-lg { background-color: var(--bs-offcanvas-bg); background-clip: padding-box; outline: 0; + box-shadow: var(--bs-offcanvas-box-shadow); transition: transform 0.3s ease-in-out; } @media (prefers-reduced-motion: reduce) { @@ -6415,16 +6711,9 @@ textarea.form-control-lg { } .placeholder-glow .placeholder { - -webkit-animation: placeholder-glow 2s ease-in-out infinite; animation: placeholder-glow 2s ease-in-out infinite; } -@-webkit-keyframes placeholder-glow { - 50% { - opacity: 0.2; - } -} - @keyframes placeholder-glow { 50% { opacity: 0.2; @@ -6435,17 +6724,9 @@ textarea.form-control-lg { mask-image: linear-gradient(130deg, #000 55%, rgba(0, 0, 0, 0.8) 75%, #000 95%); -webkit-mask-size: 200% 100%; mask-size: 200% 100%; - -webkit-animation: placeholder-wave 2s linear infinite; animation: placeholder-wave 2s linear infinite; } -@-webkit-keyframes placeholder-wave { - 100% { - -webkit-mask-position: -200% 0%; - mask-position: -200% 0%; - } -} - @keyframes placeholder-wave { 100% { -webkit-mask-position: -200% 0%; @@ -6460,7 +6741,7 @@ textarea.form-control-lg { .text-bg-primary { color: #fff !important; - background-color: RGBA(26, 26, 26, var(--bs-bg-opacity, 1)) !important; + background-color: RGBA(52, 89, 230, var(--bs-bg-opacity, 1)) !important; } .text-bg-secondary { @@ -6470,39 +6751,39 @@ textarea.form-control-lg { .text-bg-success { color: #fff !important; - background-color: RGBA(75, 191, 115, var(--bs-bg-opacity, 1)) !important; + background-color: RGBA(47, 179, 128, var(--bs-bg-opacity, 1)) !important; } .text-bg-info { color: #fff !important; - background-color: RGBA(31, 155, 207, var(--bs-bg-opacity, 1)) !important; + background-color: RGBA(40, 123, 181, var(--bs-bg-opacity, 1)) !important; } .text-bg-warning { - color: #000 !important; - background-color: RGBA(240, 173, 78, var(--bs-bg-opacity, 1)) !important; + color: #fff !important; + background-color: RGBA(244, 189, 97, var(--bs-bg-opacity, 1)) !important; } .text-bg-danger { color: #fff !important; - background-color: RGBA(217, 83, 79, var(--bs-bg-opacity, 1)) !important; + background-color: RGBA(218, 41, 46, var(--bs-bg-opacity, 1)) !important; } .text-bg-light { color: #000 !important; - background-color: RGBA(255, 255, 255, var(--bs-bg-opacity, 1)) !important; + background-color: RGBA(248, 249, 250, var(--bs-bg-opacity, 1)) !important; } .text-bg-dark { color: #fff !important; - background-color: RGBA(52, 58, 64, var(--bs-bg-opacity, 1)) !important; + background-color: RGBA(33, 37, 41, var(--bs-bg-opacity, 1)) !important; } .link-primary { - color: #1a1a1a !important; + color: #3459e6 !important; } .link-primary:hover, .link-primary:focus { - color: #151515 !important; + color: #2a47b8 !important; } .link-secondary { @@ -6513,45 +6794,45 @@ textarea.form-control-lg { } .link-success { - color: #4bbf73 !important; + color: #2fb380 !important; } .link-success:hover, .link-success:focus { - color: #3c995c !important; + color: #268f66 !important; } .link-info { - color: #1f9bcf !important; + color: #287bb5 !important; } .link-info:hover, .link-info:focus { - color: #197ca6 !important; + color: #206291 !important; } .link-warning { - color: #f0ad4e !important; + color: #f4bd61 !important; } .link-warning:hover, .link-warning:focus { - color: #f3bd71 !important; + color: #c3974e !important; } .link-danger { - color: #d9534f !important; + color: #da292e !important; } .link-danger:hover, .link-danger:focus { - color: #ae423f !important; + color: #ae2125 !important; } .link-light { - color: #fff !important; + color: #f8f9fa !important; } .link-light:hover, .link-light:focus { - color: white !important; + color: #f9fafb !important; } .link-dark { - color: #343a40 !important; + color: #212529 !important; } .link-dark:hover, .link-dark:focus { - color: #2a2e33 !important; + color: #1a1e21 !important; } .ratio { @@ -6852,7 +7133,7 @@ textarea.form-control-lg { } .shadow { - box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05) !important; } .shadow-sm { @@ -6860,7 +7141,7 @@ textarea.form-control-lg { } .shadow-lg { - box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important; + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06) !important; } .shadow-none { @@ -7728,27 +8009,27 @@ textarea.form-control-lg { } .fs-1 { - font-size: calc(1.325rem + 0.9vw) !important; + font-size: calc(1.375rem + 1.5vw) !important; } .fs-2 { - font-size: calc(1.3rem + 0.6vw) !important; + font-size: calc(1.325rem + 0.9vw) !important; } .fs-3 { - font-size: calc(1.275rem + 0.3vw) !important; + font-size: calc(1.3rem + 0.6vw) !important; } .fs-4 { - font-size: 1.25rem !important; + font-size: calc(1.275rem + 0.3vw) !important; } .fs-5 { - font-size: 1rem !important; + font-size: 1.25rem !important; } .fs-6 { - font-size: 0.75rem !important; + font-size: 1rem !important; } .fst-italic { @@ -7907,7 +8188,7 @@ textarea.form-control-lg { .text-muted { --bs-text-opacity: 1; - color: #919aa1 !important; + color: #6c757d !important; } .text-black-50 { @@ -10597,12 +10878,15 @@ textarea.form-control-lg { } @media (min-width: 1200px) { .fs-1 { - font-size: 2rem !important; + font-size: 2.5rem !important; } .fs-2 { - font-size: 1.75rem !important; + font-size: 2rem !important; } .fs-3 { + font-size: 1.75rem !important; + } + .fs-4 { font-size: 1.5rem !important; } } @@ -10644,114 +10928,132 @@ textarea.form-control-lg { .navbar { font-size: 0.875rem; - font-weight: 600; - text-transform: uppercase; + font-weight: 500; } -.navbar-nav .nav-link { - padding-top: 0.715rem; - padding-bottom: 0.715rem; +.navbar .nav-item { + margin-right: 0.5rem; + margin-left: 0.5rem; } -.navbar-brand { - margin-right: 2rem; +.navbar .navbar-nav .nav-link { + border-radius: 0.375rem; } -.bg-light { - border: 1px solid rgba(0, 0, 0, 0.1); +.navbar-dark .navbar-nav .nav-link:hover { + background-color: rgba(255, 255, 255, 0.1); } -.bg-light.navbar-fixed-top { - border-width: 0 0 1px; -} -.bg-light.navbar-bottom-top { - border-width: 1px 0 0; +.navbar-dark .navbar-nav .nav-link.active { + background-color: rgba(0, 0, 0, 0.5); } -.nav-item { - margin-right: 2rem; +.navbar-light .navbar-nav .nav-link:hover { + background-color: rgba(0, 0, 0, 0.03); +} +.navbar-light .navbar-nav .nav-link.active { + background-color: rgba(0, 0, 0, 0.05); } -.btn { - font-size: 0.875rem; - text-transform: uppercase; +.navbar-nav { + --bs-nav-link-padding-x: .5rem; } -.btn-sm, .btn-group-sm > .btn { - font-size: 10px; + +.btn-secondary, +.btn-light, +.btn-outline-secondary, +.btn-outline-light { + color: #212529; } -.btn-warning, .btn-warning:hover, .btn-warning:not([disabled]):not(.disabled):active, .btn-warning:focus { - color: #fff; +.btn-secondary:disabled, .btn-secondary.disabled, +.btn-light:disabled, +.btn-light.disabled, +.btn-outline-secondary:disabled, +.btn-outline-secondary.disabled, +.btn-outline-light:disabled, +.btn-outline-light.disabled { + border: 1px solid #e6e6e6; } +.btn-secondary, .btn-outline-secondary { - color: #919aa1; - border-color: #919aa1; -} -.btn-outline-secondary:not([disabled]):not(.disabled):hover, .btn-outline-secondary:not([disabled]):not(.disabled):focus, .btn-outline-secondary:not([disabled]):not(.disabled):active { - color: #fff; - background-color: #ced4da; - border-color: #ced4da; + border-color: #e6e6e6; } -.btn-outline-secondary:not([disabled]):not(.disabled):focus { - box-shadow: 0 0 0 0.2rem rgba(206, 212, 218, 0.5); +.btn-secondary:hover, .btn-secondary:active, +.btn-outline-secondary:hover, +.btn-outline-secondary:active { + background-color: #e6e6e6; + border-color: #e6e6e6; } -[class*=btn-outline-] { - border-width: 2px; +.btn-light, +.btn-outline-light { + border-color: #dfe0e1; +} +.btn-light:hover, .btn-light:active, +.btn-outline-light:hover, +.btn-outline-light:active { + background-color: #dfe0e1; + border-color: #dfe0e1; } -.border-secondary { - border: 1px solid #ced4da !important; +.table { + font-size: 0.875rem; + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06); } -body { - font-weight: 200; - letter-spacing: 1px; -} - -h1, .h1, -h2, -.h2, -h3, -.h3, -h4, -.h4, -h5, -.h5, -h6, -.h6 { +thead th { + font-size: 0.875rem; text-transform: uppercase; - letter-spacing: 3px; } -.text-secondary { - color: #55595c !important; +.input-group-text { + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } -th { - font-size: 0.875rem; - text-transform: uppercase; +.nav-tabs { + font-weight: 500; +} +.nav-tabs .nav-link { + padding-top: 1rem; + padding-bottom: 1rem; + border-width: 0 0 1px; +} +.nav-tabs .nav-link.active, +.nav-tabs .nav-item.show .nav-link { + box-shadow: inset 0 -2px 0 #3459e6; +} + +.nav-pills { + font-weight: 500; } -.table th, -.table td { - padding: 1.5rem; +.pagination { + font-size: 0.875rem; + font-weight: 500; } -.table-sm th, -.table-sm td { - padding: 0.75rem; +.pagination .page-link { + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } -.dropdown-menu { +.breadcrumb { font-size: 0.875rem; - text-transform: none; + font-weight: 500; + border: 1px solid #dee2e6; + border-radius: 0.375rem; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} +.breadcrumb-item { + padding: 1rem 0.5rem 1rem 0; } -.badge { - padding-top: 0.28rem; +.breadcrumb-item + .breadcrumb-item::before { + padding-right: 1rem; } -.badge-pill { - border-radius: 10rem; + +.alert .btn-close { + color: inherit; } + .badge.bg-secondary, .badge.bg-light { - color: #343a40; + color: #212529; } .list-group-item h1, @@ -10779,4 +11081,20 @@ th { .card .h5, .card .h6 { color: inherit; +} + +.list-group { + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06); +} + +.card { + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06); +} + +.modal-footer { + background-color: #f8f9fa; +} + +.modal-content { + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06); } \ No newline at end of file diff --git a/pyquac/jupyter_app copy.py b/pyquac/jupyter_app copy.py new file mode 100644 index 0000000..bd5cc40 --- /dev/null +++ b/pyquac/jupyter_app copy.py @@ -0,0 +1,233 @@ +# Setup +from turtle import color +import dash +from dash.dependencies import Input, Output, State +from dash import dcc +from dash import html +import dash_bootstrap_components as dbc +from dash_bootstrap_templates import load_figure_template +from matplotlib.pyplot import cla +from jupyter_dash import JupyterDash + +from settings import settings + +# App Instance +theme = dbc.themes.ZEPHYR +css = settings.css_url +icons = dbc.icons.BOOTSTRAP +load_figure_template('ZEPHYR') + +# the style arguments for the sidebar. We use position:fixed and a fixed width +# SIDEBAR_STYLE = { +# "position": "fixed", +# "top": "70px", +# "left": 0, +# "bottom": 0, +# "width": "19rem", +# "padding": "2rem 1rem", +# "background-color": "#f8f9fa", +# } +SIDEBAR_STYLE = { + "position": "fixed", + "top": "70px", + "left": 0, + "bottom": 0, + "width": "16rem", + "height": "100%", + "z-index": 1, + "overflow-x": "hidden", + "transition": "all 0.5s", + "padding": "0.5rem 1rem", + "background-color": "#f8f9fa", +} + +SIDEBAR_HIDEN = { + "position": "fixed", + "top": "70px", + "left": "-16rem", + "bottom": 0, + "width": "16rem", + "height": "100%", + "z-index": 1, + "overflow-x": "hidden", + "transition": "all 0.5s", + "padding": "0.5rem 1rem", + "background-color": "#f8f9fa", +} + + +# the styles for the main content position it to the right of the sidebar and +# add some padding. +CONTENT_STYLE = { + "transition": "margin-left .5s", + "margin-left": "18rem", + "margin-right": "2rem", + "padding": "2rem 1rem", +} + +CONTENT_STYLE1 = { + "transition": "margin-left .5s", + "margin-left": "2rem", + "margin-right": "2rem", + "padding": "2rem 1rem" +} + +APP_LOGO = settings.app_logo + +app = JupyterDash(__name__, external_stylesheets=[theme, css, icons]) +app.title = settings.app_name + +########################## Sidebar ########################## +sidebar = html.Div( + [ + html.H5("Spectroscopy"), + html.Hr(), + html.P( + "A simple sidebar for data settings" + ), + dbc.Nav( + [ + dbc.NavLink("btn 1", href="/", active="exact"), + dbc.NavLink("btn 2", href="/page-1", active="exact"), + dbc.NavLink("btn 3", href="/page-2", active="exact"), + ], + vertical=True, + pills=True, + ), + ], + id="sidebar", + style=SIDEBAR_STYLE, +) + +content = html.Div(id="page-content", style=CONTENT_STYLE) + +########################## Navbar ########################## +# Input +COLLAPSE = html.Div( + [ + dbc.Button( + [ + html.I(className='fa fa-align-justify') + ], + id="btn_sidebar", + className="offset-2", + n_clicks=0, + ), + ] +) + +LOGO = html.A( + dbc.Row( + [ + dbc.Col(html.Img(src=APP_LOGO, height='35px')), + dbc.Col(dbc.NavbarBrand(settings.app_name, className="ms-2")) + ], + align='start', + className="g-0" + ), + href=settings.app_link, + style={"textDecoration": "none", "margin-left": "1rem"} + ) + +ABOUT = dbc.NavItem(html.Div([ + dbc.NavLink('About', href='/', id='about-popover', active=True), + dbc.Popover(id='about', is_open=False, target='about-popover', children=[ + dbc.PopoverHeader('How it Works'), + dbc.PopoverBody('Some text') + ]) + ])) + +DROPDOWN = dbc.DropdownMenu(label='Links', in_navbar=True, children=[ + + dbc.DropdownMenuItem( + [ + html.I(className='fa fa-linkedin'), ' Contacts' + ], + href=settings.app_linkedin_url, target='_blank'), + + dbc.DropdownMenuItem( + [ + html.I(className='fa fa-github'), ' Code' + ], + href=settings.app_github_url, target='_blank') + + ], + color='primary') + +navbar = dbc.Navbar(class_name='nav nav-pills', children=[ + COLLAPSE, + LOGO, + ABOUT, + DROPDOWN + + ], + color='primary', dark=True, expand='sm', + ) + +# Callback +@app.callback( + Output(component_id='about', component_property='is_open'), + Output(component_id='about-popover', component_property='active'), + Input(component_id='about-popover', component_property='n_clicks'), + Input('about', 'is_open'), + Input('about-popover', 'active') +) +def about_popover(n, is_open, active): + if n: + return not is_open, active + return is_open, active + + +########################## App Layout ########################## + +app.layout = html.Div(children = [ + dcc.Store(id='side_click'), + # dbc.Row([ + # dbc.Col(html.Br()), + # ]), + dbc.Row( + [ + dbc.Col(navbar), + ]), + dbc.Row( + [dbc.Col(children=[ + sidebar, + content + ], + width = 2), + ]) + ] +) + +@app.callback( + [ + Output("sidebar", "style"), + Output("page-content", "style"), + Output("side_click", "data"), + ], + + [Input("btn_sidebar", "n_clicks")], + [ + State("side_click", "data"), + ] +) +def toggle_sidebar(n, nclick): + if n: + if nclick == "SHOW": + sidebar_style = SIDEBAR_HIDEN + content_style = CONTENT_STYLE1 + cur_nclick = "HIDDEN" + else: + sidebar_style = SIDEBAR_STYLE + content_style = CONTENT_STYLE + cur_nclick = "SHOW" + else: + sidebar_style = SIDEBAR_STYLE + content_style = CONTENT_STYLE + cur_nclick = 'SHOW' + + return sidebar_style, content_style, cur_nclick + +########################## Run ########################## +if __name__ == "__main__": + app.run_server(debug=True, port=6050, mode='inline') diff --git a/pyquac/jupyter_app.py b/pyquac/jupyter_app.py index b221d8a..6ca8644 100644 --- a/pyquac/jupyter_app.py +++ b/pyquac/jupyter_app.py @@ -7,6 +7,7 @@ import dash_bootstrap_components as dbc from dash_bootstrap_templates import load_figure_template from matplotlib.pyplot import cla +from jupyter_dash import JupyterDash from settings import settings @@ -37,7 +38,7 @@ APP_LOGO = settings.app_logo_url -app = dash.Dash(name=settings.app_name, external_stylesheets=[theme, css, icons]) +app = JupyterDash(name=settings.app_name, external_stylesheets=[theme, css, icons]) app.title = settings.app_name ########################## Navbar ##########################