[Koha-bugs] [Bug 25267] OPAC browse shelf feature is not responsive

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25267

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Failed QA                   |Patch doesn't apply

--- Comment #11 from David Nind <david at davidnind.com> ---
Patch no longer applies

root at kohadevbox:koha(bz25267)$ git bz apply 25267

Bug 25267 - OPAC browse shelf feature is not responsive

135632 - Bug 25267: Impove shelf browser responsiveness
135634 - Bug 25267: (follow-up) Improve title text responsiveness

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 25267: Impove shelf browser responsiveness
.git/rebase-apply/patch:60: trailing whitespace.

warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss
M       koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc
.git/rebase-apply/patch:60: trailing whitespace.

warning: 1 line applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc
Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss
error: Failed to merge in the changes.
Patch failed at 0001 Bug 25267: Impove shelf browser responsiveness

-- 
You are receiving this mail because:
You are watching all bug changes.