Merge branch 'master' of github.com:MITx/mitx

static/css/application.css

@@ -3524,7 +3524,7 @@ div.profile-wrapper section.user-info ul li p {
 div.profile-wrapper section.user-info ul li a.deactivate {
   color: #aaa;
   font-style: italic; }
-div.profile-wrapper section.user-info ul li input {
+div.profile-wrapper section.user-info ul li input#pwd_reset_button {
   background: none;
   border: none;
   -webkit-box-shadow: none;
@@ -3539,7 +3539,7 @@ div.profile-wrapper section.user-info ul li input {
   right: 11.326px;
   text-transform: uppercase;
   top: 9px; }
-div.profile-wrapper section.user-info ul li input:hover {
+div.profile-wrapper section.user-info ul li input#pwd_reset_button:hover {
   color: #555; }
 div.profile-wrapper section.user-info div#change_password_pop {
   border-bottom: 1px solid #d3d3d3;

templates/sass/_profile.scss

@@ -104,7 +104,7 @@ div.profile-wrapper {
           font-style: italic;
         }
 
-        input {
+        input#pwd_reset_button {
           background: none;
           border: none;
           @include box-shadow(none);