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

diff --combined app/assets/stylesheets/common.scss
index efd0ac265049fdbe4f77ebe5793ba020e112f781,f68ba9eee173ba7cfb0ffcd5ec228cbcd9aa2378..779fbbe35d0fbe705c308258ce30b104dabe1cb4
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -304,7 -304,7 +304,7 @@@ body.small-nav 
    }
  
    nav.secondary {
-     .user-menu {
+     .user-menu, .login-menu {
        width: 100%;
      }
    }
@@@ -317,7 -317,7 +317,7 @@@
      display: inline-block;
    }
  
 -  .overlay-sidebar #sidebar .welcome.visible {
 +  .overlay-sidebar #sidebar .welcome {
      display: none;
    }
  
@@@ -436,7 -436,11 +436,7 @@@
      }
  
      .welcome {
 -      display: none;
 -
 -      &.visible {
 -        display: block;
 -      }
 +      display: block;
      }
  
      #sidebar_content {
@@@ -1123,6 -1127,32 +1123,6 @@@ tr.turn:hover 
    }
  }
  
 -/* Rules for the account settings page */
 -
 -#accountForm .user_image {
 -  margin-bottom: 0;
 -}
 -
 -#accountForm #user_image {
 -  margin-left: 20px;
 -}
 -
 -#accountForm ul.accountImage-options {
 -  margin-left: 120px;
 -}
 -
 -.nohome .location {
 -  display: none;
 -}
 -
 -#homerow .message {
 -  display: none;
 -}
 -
 -.nohome .message {
 -  display: inline !important;
 -}
 -
  /* Rules for the oauth authorization page */
  
  .oauth-authorize ul {
@@@ -1182,6 -1212,44 +1182,6 @@@
    display: none;
  }
  
 -/* Rules for highlighting fields with rails validation errors */
 -
 -.formError {
 -  display: inline-block;
 -  padding: 5px 10px;
 -  margin-top: 5px;
 -  border-radius: 4px;
 -  font-size: 12px;
 -  color: #fff;
 -  background-color: #ff7070;
 -}
 -
 -/* Rules for rails validation error boxes */
 -
 -#errorExplanation {
 -  width: 400px;
 -  border: 2px solid #ff7070;
 -  padding: 0 $lineheight/2;
 -  margin-bottom: $lineheight;
 -  background-color: #f0f0f0;
 -
 -  h2 {
 -    margin: 0 -10px 10px -10px;
 -    padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
 -    font-weight: bold;
 -    font-size: 12px;
 -    background-color: #c00;
 -    color: #fff;
 -    text-align: left;
 -  }
 -
 -  p {
 -    color: #333;
 -    margin-bottom: 0px;
 -    padding: $lineheight/4;
 -  }
 -}
 -
  .search_form {
    background-color: $lightgrey;