@@ -, +, @@ enough - Test the hold confirmation modal in check-in: - Place a hold on an available title. - Check in an item from that record and confirm that the modal looks correct. The "Check in message" box should take up the whole width of the modal, and the links in the modal header should be the standard green. - Test the SQL preview modal in reports: - Go to Reports -> Use saved. - Click the actions menu associated with one of your saved reports and choose "Preview SQL." The modal should look correct. - Other modals which might be tested: MARC previews from the bibliographic detail page, the cataloging search page, the Z39.50 search page, etc. --- .../prog/css/src/_variables.scss | 1 + .../prog/css/src/staff-global.scss | 44 ++++++++++--------- .../modules/reports/guided_reports_start.tt | 1 + 3 files changed, 26 insertions(+), 20 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss @@ -1,6 +1,7 @@ $green-text-color: #006100; $background-color-primary: #408540; $background-color-secondary: lighten(saturate(adjust-hue($background-color-primary, -24), 9), 9); +$background-color-modal: lighten( saturate( $background-color-secondary, 5 ), 30 ); // Copied from Bootstrap 5 without system-ui because of // https://infinnie.github.io/blog/2017/systemui.html --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -593,10 +593,6 @@ h4, h5, h6 { margin: .5em 0; - - a, a:link, a:visited { - color: #000; - } } hr { @@ -1627,7 +1623,6 @@ i { margin: 1em auto; padding: .5em; text-align: center; - display: table; width: 65%; max-width: 600px; @@ -3393,28 +3388,33 @@ label { } } -.modal-header { - .closebtn { - margin-top: 4px; - } -} - .closebtn { color: #000; - filter: alpha(opacity = 20); + cursor: pointer; float: right; font-size: 21px; font-weight: bold; line-height: 1; - opacity: .2; + margin-top: 4px; + text-decoration: none; + text-shadow: 0 1px 0 rgba( 255, 255, 255, .4 ); - &:hover, - &:focus { + &:focus, + &:hover { + text-shadow: 0 1px 0 rgba( 255, 255, 255, .6 ); + } + + &:active { + box-shadow: none; + text-shadow: 0 1px 0 rgba( 255, 255, 255, .9 ); + } +} + +.modal-header { + border-bottom: 1px solid $background-color-secondary; + + h3 { color: #000; - cursor: pointer; - filter: alpha(opacity = 50); - opacity: .5; - text-decoration: none; } } @@ -3432,13 +3432,17 @@ label { } .modal-content { - background-color: rgb(211, 223, 204); + background-color: $background-color-modal; fieldset { box-shadow: none; } } +.modal-footer { + border-top: 1px solid $background-color-secondary; +} + .btn-group { label, select { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -2320,6 +2320,7 @@ \ \ \