diff --git a/web/src/bundles/common.ts b/web/src/bundles/common.ts index 5d5b1109dd..9f13aa74d1 100644 --- a/web/src/bundles/common.ts +++ b/web/src/bundles/common.ts @@ -9,7 +9,6 @@ import "../../images/icons/zulip-icons.font.cjs"; import "source-sans/source-sans-3VF.css"; import "source-code-pro/source-code-pro.css"; import "@fontsource-variable/open-sans"; -import "../../third/bootstrap/css/bootstrap-alert.css"; import "../../styles/alerts.css"; import "../../styles/modal.css"; import "../../styles/progress_bar.css"; diff --git a/web/third/bootstrap/css/bootstrap-alert.css b/web/third/bootstrap/css/bootstrap-alert.css deleted file mode 100644 index 6073a0a30b..0000000000 --- a/web/third/bootstrap/css/bootstrap-alert.css +++ /dev/null @@ -1,46 +0,0 @@ -/* Bootstrap alert CSS rules that have not been replaced with our own - designs. */ - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 20px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.alert, -.alert h4 { - color: #c09853; -} -.alert h4 { - margin: 0; -} -.alert-success { - background-color: #dff0d8; - border-color: #d6e9c6; - color: #468847; -} -.alert-success h4 { - color: #468847; -} -.alert-danger, -.alert-error { - background-color: #f2dede; - border-color: #eed3d7; - color: #b94a48; -} -.alert-danger h4, -.alert-error h4 { - color: #b94a48; -} -.alert-info { - background-color: #d9edf7; - border-color: #bce8f1; - color: #3a87ad; -} -.alert-info h4 { - color: #3a87ad; -} diff --git a/web/third/bootstrap/css/bootstrap.app.css b/web/third/bootstrap/css/bootstrap.app.css index 8bdda7e872..64d0337137 100644 --- a/web/third/bootstrap/css/bootstrap.app.css +++ b/web/third/bootstrap/css/bootstrap.app.css @@ -101,3 +101,24 @@ input:focus:invalid:focus { -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; } + +/* Bootstrap alert CSS rules that have not been replaced with our own + designs. */ + +.alert { + padding: 8px 35px 8px 14px; + margin-bottom: 20px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: #fcf8e3; + border: 1px solid #fbeed5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.alert, +.alert h4 { + color: #c09853; +} +.alert h4 { + margin: 0; +} diff --git a/web/third/bootstrap/css/bootstrap.portico.css b/web/third/bootstrap/css/bootstrap.portico.css index 0b8c22bce7..86c47c69d2 100644 --- a/web/third/bootstrap/css/bootstrap.portico.css +++ b/web/third/bootstrap/css/bootstrap.portico.css @@ -309,3 +309,50 @@ input:focus:invalid:focus { padding-top: 0; } } + +/* Bootstrap alert CSS rules that have not been replaced with our own + designs. */ + +.alert { + padding: 8px 35px 8px 14px; + margin-bottom: 20px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: #fcf8e3; + border: 1px solid #fbeed5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.alert, +.alert h4 { + color: #c09853; +} +.alert h4 { + margin: 0; +} +.alert-success { + background-color: #dff0d8; + border-color: #d6e9c6; + color: #468847; +} +.alert-success h4 { + color: #468847; +} +.alert-danger, +.alert-error { + background-color: #f2dede; + border-color: #eed3d7; + color: #b94a48; +} +.alert-danger h4, +.alert-error h4 { + color: #b94a48; +} +.alert-info { + background-color: #d9edf7; + border-color: #bce8f1; + color: #3a87ad; +} +.alert-info h4 { + color: #3a87ad; +}