From 285d315372278d97c1f64447ed93e64d7d37ba80 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 29 Jun 2018 12:50:01 +0000 Subject: [PATCH] Bug 20959: (follow-up) Prevent checkin button from wrapping This follow-up wraps the checkin form in a div to prevent the button from wrapping to the line below the input. To test, apply the patch and clear your browser cache if necessary. View the checkin page to confirm that there isn't a layout problem. --- .../intranet-tmpl/prog/css/src/staff-global.scss | 4 ++++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 28 ++++++++++++---------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 969d5a6..8add243 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2621,6 +2621,10 @@ li { } } +.form-control-group { + white-space: nowrap; +} + .importing { position: relative; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index a156b42..b5601d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -611,19 +611,21 @@
Enter item barcode:
- [% IF ( exemptfine ) %] - - [% ELSIF ( dropboxmode ) %] - - [% ELSE %] - - [% END %] - - [% FOREACH inputloo IN inputloop %] - - - - [% END %] +
+ [% IF ( exemptfine ) %] + + [% ELSIF ( dropboxmode ) %] + + [% ELSE %] + + [% END %] + + [% FOREACH inputloo IN inputloop %] + + + + [% END %] +
-- 2.1.4