Remove CI css that exists in GitLab

5 files changed, 22 insertions, 18 deletions

diff --git a/app/views/layouts/ci/_nav.html.haml b/app/views/layouts/ci/_nav.html.haml
index 4a0e45a0217..3d2c7ce06da 100644
--- a/app/views/layouts/ci/_nav.html.haml
+++ b/app/views/layouts/ci/_nav.html.haml
@@ -19,7 +19,7 @@
       %ul.nav.navbar-nav.pull-right
         - if current_user
           %li
-            = link_to new_user_session_path do
+            = link_to "/profile", no_turbolink do
               .profile-holder
                 = image_tag user_avatar_url(current_user, 64), class: 'avatar s32', alt: ''
                 %span= current_user.name
diff --git a/app/views/layouts/ci/admin.html.haml b/app/views/layouts/ci/admin.html.haml
index 71b767cc4f1..cd160a54455 100644
--- a/app/views/layouts/ci/admin.html.haml
+++ b/app/views/layouts/ci/admin.html.haml
@@ -9,9 +9,10 @@
         = yield(:title)
       %hr
 
-    .container
-      .row
-        .col-md-2.append-bottom-20
-          = render 'layouts/ci/nav_admin'
-        .col-md-10
-          = yield
+    .container.container-body
+      .content
+        .row
+          .col-md-2.append-bottom-20
+            = render 'layouts/ci/nav_admin'
+          .col-md-10
+            = yield
diff --git a/app/views/layouts/ci/application.html.haml b/app/views/layouts/ci/application.html.haml
index 7306d378e44..8990ffbffe6 100644
--- a/app/views/layouts/ci/application.html.haml
+++ b/app/views/layouts/ci/application.html.haml
@@ -10,4 +10,5 @@
       %hr
 
     .container.container-body
-      = yield
+      .content
+        = yield
diff --git a/app/views/layouts/ci/empty.html.haml b/app/views/layouts/ci/empty.html.haml
index a36ebee7ef3..bda574c0ed1 100644
--- a/app/views/layouts/ci/empty.html.haml
+++ b/app/views/layouts/ci/empty.html.haml
@@ -9,5 +9,6 @@
       %hr
 
     .container.container-body
-      = yield
+      .content
+        = yield
 
diff --git a/app/views/layouts/ci/project.html.haml b/app/views/layouts/ci/project.html.haml
index 9549485d095..f78d749e592 100644
--- a/app/views/layouts/ci/project.html.haml
+++ b/app/views/layouts/ci/project.html.haml
@@ -15,12 +15,13 @@
         .pull-right
           = link_to 'View on GitLab', @project.gitlab_url, no_turbolink.merge( class: 'btn btn-sm' )
     %hr
-    .container
-      - if current_user && can?(current_user, :manage_project, gl_project)
-        .row
-          .col-md-2.append-bottom-20
-            = render 'layouts/ci/nav_project'
-          .col-md-10
-            = yield
-      - else
-        = yield
+    .container.container-body
+      .content
+        - if current_user && can?(current_user, :manage_project, gl_project)
+          .row
+            .col-md-2.append-bottom-20
+              = render 'layouts/ci/nav_project'
+            .col-md-10
+              = yield
+        - else
+          = yield