Merge master with css changes

diff --cc app/assets/stylesheets/common.scss
index 2eb6bf98eae8aa0de2b8ad54cbebd9a7be610652,8d3da8f7e8267d467b642176d13e9e6ae8a8ecd9..1f80a9b5b520c08029d9965e273b92b731ec1429
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -357,14 -358,22 +357,6 @@@ body.compact-nav 
        clear: both;
        width: 100%;
      }
--
-     h2 {
-       font-size: 1.5rem;
-     }
 -    .close-wrap {
 -      cursor: pointer;
 -      position: absolute;
 -      top: 0;
 -      right: 0;
 -      width: 60px;
 -      height: 60px;
--
-     h3, h4 {
-       font-size: 1.25rem;
 -      .icon.close {
 -        pointer-events: none;
 -        position: absolute;
 -        right: 20px;
 -        top: 20px;
 -      }
--    }
    }
  
    .overlay-sidebar #sidebar {