Merge develop into 20180425_-_fix_help_aside

diff --combined view/theme/frio/css/style.css
index 3b3e32f75c3dd458ca5931d220830faba4161268,18b2f4208899a4dc945fdbd89fba7569b944ce77..e1ac4f4da50a0e9bba131ac8202ba812a8a04a2c
--- 1/view/theme/frio/css/style.css
--- 2/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@@ -24,9 -24,10 +24,10 @@@ and open the template in the editor
  
  body {
      padding-top: 110px;
-     background-color: $bgcolor;
+     background-color: $background_color;
      background-image: url("$background_image");
      background-size: $background_size_img;
+     background-repeat: $background_repeat;
      background-attachment: fixed;
      color: #777;
      /*color: #555;*/
@@@ -98,6 -99,7 +99,6 @@@ blockquote 
  code {
      white-space: pre-wrap;
  }
 -.help-content-wrapper code, .help-aside-wrapper code {display: inline}
  
  /**
   * mobile aside
@@@ -1054,25 -1056,6 +1055,25 @@@ aside > #datebrowse-sidebar .posted-dat
      padding-left: 27px;
  }
  
 +/* help page widget */
 +aside > .help-content-wrapper code, .help-aside-wrapper code {
 +    display: inline
 +}
 +aside > .help-aside-wrapper p strong:first-child {
 +    display: block;
 +    margin: 1em 0 0em;
 +}
 +aside > .help-aside-wrapper h1 {
 +    font-weight: bold;
 +    font-size: 16px;
 +    margin: 0;
 +    padding: 20px 0 10px;
 +}
 +aside > .help-aside-wrapper h2 {
 +    font-weight: bold;
 +    font-size: 14px;
 +}
 +
  /* vcard / h-card */
  aside .vcard #profile-photo-wrapper{
      margin: 0;
@@@ -3154,12 -3137,30 +3155,30 @@@ section .profile-match-wrapper 
   * Login page
   */
  #login-submit-wrapper {
-     display: flex;
-     flex-wrap: wrap;
-     justify-content: space-between;
-     align-items: center;
+     float: right;
  }
  #lost-password-link { flex-grow: 2; }
+ #login-lost-password-link {
+     margin-bottom: 10px;
+     float: right;
+ }
+ #div_id_remember {
+     float: left;
+ }
+ #id_password_wrapper {
+     margin-bottom: unset;
+ }
+ #login_openid {
+     clear: both;
+ }
+ #register-link {
+     color: white;
+     background: #8ad0a1;
+     width: 100%;
+ }
+ #login-end {
+     clear: both;
+ }
  
  .mod-home.is-not-singleuser,
  .mod-login {
@@@ -3184,12 -3185,15 +3203,15 @@@
      margin-top: 2.5%;
  }
  
+ .mod-home.is-not-singleuser .login-form > #login-extra-links {
+     margin-top: 4em;
+ }
+ 
  .mod-home.is-not-singleuser .login-form > #login-form label,
  .mod-login #content #login-form label {
      color: #eee;
  }
  
- 
  .mod-home.is-not-singleuser .login-panel-content,
  .mod-login .login-panel-content {
      background-color: rgba(255,255,255,.85);
@@@ -3203,11 -3207,15 +3225,15 @@@
      }
  
      .mod-home.is-not-singleuser .login-form > #login-form,
+     .mod-home.is-not-singleuser .login-form > #login-extra-links,
      .mod-login #content #login-form {
          background-color: #fff;
          padding: 1em;
          position: relative;
-         margin-top: 4em;
+     }
+     .mod-home.is-not-singleuser .login-form > #login-extra-links {
+         margin-top: unset;
+         background-color: white;
      }
  
      .mod-home.is-not-singleuser .login-form > #login-form label,
@@@ -3215,7 -3223,7 +3241,7 @@@
          color: #444;
      }
  
-     .mod-home.is-not-singleuser .login-form > #login-form::before,
+     .mod-home.is-not-singleuser .login-form::before,
      .mod-login #content #login-form::before {
          display: block;
          position: absolute;
@@@ -3228,7 -3236,7 +3254,7 @@@
          z-index: -1;
      }
  
-     .mod-home.is-not-singleuser .login-form > #login-form::after,
+     .mod-home.is-not-singleuser .login-form::after,
      .mod-login #content #login-form::after {
          display: block;
          position: absolute;