Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 3 insertions, 69 deletions

diff --git a/app/views/layouts/oauth_error.html.haml b/app/views/layouts/oauth_error.html.haml
index 03b387f8181..8d241dfd207 100644
--- a/app/views/layouts/oauth_error.html.haml
+++ b/app/views/layouts/oauth_error.html.haml
@@ -3,35 +3,10 @@
   %head
     %meta{ :content => "width=device-width, initial-scale=1, maximum-scale=1", :name => "viewport" }
     %title= yield(:title)
+    = stylesheet_link_tag 'application_utilities'
+    %style
+      = Rails.application.assets_manifest.find_sources('errors.css').first.to_s.html_safe
     :css
-      body {
-        color: #666;
-        text-align: center;
-        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-        margin: auto;
-        font-size: 16px;
-      }
-
-      .container {
-        margin: auto 20px;
-      }
-
-      h3 {
-        color: #456;
-        font-size: 22px;
-        font-weight: 600;
-        margin-bottom: 6px;
-      }
-
-      p {
-        max-width: 470px;
-        margin: 16px auto;
-      }
-
-      .subtitle {
-        margin: 0 auto 20px;
-      }
-
       svg {
         width: 280px;
         height: 280px;
@@ -82,46 +57,5 @@
         25% {opacity: 1;}
       }
 
-      .light {
-        color: #8D8D8D;
-      }
-
-      hr {
-        max-width: 600px;
-        margin: 18px auto;
-        border: 0;
-        border-top: 1px solid #EEE;
-      }
-
-      .btn {
-        padding: 8px 14px;
-        border-radius: 3px;
-        border: 1px solid;
-        display: inline-block;
-        text-decoration: none;
-        margin: 4px 8px;
-        font-size: 14px;
-      }
-
-      .primary {
-        color: #fff;
-        background-color: #1aaa55;
-        border-color: #168f48;
-      }
-
-      .primary:hover {
-        background-color: #168f48;
-      }
-
-      .secondary {
-        color: #1aaa55;
-        background-color: #fff;
-        border-color: #1aaa55;
-      }
-
-      .secondary:hover {
-        background-color: #f3fff8;
-      }
-
 %body
   = yield