Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 47 deletions

diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index de9e0c6f705..af9f10c9a26 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -1,9 +1,3 @@
-.profile-avatar-form-option {
-  hr {
-    margin: 10px 0;
-  }
-}
-
 .avatar-image {
   margin-bottom: $grid-size;
 
@@ -23,41 +17,6 @@
   display: inline-block;
 }
 
-.private-tokens-reset div.reset-action:not(:first-child) {
-  padding-top: 15px;
-}
-
-.oauth-buttons {
-  .btn-group {
-    margin-right: 10px;
-  }
-
-  .btn {
-    line-height: 40px;
-    height: 42px;
-    padding: 0 12px;
-
-    img {
-      width: 32px;
-      height: 32px;
-    }
-  }
-}
-
-// Profile > Account > Two Factor Authentication
-.two-factor-new {
-  .manual-instructions {
-    h3 {
-      margin-top: 0;
-    }
-
-    // Slightly increase the size of the details so they're easier to read
-    dl {
-      font-size: 1.1em;
-    }
-  }
-}
-
 .account-well {
   padding: 10px;
   background-color: $gray-light;
@@ -191,10 +150,6 @@
   }
 }
 
-.personal-access-tokens-never-expires-label {
-  color: $note-disabled-comment-color;
-}
-
 .created-personal-access-token-container {
   .btn-clipboard {
     border: 1px solid $border-color;
@@ -266,8 +221,7 @@
   }
 }
 
-table.u2f-registrations,
-.webauthn-registrations {
+table.u2f-registrations {
   th:not(:last-child),
   td:not(:last-child) {
     border-right: solid 1px transparent;