From d6a7ae667e8a62f3584e013e4c6e571c21ef1bb3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sun, 20 Oct 2013 10:39:06 -0700 Subject: [PATCH] [SIGNED-OFF] Bug 11057 - Bootstrap theme: Don't hide language chooser below the fold There is a problem with how an active single language is styled, making the alignment look incorrect. This patch amends the markup and the CSS to make it look better. This patch does not address the position of the language menu. To test you must have at least one additional single translation installed. Apply the patch, refresh the page, and confirm that the display of the active language is improved. Signed-off-by: Bernardo Gonzalez Kriegel Improved view of current language. No koha-qa errors. 1) Downloaded a couple of xx-YY-bootstrap.po from http://translate.koha-community.org/projects/314 2) Installed sample languages 3) Enable them and opaclanguagesdisplay 4) Checked correct alignment of selected language Signed-off-by: Ed Veal --- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 8 +++----- .../bootstrap/en/includes/opac-bottom.inc | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css index 36b7a1e..a97158f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css +++ b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css @@ -386,6 +386,9 @@ td { margin-top: .5em; position: static; } +#changelanguage .nav > .active > p { + padding: 0 15px; +} .table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > th { background-color: #F4F4F4; @@ -2191,11 +2194,6 @@ td img { #shelfbrowser #browser_next { background-position: -9px -1057px; } -.shadowed { - -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2); - box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2); -} @media only screen and (min-width: 0px) and (max-width: 304px) { /* Screens bewteen 0 and 304 pixels wide */ #oh:after { diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 2164ee4..c3ce588 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -57,9 +57,9 @@ [% ELSE %] [% IF ( languages_loo.group_enabled ) %] [% IF ( languages_loo.current ) %] -
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]

  • +
  • [% ELSE %] -
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
  • +
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
  • [% END %] [% END # / IF languages_loo.current %] [% END # / IF ( languages_loo.plural ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less index 106fb3a..c95d82a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less +++ b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less @@ -352,6 +352,10 @@ table, td { position: static; } +#changelanguage .nav > .active > p { + padding : 0 15px; +} + .table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > th { background-color: #F4F4F4; -- 1.7.2.5