@@ -, +, @@ interface --- koha-tmpl/intranet-tmpl/prog/css/print.css | 9 +++++---- .../prog/css/printreceiptinvoice.css | 5 +---- .../intranet-tmpl/prog/css/right-to-left.css | 4 ++-- .../prog/css/src/staff-global.scss | 20 ++++++++++--------- .../prog/en/includes/acquisitions-search.inc | 3 ++- .../prog/en/includes/adv-search.inc | 2 +- .../prog/en/includes/authorities-search.inc | 4 ++-- .../prog/en/includes/budgets-admin-search.inc | 3 ++- .../prog/en/includes/cat-search.inc | 3 ++- .../prog/en/includes/cataloging-search.inc | 3 ++- .../prog/en/includes/checkin-search.inc | 3 ++- .../prog/en/includes/circ-search.inc | 3 ++- .../prog/en/includes/cities-admin-search.inc | 3 ++- .../en/includes/contracts-admin-search.inc | 3 ++- .../en/includes/currencies-admin-search.inc | 3 ++- .../prog/en/includes/desks-admin-search.inc | 3 ++- .../prog/en/includes/home-search.inc | 3 ++- .../prog/en/includes/letters-search.inc | 3 ++- .../intranet-tmpl/prog/en/includes/logo.inc | 7 +++++++ .../prog/en/includes/patron-search.inc | 4 +++- .../prog/en/includes/patrons-admin-search.inc | 3 ++- .../prog/en/includes/prefs-admin-search.inc | 2 +- .../prog/en/includes/serials-search.inc | 3 ++- .../en/includes/suggestions-add-search.inc | 3 ++- .../prog/en/includes/z3950-admin-search.inc | 3 ++- 25 files changed, 65 insertions(+), 40 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/logo.inc --- a/koha-tmpl/intranet-tmpl/prog/css/print.css +++ a/koha-tmpl/intranet-tmpl/prog/css/print.css @@ -43,10 +43,6 @@ h1 margin-top : 3px; } -h1#logo { - display: none; -} - h2 { color : #000000; font-size : 20px; @@ -291,6 +287,7 @@ td.debit { #login, #header, #header_search, +#header_logo, #toolbar, #changelanguage, #menu, @@ -364,3 +361,7 @@ th { #catalog_detail .col-sm-push-2 { left: 0; } + + + display: none; +} --- a/koha-tmpl/intranet-tmpl/prog/css/printreceiptinvoice.css +++ a/koha-tmpl/intranet-tmpl/prog/css/printreceiptinvoice.css @@ -43,10 +43,6 @@ h1 margin-top : 3px; } -h1#logo { - display: none; -} - h2 { color : #000000; font-size : 20px; @@ -330,6 +326,7 @@ div.yui-b, .noprint, form#sortbyform, #cartDetails, +#header_logo, fieldset.action, .list-actions, .print { --- a/koha-tmpl/intranet-tmpl/prog/css/right-to-left.css +++ a/koha-tmpl/intranet-tmpl/prog/css/right-to-left.css @@ -235,7 +235,7 @@ div.patroninfo h5 /* TODO - Can we find ways to avoid this? */ -h1#logo, +#header_logo, #koha_url, #login, .yui-t1 .yui-b @@ -440,7 +440,7 @@ div.dt-buttons { } @media (max-width: 767px) { - h1#logo { + #header_logo { float: none; margin: auto; position: relative; --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -283,14 +283,6 @@ form { h1 { font-size: 161.6%; font-weight: bold; - - &#logo { - border: 0 none; - float: left; - margin: .75em .3em .75em .7em; - padding: 0; - width: 180px; - } } h2 { @@ -1927,6 +1919,16 @@ i { } } +#header_logo { + float:left; + + .koha_version { + text-align: center; + font-weight: bold; + } +} + + #closewindow { margin-top: 2em; text-align: center; @@ -4431,7 +4433,7 @@ div .suggestion_note { } } - h1#logo { + #header_logo { float: none; margin: auto; } --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -1,5 +1,6 @@ +
-

[% LibraryName | html %]

+[% INCLUDE 'logo.inc' %]