From a8f54c50ae5447be50b0ecb708507bf81062c8b4 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Fri, 12 Feb 2016 01:05:39 +0000 Subject: [PATCH] Bug 11088: Floating toolbar to patron entry page ~ THIS IS NOT READY FOR SIGN OFF ~ Can someone who knows a bit about jquery (and maybe css) apply what I've got in this patch so far and work out why the toolbar keeps jumping down the page as soon as I scroll? The functionality of the toolbar and scrolling etc seems to work as it should, but I can't work out why it keeps jumping! Help appreciated! --- .../intranet-tmpl/lib/bootstrap/bootstrap.min.css | 2 +- .../prog/en/modules/members/memberentrygen.tt | 26 ++++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css b/koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css index 0a4c9df..dfe908b 100644 --- a/koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css +++ b/koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css @@ -268,7 +268,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .icon-fullscreen{background-position:-456px -144px;} .btn-group{position:relative;display:inline-block;*display:inline;*zoom:1;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em;}.btn-group:first-child{*margin-left:0;} .btn-group+.btn-group{margin-left:5px;} -.btn-toolbar{font-size:0;margin-top:10px;margin-bottom:10px;}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px;} +.btn-toolbar{font-size:0;margin-top:0;margin-bottom:10px;}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px;} .btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .btn-group>.btn+.btn{margin-left:-1px;} .btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px;} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 8a8d3d4..f8979ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -4,6 +4,7 @@ Koha › Patrons › [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %]) [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] +