Merge branch 'tags/rel_2_12_4' of git://git.evergreen-ils.org/Evergreen into rel_2_12_4

diff --cc Open-ILS/src/templates/opac/css/style.css.tt2
index 5ff751a,7e97b5a..a706084
--- 1/Open-ILS/src/templates/opac/css/style.css.tt2
--- 2/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@@ -974,13 -927,8 +965,10 @@@ div.format_icon 
      color: [% css_colors.text %];
      /* this border is not visible, but it keeps these labels the same size
      as the buttons */
- <<<<<<< HEAD
 +    border: 1px solid [% css_colors.accent_light %];
 +    background: [% css_colors.accent_light %];
- =======
      border: 1px solid [% css_colors.accent_medium %];
      background-color: [% css_colors.accent_medium %];
- >>>>>>> 88fcefd... LP#1205190: TPAC: Improve style.css to reduce warnings
      margin: 0.5em 0.3em;
      padding: 0.3em;
  }