From 95fc303c5cec42bccfbf9b10ceafc16e07e6420d Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sat, 17 Nov 2018 21:16:26 +0100 Subject: [PATCH] Support for `.innerSuccess` and `.innerWarning` Closes #2601 --- wcfsetup/install/files/style/element/dl.scss | 8 ++-- wcfsetup/install/files/style/ui/alert.scss | 38 ++++++++++++++++++- wcfsetup/install/files/style/ui/redactor.scss | 10 ++++- .../files/style/ui/tabMenuMessage.scss | 4 +- 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/wcfsetup/install/files/style/element/dl.scss b/wcfsetup/install/files/style/element/dl.scss index 335d266fe9..9c5c37ca04 100644 --- a/wcfsetup/install/files/style/element/dl.scss +++ b/wcfsetup/install/files/style/element/dl.scss @@ -23,7 +23,7 @@ dl { margin-bottom: 20px; } - > small:not(.innerError) { + > small:not(.innerError):not(.innerSuccess):not(.innerWarning) { color: $wcfContentDimmedText; display: block; margin-top: 3px; @@ -33,7 +33,7 @@ dl { display: block; /* indentation for checkbox descriptions */ - + small:not(.innerError) { + + small:not(.innerError):not(.innerSuccess):not(.innerWarning) { margin-left: 24px; } } @@ -54,7 +54,7 @@ dl { margin-right: 0; } - + small:not(.innerError) { + + small:not(.innerError):not(.innerSuccess):not(.innerWarning) { margin-left: 0; } } @@ -86,7 +86,7 @@ dl { margin-top: 0; } - + small:not(.innerError) { + + small:not(.innerError):not(.innerSuccess):not(.innerWarning) { margin-left: 0; } } diff --git a/wcfsetup/install/files/style/ui/alert.scss b/wcfsetup/install/files/style/ui/alert.scss index 3e971ae968..083177ade5 100644 --- a/wcfsetup/install/files/style/ui/alert.scss +++ b/wcfsetup/install/files/style/ui/alert.scss @@ -79,7 +79,9 @@ } .innerError, -.innerInfo { +.innerInfo, +.innerSuccess, +.innerWarning{ display: table; line-height: 1.5; margin-top: 8px; @@ -99,7 +101,7 @@ } } -/* inline errors */ +/* inline messages */ .innerError { background-color: rgb(242, 222, 222); color: rgb(169, 68, 66); @@ -116,6 +118,38 @@ } } } +.innerSuccess { + background-color: $wcfStatusSuccessBackground; + color: $wcfStatusSuccessText; + + &::before { + border-bottom-color: $wcfStatusSuccessBackground; + } + + a { + color: $wcfStatusSuccessLink; + + &:hover { + color: $wcfStatusSuccessLinkActive; + } + } +} +.innerWarning { + background-color: $wcfStatusWarningBackground; + color: $wcfStatusWarningText; + + &::before { + border-bottom-color: $wcfStatusWarningBackground; + } + + a { + color: $wcfStatusWarningLink; + + &:hover { + color: $wcfStatusWarningLinkActive; + } + } +} /* sticky footer notices */ .pageFooterStickyNotice { diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss index fa6bb5ecb9..344fe092d1 100644 --- a/wcfsetup/install/files/style/ui/redactor.scss +++ b/wcfsetup/install/files/style/ui/redactor.scss @@ -11,14 +11,20 @@ } & + .innerError, - > .innerError { + & + .innerSuccess, + & + .innerWarning, + > .innerError, + > .innerSuccess, + > .innerWarning { border-radius: 0; box-shadow: none; display: block; margin-top: -1px; } - > .innerError { + > .innerError, + > .innerSuccess, + > .innerWarning { margin: -1px 0; } } diff --git a/wcfsetup/install/files/style/ui/tabMenuMessage.scss b/wcfsetup/install/files/style/ui/tabMenuMessage.scss index d9f49debcb..76aec308c1 100644 --- a/wcfsetup/install/files/style/ui/tabMenuMessage.scss +++ b/wcfsetup/install/files/style/ui/tabMenuMessage.scss @@ -48,7 +48,9 @@ } } -.messageTabMenu + .innerError { +.messageTabMenu + .innerError, +.messageTabMenu + .innerSuccess, +.messageTabMenu + .innerWarning { margin-top: -1px; width: 100%; } -- 2.20.1