Merge remote-tracking branch 'upstream/pull/4724'

diff --combined app/assets/stylesheets/common.scss
index d4bc31255aee675d1dee3d19dfe4c32345ad0ae0,1500506154e22fc03ecabfb6f71fc7660659d18e..ca9a820f9780b58a4329bbaf861ecb1ea64c331f
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -15,6 -15,10 +15,6 @@@ p > img 
    max-width: 100%;
  }
  
 -small, aside {
 -  font-size: 12px;
 -}
 -
  time[title] {
    text-decoration: underline dotted;
  }
@@@ -545,10 -549,6 +545,6 @@@ header .search_forms
  /* Rules for search sidebar */
  
  #sidebar .search_results_entry {
-   ul li.selected {
-     background: $list-highlight;
-   }
- 
    .search_more .loader {
      display: none;
    }

diff --combined app/assets/stylesheets/parameters.scss
index 97514d5ca4048c46f6d2c4d1bba979df0718d845,cc1d55eccbdf5309b66d84061373119ac9019f6b..07549d69bb33e939238f98e6ef6d1e44eea4a816
--- 1/app/assets/stylesheets/parameters.scss
--- 2/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@@ -4,13 -4,14 +4,12 @@@ $typeheight: 14px
  
  $blue: #7092FF;
  $secondary: #888;
 -$lightblue: #B8C5F0;
  $green: #7ebc6f;
  $vibrant-green: #76c551;
  $grey: #CCC;
 -$lightgrey: #EEE;
  $darkgrey: #888;
  $headerHeight: 55px;
  $sidebarWidth: 350px;
- $list-highlight: #FFFFC0;
  
  $link-color: #24d;
  $link-hover-color: #24d;